Henrik Rydgard
0019d88a44
Merge branch 'master' into mediaengine
2012-11-13 20:41:55 +01:00
Henrik Rydgard
059bb3c40c
Buildfix, bugfix. Fixes issue 46.
2012-11-13 20:10:48 +01:00
Henrik Rydgard
8053c244b8
Implement large chunks of sceMpeg and scePsmf with JPSCP as a guide.
...
Not yet hooked up to FFMPEG and doesn't quite work yet.
2012-11-13 18:07:20 +01:00
Sacha
8c9f9ae1cf
Clean up SDL/CMakeLists, clean up Blackberry build process, further reduce memory allocation (needed for Dev Alpha)
2012-11-14 02:20:01 +10:00
Henrik Rydgård
3048a114d8
Merge pull request #45 from unknownbrackets/master
...
Include XInput.lib in all configurations
2012-11-13 02:04:56 -08:00
Unknown W. Brackets
6ea152e164
Add XInput.lib to other configurations.
...
Makes 64 bit etc. work as well.
2012-11-13 01:53:45 -08:00
Unknown W. Brackets
b468800155
Add XInput.lib to the Release configuration.
...
Was added to debug only, so Release doesn't build, preventing tests.
I think x64 is broken also.
2012-11-13 01:19:00 -08:00
Henrik Rydgard
b4a960a97e
Merge branch 'master'
2012-11-12 23:40:27 +01:00
Henrik Rydgard
543e759121
malloc test is now working
2012-11-12 23:34:28 +01:00
Henrik Rydgard
aa5940c5d3
Merge branch 'master' into mediaengine
2012-11-12 23:33:37 +01:00
Henrik Rydgard
681ac65d5d
More mpeg
2012-11-12 23:32:46 +01:00
Henrik Rydgard
1ba3b005cf
Merge branch 'master' of github.com:hrydgard/ppsspp
...
Conflicts:
pspautotests
test.py
2012-11-12 20:55:11 +01:00
Henrik Rydgard
1127c72124
some initial mediaengine work
2012-11-12 20:53:16 +01:00
Henrik Rydgård
e86f19452e
Merge pull request #44 from tmaul/master
...
Default to english psp emulation
2012-11-12 11:00:16 -08:00
Henrik Rydgård
d7230a1482
Merge pull request #43 from unknownbrackets/master
...
Make threads/semaphores pass, fixing sceKernelStartThread
2012-11-12 10:59:25 -08:00
Henrik Rydgård
de40220325
Merge pull request #42 from Kovensky/xinput
...
Xinput input support
2012-11-12 10:41:14 -08:00
Diogo Franco (Kovensky)
7e7e9a0452
Add a class for keyboard input
...
Removes the windows-specific hack from sceCtrl
to read keyboard input and instead add a hack to
PPSSPPWindows.
The input mapping is still hardcoded and is the same
as it was in sceCtrl.
Add an std::list to WindowsHost that, curretly, contains
a hardcoded list of preferred `InputDevice`s. Devices
are tried in-order until one of them reports success.
Xinput is preferred over Keyboard. Keyboard always
returns success. Pointers are stored in the std::list
for polymorphism.
Change XinputDevice to report failure as soon as a
device can't be queried, instead of only a frame later.
2012-11-12 17:49:40 +00:00
Diogo Franco (Kovensky)
2210b19244
Xinput input support
...
Picks the first Xinput device available, waits 100 frames between
retries when no devices are available.
Controls are hardcoded so every x360 controller button corresponds
to the PSP button in the same physical position. Input from right
stick and from analog triggers is ignored.
The Xinput code though is overriden by SampleControls' hardcoded
keyboard input. XinputDevice was tested to work with
samples/controller/basic when SampleControls is disabled.
2012-11-12 17:40:01 +00:00
kev :)
43b90527d4
Default to english
...
Default to english. Needs to be menu/config driven really...
2012-11-12 17:18:20 +00:00
Unknown W. Brackets
d1fd16ecba
sceKernelStartThread(): skip argPtr for 0 args.
...
This makes threads/semaphores pass, so adding to passing list.
Depends on an update to pspautotests.
2012-11-12 08:16:16 -08:00
Henrik Rydgård
5944981d9b
Merge pull request #40 from unknownbrackets/master
...
Fix some things with the sceKernel semaphore funcs
2012-11-12 07:46:58 -08:00
Unknown W. Brackets
f37dd7fefe
Fix $v0 on wrong thread in semaphore funcs.
...
Need to RETURN() prior to switching threads or it will write to the
wrong thread, oops.
2012-11-12 07:24:40 -08:00
Henrik Rydgard
d485b76e11
Jit fixes, test update
2012-11-12 14:35:10 +01:00
Unknown W. Brackets
a0cacc7eb9
Merge remote-tracking branch 'upstream/master'
2012-11-12 01:35:38 -08:00
Henrik Rydgård
93b13a2ac8
Merge pull request #41 from unknownbrackets/thread-fix1
...
Fix crash in sceKernelExitDeleteThread()
2012-11-12 00:21:33 -08:00
