15 Commits

Author SHA1 Message Date
Henrik Rydgård
f002fe8db3 Merge branch 'master' of github.com:hrydgard/ppsspp
Conflicts:
	Core/HLE/HLE.h
	Core/HLE/sceKernel.h
	Core/HLE/sceKernelInterrupt.cpp
2012-11-17 20:11:54 +01:00
Diogo Franco (Kovensky)
d2a0fcc38e Wrappers for LoadExecForUser 2012-11-12 00:43:48 +00:00
Henrik Rydgard
387552f564 Misc fixes (accept .prx, work on power callbacks, bugs) 2012-11-10 10:15:11 +01:00
Henrik Rydgard
b43dfebb10 Fixes to lighting, display list base pointer, misc 2012-11-09 17:51:45 +01:00
Henrik Rydgard
00fc7754c6 CMakeLists fix, rebooting fix 2012-11-06 22:04:00 +01:00
Henrik Rydgard
c61d10363a Rewrite callback handling, part 1. All sorts of other fixes too. 2012-11-06 15:46:46 +01:00
Henrik Rydgard
b214a1a1da Revert "Better wrapper system, and fixed warnings"
This reverts commit a00b1855cb6427f8eb36341137dbb81004ff29fd.

Conflicts:

	Core/HLE/FunctionWrappers.h
	Core/HLE/sceCtrl.cpp
	Core/HLE/sceKernelModule.cpp
2012-11-05 10:05:09 +01:00
Henrik Rydgard
6bed1afb72 Merge branch 'master' of https://github.com/artart78/ppsspp into artart78-master 2012-11-04 23:59:26 +01:00
Henrik Rydgard
64cc573703 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
Henrik Rydgård
1ea930e8c8 code style fixing, remove unused field 2012-11-04 15:44:53 +01:00
Arthur Blot
a00b1855cb Better wrapper system, and fixed warnings 2012-11-04 15:08:23 +01:00
Henrik Rydgård
b6b7ac51b3 Allow specifying a range when allocating UIDs, default to [16, inf] 2012-11-04 13:28:52 +01:00
Henrik Rydgård
4ac0f63c42 Reindent sceKernel 2012-11-04 12:24:10 +01:00
MrOrdinaire
1ab9943643 fix missing #include's and missing CMake linking directives 2012-11-03 10:33:24 +08:00
Henrik Rydgard
4f7ad15758 Add snapshot of the whole source code. 2012-11-01 16:19:01 +01:00