ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,503 Commits 5 Branches 37 Tags 224 MiB
Commit Graph

1503 Commits

Author SHA1 Message Date
Nekotekina ad524798fa Compilation fix 2014-07-11 13:39:51 +04:00
Nekotekina 125359e30e Some fixes 2014-07-11 13:18:23 +04:00
Nekotekina 259b57c64a Fixed conflicts 2014-07-11 10:09:38 +04:00
Nekotekina cb9c1030a9 Warning fix 2014-07-11 10:01:23 +04:00
Alexandro Sánchez Bach ca3f621b3b Merge pull request #415 from xsacha/master 
Stdafx: more cleanup
 2014-07-10 23:29:07 +02:00
Sacha 51bb9dced4 Optimise travis a bit more. Use Cmake 3.0. Also drop rPlatform from stdafx. 2014-07-11 07:13:45 +10:00
Sacha 8793d75811 Stdafx: More cleanup 2014-07-11 06:54:12 +10:00
B1ackDaemon 1a1fb622fa Merge pull request #414 from xsacha/master 
Use a standard config dir on non-Windows. Fixes #192
 2014-07-10 22:56:24 +03:00
Sacha 3737993bb2 Use a standard config dir on non-Windows. Fixes #192 
Also remove WindowInfo::GetDefault which was redundant.
 2014-07-11 05:45:07 +10:00
B1ackDaemon 313af89d36 Merge pull request #413 from xsacha/master 
Warnings: Fix several warnings.
 2014-07-10 22:26:57 +03:00
Sacha f256153a2b Warnings: Fix several warnings. 2014-07-11 05:08:05 +10:00
B1ackDaemon 2bd8db5f7a Merge pull request #412 from raven02/patch-23 
Remove m_alpha_func sanity check
 2014-07-10 21:58:43 +03:00
raven02 8cacbe3567 Remove m_alpha_func sanity check 2014-07-11 02:41:48 +08:00
B1ackDaemon d1533b606b Merge pull request #411 from raven02/patch-22 
RSX : set default values using opengl one.
 2014-07-10 21:06:47 +03:00
B1ackDaemon c03677bd96 Merge pull request #410 from xsacha/master 
CMake and stdafx improvements
 2014-07-10 20:28:20 +03:00
raven02 a8480f66e0 RSX : set bunch of default values using opengl one 2014-07-11 01:23:36 +08:00
Sacha 6b148d1d4c CMake: Improve to support build type. Default to release. 2014-07-11 02:46:10 +10:00
Nekotekina 0dfbb5de73 Compilation fix 2014-07-10 18:29:38 +04:00
Sacha ab7a45aede stdafx: move out some uncommon includes 2014-07-11 00:16:26 +10:00
Nekotekina 22b9afdb60 Some cleanup 2 2014-07-10 04:13:04 +04:00
Nekotekina b5f376f834 Merge branch 'master' of https://github.com/DHrpcs3/rpcs3 2014-07-10 02:07:53 +04:00
Alexandro Sánchez Bach 59d0b1da4e Merge pull request #408 from raven02/patch-21 
Fix crash in Battle fantasia/Crystal defenders
 2014-07-10 00:05:14 +02:00
raven02 96fb8b968f Fix crash in Battle fantasia/Crystal defenders 2014-07-10 05:50:25 +08:00
Alexandro Sánchez Bach 470ffaf167 Merge pull request #407 from Bigpet/appveyorbuild3 
Appveyorbuild
 2014-07-09 23:05:11 +02:00
Alexandro Sánchez Bach 2e06e8152e Merge pull request #405 from xsacha/master 
wxRemoval: Ini.cpp
 2014-07-09 22:57:40 +02:00
