Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 21:39:52 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
5,158 Commits 72 Branches 122 Tags 682 MiB
0c7833796b
Commit Graph

5158 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Henrik Rydgard
0c7833796b Merge branch 'master' into plugindownload 
Conflicts:
	Core/Core.vcxproj
	Windows/PPSSPP.vcxproj
	native
 2013-06-03 23:42:49 +02:00
Henrik Rydgard
403272c638 Merge branch 'UITweak' of https://github.com/aquanull/ppsspp into aquanull-UITweak 2013-06-03 22:03:56 +02:00
Henrik Rydgard
f0385aa2ac Use FFMPEG on 64-bit Windows, now that there's a build. 2013-06-03 21:46:10 +02:00
Henrik Rydgard
54f5377196 PluginScreen progress 2013-06-03 19:58:42 +02:00
aquanull
cd499b6ddf Re-arrange many menu screen elements to fit in most situations. 
Even add a new screen for frame settings.
Unfortunately, in some languages certain words and phrases are so long^n that they will fail under 800×480 (or even lower) resolution.
 2013-06-04 01:05:10 +08:00
Unknown W. Brackets
20563beab2 Fix dumb typo, fixes #2051. 2013-06-03 07:41:49 -07:00
Henrik Rydgård
29f95b02ed Merge pull request #2060 from oioitff/atrac-fix 
Implement sceAtracGetBufferInfoForReseting
 2013-06-03 06:41:15 -07:00
oioitff
c9d07575f5 Implement sceAtracGetBufferInfoForReseting 2013-06-03 21:33:34 +08:00
Henrik Rydgård
1aba33ae38 Merge pull request #2059 from aquanull/patch-2 
Fix some Windows-only crashes
 2013-06-03 06:23:32 -07:00
aquanull
af30671c12 Exit from UI Menu Screen better. Fix crash under debugging if Pause Screen has ever been used. 2013-06-03 21:13:17 +08:00
aquanull
2708c03f6e Work around occasional GetI18NCategory() failure in WndProc(). 
Also fix some variable-shadowing.
 2013-06-03 20:56:44 +08:00
Henrik Rydgård
3cc91a71e1 Merge pull request #2055 from oioitff/atrac-fix 
fix a tiny bug for atrac crash
 2013-06-03 05:23:49 -07:00
oioitff
f9a6c95d93 fix a tiny bug for atrac crash 2013-06-03 20:02:44 +08:00
Henrik Rydgård
dd85a7b8e5 Merge pull request #2049 from oioitff/mpeg-fix 
Improve mpeg pts.
 2013-06-03 02:36:11 -07:00
Henrik Rydgård
d737e60f5c Merge pull request #2048 from unknownbrackets/osk-fix 
Savestate dialogs properly, avoiding wrong status
 2013-06-03 02:33:29 -07:00
Henrik Rydgård
7b09062611 Merge pull request #1973 from aquanull/language 
Update lang/ and zim assets.
 2013-06-03 02:32:53 -07:00
aquanull
3b21e452dc Update lang/ and zim assets. 2013-06-03 17:22:58 +08:00
Unknown W. Brackets
0a46e982f4 Savestate dialogs properly, avoiding wrong status. 
Might cause a crash if the status is set wrong due to a fade.
Fixes #2047.
 2013-06-03 02:05:45 -07:00
oioitff
a9ba797ce5 Improve mpeg pts. 
A real PSP return a value start from 0.
 2013-06-03 17:00:58 +08:00
Unknown W. Brackets
e0f05ec382 Oops, lost these two lines editing. 
They were important, darn.
 2013-06-03 00:23:56 -07:00
Henrik Rydgård
eca3b147a3 Merge pull request #2045 from unknownbrackets/memcpy 
Fix crash on ARM in sceKernelMemcpy().
 2013-06-03 00:21:05 -07:00
Henrik Rydgård
1d0d13509c Merge pull request #2044 from unknownbrackets/mem-pointers 
Use PSPPointer in a few more places
 2013-06-03 00:19:42 -07:00
Henrik Rydgård
33dee3a896 Merge pull request #2043 from raven02/patch-2 
Temporary disable atrac3+ mono audio which crash on Android platform
 2013-06-03 00:18:20 -07:00
