Commit Graph

1231 Commits

Author SHA1 Message Date
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
Sacha
ab7a45aede stdafx: move out some uncommon includes 2014-07-11 00:16:26 +10: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
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
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
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
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
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
raven02
d751e350c6 cellPamf : add error log for CELL_PAMF_ERROR_INVALID_ARG 2014-07-07 02:26:05 +08:00
Alexandro Sánchez Bach
e55c8410b4 Merge pull request #398 from Bigpet/slnfix
fix compile error on the Debug - Memleak config
2014-07-06 20:12:47 +02:00
Peter Tissen
ad83fb325c fix compile error on the Debug - Memleak config 2014-07-06 19:40:51 +02:00
Alexandro Sánchez Bach
d0b7c9a9af Merge pull request #396 from DHrpcs3/prx_loader
Changes for modules and lv2 sycalls
2014-07-06 19:02:50 +02:00
Alexandro Sánchez Bach
230ba0d360 Fixed conflicts and minor changes (2) 2014-07-06 18:05:52 +02:00
Alexandro Sánchez Bach
0002cc0af3 Removed old / unnecessary code
* Removed Plugins.h file as I assume setting up a plugin hell is a bad
idea (does anyone disagree?).
* Removed FnIdGenerator, and moved FnIdGenerator::GenerateFnId to
getFunctionId in Modules.cpp
* Disabled RSX Debugger and Memory Viewer when the emulator is stopped.
* ELF64Loader::LoadPhdrData refactored.
2014-07-06 16:44:56 +02:00
Alexandro Sánchez Bach
08d61163ea Removed external functions from SysCalls.h
* Replace `int` with `s32` as return type for syscalls.
* Renamed `SC_Something.*` files with the proper lv2 name
`sys_something.*`.
* Moving away from the lv2, those functions and folders that doesn't
correspond to lv2 functions. E.g. module functions from sys_io,
sysPrxForUser, cellGcmSys.
* Splitted some files (memory -> memory+mmapper) and merged other ones
(event+event_flag ->event, spu+spu_thread -> spu), according to common
sense, PSDevWiki docs, and checking firmware files.
* Removed external functions from `SysCalls.h`.

NOTE: What should we do about: cellGcmCallback? It's not a lv2 syscall
but it appears on the sc_table and it is actually called in games. Is
this some kind of hack?
2014-07-06 16:23:37 +02:00
B1ackDaemon
7218ccfe66 Merge pull request #394 from raven02/patch-17
RSX blending MRT and cellResc 512MB io address space changes
2014-07-06 03:15:39 +03:00
Alexandro Sánchez Bach
98787ddb3b Merge pull request #395 from Nekotekina/master
SPU Decrementer, cellSSPlayer functions
2014-07-05 22:29:56 +02:00
Nekotekina
b0ce69f1e1 Merge branch 'master' of https://github.com/DHrpcs3/rpcs3 2014-07-05 23:24:54 +04:00
Nekotekina
60f3ed3543 SSPlayer funcs in libmixer 2014-07-05 23:24:14 +04:00
Nekotekina
d16953d392 SPU Decrementer 2014-07-05 23:23:34 +04:00
raven02
9ede2d6753 RSX blending MRT and cellResc 512MB io address space changes 2014-07-06 01:33:04 +08:00
B1ackDaemon
c4360ee834 Merge pull request #393 from raven02/patch-16
RSX : comment out code for NV4097_SET_SCULL_CONTROL and add LOG_WARNING
2014-07-05 01:13:28 +03:00
raven02
1fc3654ca4 Comment style change 2014-07-05 04:07:15 +08:00
raven02
6a6fbea5ee RSX : comment out code for NV4097_SET_SCULL_CONTROL and add LOG_WARNING 2014-07-05 04:01:49 +08:00
Peter Tissen
061fe50835 don't prompt for xcopy
don't ask whether to override files when copying them for packaging
2014-07-04 13:13:47 +02:00
Peter Tissen
c5e780ffb2 Merge pull request #392 from Bigpet/master
make package script runnable locally
2014-07-04 12:19:01 +02:00
Peter Tissen
ba29a19e82 make script runnable locally 2014-07-04 12:15:43 +02:00
Peter Tissen
d84c619882 Merge pull request #391 from Bigpet/master
add files to allow for packaging  on teamcity
2014-07-04 10:32:02 +02:00
Peter Tissen
69c9d95f10 add files to allow for packaging on teamcity 2014-07-04 10:29:31 +02:00
Alexandro Sánchez Bach
072dfc600c Merge pull request #390 from Nekotekina/master
cellMsgDialog functions improved
2014-07-04 01:24:14 +02:00