Sacha 80dbe1a67f Use an alternative to sregex. 2014-07-10 06:49:24 +10:00
Nekotekina 3fdeb72999 Merge branch 'master' of https://github.com/DHrpcs3/rpcs3 2014-07-10 00:02:45 +04:00
Nekotekina bb0695e76c Using recursive mutex 2014-07-10 00:02:21 +04:00
Sacha 711f9eadc5 Revert some changes until GCC 4.9 is available. 2014-07-10 05:16:17 +10:00
Peter Tissen 10d9c3e412 add back /Y flag on xcopy 
to make sure no stdin input is requuired
 2014-07-09 17:27:20 +02:00
Peter Tissen dd382b2afc add files to allow for packaging on teamcity 
add initial appveyor script

add submodule update before build

add msbuild cmd

remove msbuild cmd

make script runnable locally

add solution without wxwdigets

add initial appveyor script

add submodule update before build

add msbuild cmd

remove msbuild cmd

add packaging step to appveyor

add ftp upload test

use msbuild explicitly

doesn't seem to work otherwise

temporarily remove deploy script

temporarily remove build script

remove non-essential stuff

add back some stuff

set artifact path

update artifact stuff

try to add back deploy

add build step again, *sigh*

add some more build settings

add build sript style build again

download wxwidgets instead of building

remove quite flag for debugging

add cert igonre to download

dont redundantly add folder

use a seperate solution without wxwidgets dependencies

only use the rpcs3 7z as artifact

to avoid re-packaging wxwidgets, also comment out deployment, since I don't have acccess to the main account to add secure strings

Conflicts:
	package.bat
 2014-07-09 17:18:23 +02:00
Nekotekina 123c4ba1a8 Some bugs fixed 2014-07-09 03:04:36 +04:00
Sacha 0299ab7660 wxRemoval: Ini.cpp 2014-07-09 06:34:10 +10:00
B1ackDaemon f232351720 Merge pull request #404 from xsacha/master 
Qt update
 2014-07-08 20:18:44 +03:00
Nekotekina 6e77f80d5f Small fix 2 2014-07-08 21:18:12 +04:00
Nekotekina 34590bc884 Small fix 2014-07-08 21:08:56 +04:00
Sacha 2ba5ada9f8 Qt: Update to match rest of emu. 2014-07-09 02:26:31 +10:00
Sacha ba3838f54c Qt: Update to Qt 5.2 code base. Makes the code much simpler! 2014-07-09 02:25:17 +10:00
B1ackDaemon 3c7d48933f Merge pull request #403 from raven02/patch-20 
RSX: simplify recale native resolution code
 2014-07-08 19:18:27 +03:00
raven02 52112006d4 RSX: simplify recale native resolution 2014-07-08 23:25:02 +08:00
Nekotekina 50b42f8593 ifdefs and linux (posix) version (not tested) 2014-07-08 18:26:49 +04:00
Nekotekina d1fff053c2 Some cleanup 2014-07-07 21:22:36 +04:00
B1ackDaemon cd8f286791 Merge pull request #401 from raven02/patch-19 
RSX : add rescale support for native 960x1080 & 1024x768
 2014-07-07 18:48:08 +03:00
raven02 38e41e0ea8 RSX : add rescale support for native 960x1080 & 1024x768 2014-07-07 22:16:59 +08:00
Alexandro Sánchez Bach bbf3c80d04 Merge pull request #400 from SiPlus/patch-1 
Change vec2(float, 0.0).xxxx to vec4(float)
 2014-07-07 10:25:31 +02:00
SiPlus bf8e6dbc8e Change vec2(float, 0.0).xxxx to vec4(float) in FS 2014-07-07 10:57:03 +04:00
SiPlus 8a305b19af Change vec2(float, 0.0).xxxx to vec4(float) in VS 2014-07-07 10:53:47 +04:00
Nekotekina faab4ed6db Merge branch 'master' of https://github.com/DHrpcs3/rpcs3 2014-07-07 03:36:26 +04:00
Nekotekina 19db12e090 Memory allocation changes 2014-07-07 03:36:07 +04:00
B1ackDaemon a26bc227d8 Merge pull request #399 from raven02/patch-18 
cellPamf : add error log for CELL_PAMF_ERROR_INVALID_ARG
 2014-07-06 22:39:37 +03:00