Henrik Rydgård
42d7d8d176 Merge pull request #2046 from unknownbrackets/armjit-minor 
Bail out on a delay slot in VFPU on arm also
 2013-06-03 00:17:00 -07:00
Unknown W. Brackets
a640ac4001 Bail out on a delay slot in VFPU on arm also. 
Otherwise we loop infinitely.

Workaround for #1926.  Should fix #1679.
 2013-06-03 00:06:24 -07:00
Unknown W. Brackets
9139b037c5 Fix crash on ARM in sceKernelMemcpy(). 
Happened with unaligned addresses only.  Fixes #1889.
 2013-06-02 23:40:31 -07:00
raven02
4399c460aa Temporary disable atrac3+ mono which crash on Android platform 2013-06-03 08:02:00 +08:00
Unknown W. Brackets
aada48cf15 Use a PSPPointer in lwmutexes. 2013-06-02 15:17:24 -07:00
Unknown W. Brackets
5027e24150 Use a PSPPointer in the FILELIST savedata mode. 2013-06-02 15:17:02 -07:00
Unknown W. Brackets
9eea30c52d Fix some small warnings in OSK code. 2013-06-02 15:09:17 -07:00
Unknown W. Brackets
9eb2238704 Use a PSPPointer in OSK to simplify things. 2013-06-02 15:03:15 -07:00
Unknown W. Brackets
bc149a27a1 Make PSPPointer behave more like a pointer. 2013-06-02 14:56:50 -07:00
Henrik Rydgard
f6793b30da Some more UI stuff. 2013-06-02 23:46:03 +02:00
Henrik Rydgard
b3f3305068 vcproj update: enable multithread build 2013-06-02 23:45:44 +02:00
Henrik Rydgård
af940df872 Merge pull request #2038 from unknownbrackets/mpeg-fix 
Add a bounds check to writeVideoImageWithRange()
 2013-06-02 14:16:20 -07:00
Unknown W. Brackets
b695fdda85 Ignore pixel mode -1 in psmf, seems to default? 
This makes videos play fine in Sword Art Online.
 2013-06-02 13:52:11 -07:00
Unknown W. Brackets
3d5f818095 Add a bounds check to writeVideoImageWithRange(). 
Fixes crash in Jeanne d' Arc, which sends 480x480.
 2013-06-02 11:40:38 -07:00
Unknown W. Brackets
3468d7ddd9 Fix reporting typo. 2013-06-02 10:27:16 -07:00
Sacha
1cb007693f Link swscale for Blackberry. 2013-06-02 23:47:31 +10:00
Sacha
405fced816 Update native. 2013-06-02 23:02:51 +10:00
Henrik Rydgard
e5090e36c2 More plugin stuff 2013-06-02 14:38:22 +02:00
Henrik Rydgård
1e68bbed33 Merge pull request #2036 from lioncash/master 
Fix signed/unsigned mismatch warnings in CwCheat.cpp
 2013-06-02 05:36:45 -07:00
Sacha
f825a07650 Move C++11 functions to std namespace. 2013-06-02 22:27:37 +10:00
Lioncash
72c9c9b424 Fix signed/unsigned mismatch warnings in CwCheat.cpp 2013-06-02 07:54:54 -04:00
Henrik Rydgard
cfdca995b6 Merge branch 'master' of github.com:hrydgard/ppsspp 2013-06-02 13:46:11 +02:00
Henrik Rydgard
282316f9a6 Update native 2013-06-02 13:44:54 +02:00
Henrik Rydgard
68e75ae134 More download stuff 2013-06-02 13:44:36 +02:00
Sacha
aa67301618 Buildfix for non-ffmpeg platforms. 2013-06-02 20:05:40 +10:00
Unknown W. Brackets
777bcc36b2 Android/etc. buildfix. 
I keep thinking enums can be forward declared... and MSVC allows it.
 2013-06-02 02:46:16 -07:00
Henrik Rydgård
398e8a0007 Merge pull request #2033 from lioncash/master 
Enclose extra psmfplayer calls in null checks where they belong.
 2013-06-02 01:57:13 -07:00