Henrik Rydgard bc214dcf37 Merge branch 'master' into mediaengine ...

Conflicts:
	Common/LogManager.cpp
	Core/CMakeLists.txt
	Core/Core.vcxproj
	Core/Core.vcxproj.filters
	Core/CoreParameter.h
	Core/HLE/sceAudio.cpp
	Core/HLE/sceKernel.cpp
	Core/HLE/sceKernelThread.cpp
	Core/HLE/sceMpeg.cpp
	android/jni/Android.mk

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

..

Debugger

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

Dialog

Lots of various work on sceSas. ADSR envelopes, correct looping, etc etc... Still far from perfect but better.

2012-12-17 18:07:25 +01:00

ELF

Save unencrypted PARAM.SFO

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

FileSystems

Merge pull request #179 from KentuckyCompass/dotdotpaths

2012-12-17 01:42:36 -08:00

HLE

Merge branch 'master' into mediaengine

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

HW

Merge branch 'master' into mediaengine

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

MIPS

Parse PARAM.SFO to get the disc ID, show in title bar on Windows

2012-11-30 22:32:51 +01:00

Util

* Load and display save image in save/load menu

2012-12-13 22:06:45 +01:00

CMakeLists.txt

Merge branch 'master' into mediaengine

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

Config.cpp

Merge branch 'master' of github.com:hrydgard/ppsspp

2012-12-05 10:57:30 +07:00

Config.h

Make the flash filesystem a real directory

2012-12-09 23:32:44 +00:00

Core.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

Core.h

Found a better way to do the previous change. Allow JIT on mac/linux.

2012-11-19 14:51:47 +01:00

Core.vcxproj

Merge branch 'master' into mediaengine

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

Core.vcxproj.filters

Merge branch 'master' into mediaengine

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

CoreParameter.h

Merge branch 'master' into mediaengine

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

CoreTiming.cpp

Lots of various work on sceSas. ADSR envelopes, correct looping, etc etc... Still far from perfect but better.

2012-12-17 18:07:25 +01:00

CoreTiming.h

Use u64 here to avoid warnings, better precision.

2012-11-22 16:40:26 -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

Parse PARAM.SFO to get the disc ID, show in title bar on Windows

2012-11-30 22:32:51 +01: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

Display OSK message

2012-12-15 17:13:58 +00:00

MemMap.h

Display OSK message

2012-12-15 17:13:58 +00:00

MemMapFunctions.cpp

DXT textures now mostly working-ish (work left to do on alpha for DXT3/5)

2012-11-28 16:12:29 +01: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

System.cpp

DisplayDrawer->FramebufferManager

2012-12-01 10:17:34 +01:00

System.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