Henrik Rydgård
c01a69df30
Merge branch 'master' of https://github.com/daniel-dressler/ppsspp into daniel-dressler-master
...
Conflicts:
CMakeLists.txt
2013-07-03 17:59:44 +02:00
Daniel Dressler
20399b9d6c
Make key mapping screen save changes
2013-06-30 22:48:15 -07:00
Henrik Rydgard
604ad0181b
Merge branch 'new-ui'. Still incomplete. Enable by setting NewUI=True in ppsspp.ini
...
Conflicts:
UI/MenuScreens.cpp
2013-06-27 16:28:38 +02:00
Daniel Dressler
14bce01a33
Fix key map settings screen using wrong enums
2013-06-26 20:22:45 -07:00
Daniel Dressler
6294e36c95
Make KeyMap use native keycodes and Core PS btns
2013-06-24 22:08:23 -07:00
Daniel Dressler
29271f67d7
Sync KeyMap to native changes
2013-06-24 21:34:14 -07:00
Jake Traynham
771de1c3a3
pulled down update to ffmpeg
2013-06-24 17:48:37 -05:00
The Dax
7884df8013
Simplify error message via better translation key/message.
2013-06-24 04:47:12 -04:00
The Dax
a341d39720
Make failure reasons translatable.
2013-06-24 04:24:34 -04:00
The Dax
1a7cce2fc5
Fix a comment and remove an old comment.
2013-06-24 04:00:10 -04:00
The Dax
810dfac704
Restructure load/save failure message by reverting it back to the original and add a translation ini key instead. Much simpler, and cleaner.
2013-06-24 03:58:29 -04:00
The Dax
fe8c439614
Clean up slightly.
2013-06-24 03:08:24 -04:00
The Dax
3a0fe2f374
Add failure messages to savestates loading/saving. It's misleading to always say "Loaded state" or "Saved state", even if it fails. Plus, result was unused up to this point.
2013-06-24 02:58:21 -04:00
Daniel Dressler
83a5609f22
Move keyboard key codes into native
2013-06-23 22:08:45 -07:00
Daniel Dressler
7d4ab6e786
Fix function declarations missing from namespace
2013-06-23 21:18:00 -07:00
Daniel Dressler
eefcc9ba83
Merge branch 'master' of github.com:hrydgard/ppsspp
2013-06-20 18:56:53 -07:00
Jake Traynham
e89b2055a6
Reenabled armv7s for iOS with JIT fixes
2013-06-20 11:44:59 -05:00
Henrik Rydgård
bfb9b2fd6d
Warning fix
2013-06-19 15:06:04 +02:00
Henrik Rydgard
c021c93883
More minor audio optimizations
2013-06-19 13:13:02 +02:00
Henrik Rydgard
7dac11922d
Some minor optimization of audio channel queues and mixing
2013-06-19 12:00:24 +02:00
Sacha
45775d4fc2
Fix for non-ffmpeg platforms. Thanks unknownbrackets!
...
Can now get past videos on platforms such as Meego and Symbian.
Also fix some spacing and type issues.
2013-06-19 01:14:14 +10:00
Daniel Dressler
c4cf35f782
Merge branch 'master' of github.com:hrydgard/ppsspp
2013-06-17 20:51:17 -07:00
Sacha
490f841093
Integer division is not guaranteed for VFPv4 devices. Example: Cortex-A5.
2013-06-18 01:42:36 +10:00
Daniel Dressler
0befec3358
Merge branch 'master' of github.com:hrydgard/ppsspp
2013-06-15 18:37:08 -07:00
aquanull
bb5fce600e
Fix/prevent crashes when MainWindow is closed before LoadFile() completes, or when it gets certain messages before TheThread completes initialization.
...
Fix missing ppsspp.ini loading log (only 1 unimportant line though).
Fix loading ui_atlas.zim failure when [General]Browse = True is set in ppsspp.ini.
Some other minor fixes as well.
2013-06-15 13:06:43 +08:00
