Unknown W. Brackets 6f9f9e1c98 Merge branch 'master' into mediaengine. ...

Note: doesn't compile, just fixes conflicts.

Conflicts:
	Core/HLE/sceKernel.cpp
	Core/HLE/sceKernelThread.cpp
	Core/HLE/sceKernelThread.h

2012-12-28 22:32:56 -08:00

..

Debugger

Fix some ignored error / shadowing warnings.

2012-12-21 16:23:21 -08:00

Dialog

Save the savedata and other dialog state.

2012-12-28 13:55:31 -08:00

ELF

Mode 8 Correction

2012-12-28 11:39:52 +01:00

FileSystems

Fix a memory leak in the ISO filesystem.

2012-12-28 13:55:28 -08:00

HLE

Merge branch 'master' into mediaengine.

2012-12-28 22:32:56 -08:00

HW

Merge branch 'master' into mediaengine.

2012-12-28 22:32:56 -08:00

MIPS

Reset JIT before saving/loading state

2012-12-29 00:10:43 +01:00

Util

Quick build fix for gcc

2012-12-28 23:33:00 +01:00

CMakeLists.txt

Merge branch 'master' into mediaengine

2012-12-18 00:05:09 +01:00

Config.cpp

User define linear filtering

2012-12-29 00:39:46 +08:00

Config.h

User define linear filtering

2012-12-29 00:39:46 +08:00

Core.cpp

Wrap some functions, clean some stuff

2012-12-26 08:52:40 +01:00

Core.h

Fix timing issue wiith JIT on non-Windows platforms

2012-12-25 09:02:02 +01:00

Core.vcxproj

Merge branch 'master' into mediaengine.

2012-12-28 22:32:56 -08:00

Core.vcxproj.filters

Merge branch 'master' into mediaengine.

2012-12-28 22:32:56 -08:00

CoreParameter.h

Merge branch 'master' into mediaengine

2012-12-17 18:48:32 +01:00

CoreTiming.cpp

Start save stating audio, plus minor fixes.

2012-12-28 13:55:29 -08:00

CoreTiming.h

Add CoreTiming to save states.

2012-12-28 13:55:24 -08:00

CPU.cpp

Switch to "GPL 2.0 or later" for various reasons. I wrote most of the code I imported from Dolphin (which is GPL2-but-not-later), so it should be OK.

2012-11-04 23:24:00 +01:00

CPU.h

Synchronize the mainloop to the display end-of-frame on nonWindows

2012-11-19 14:16:37 +01:00

Host.cpp

Switch to "GPL 2.0 or later" for various reasons. I wrote most of the code I imported from Dolphin (which is GPL2-but-not-later), so it should be OK.

2012-11-04 23:24:00 +01:00

Host.h

Fix some more possible errors

2012-12-23 20:51:05 +00:00

Loaders.cpp

Misc fixes (accept .prx, work on power callbacks, bugs)

2012-11-10 10:15:11 +01:00

Loaders.h

Switch to "GPL 2.0 or later" for various reasons. I wrote most of the code I imported from Dolphin (which is GPL2-but-not-later), so it should be OK.

2012-11-04 23:24:00 +01:00

MemMap.cpp

Copy right size of save request.

2012-12-24 01:22:28 +01:00

MemMap.h

Copy right size of save request.

2012-12-24 01:22:28 +01:00

MemMapFunctions.cpp

When not ignoring bad mem access, break to debug.

2012-12-24 22:12:52 -08:00

PSPLoaders.cpp

Save unencrypted PARAM.SFO

2012-12-14 20:55:57 +01:00

PSPLoaders.h

Switch to "GPL 2.0 or later" for various reasons. I wrote most of the code I imported from Dolphin (which is GPL2-but-not-later), so it should be OK.

2012-11-04 23:24:00 +01:00

PSPMixer.cpp

Switch to "GPL 2.0 or later" for various reasons. I wrote most of the code I imported from Dolphin (which is GPL2-but-not-later), so it should be OK.

2012-11-04 23:24:00 +01:00

PSPMixer.h

Switch to "GPL 2.0 or later" for various reasons. I wrote most of the code I imported from Dolphin (which is GPL2-but-not-later), so it should be OK.

2012-11-04 23:24:00 +01:00

SaveState.cpp

Reset JIT before saving/loading state

2012-12-29 00:10:43 +01:00

SaveState.h

Reset JIT before saving/loading state

2012-12-29 00:10:43 +01:00

System.cpp

Cleanup GPU init/shutdown a bit

2012-12-25 22:42:19 +01:00

System.h

Allow changing of zoom factor at runtime

2012-12-17 21:06:47 +01:00