raven02
|
0216f52359
|
Merge remote-tracking branch 'upstream/master'
Conflicts:
UI/GameSettingsScreen.cpp
UI/MenuScreens.cpp
Windows/ppsspp.rc
|
2013-07-22 00:03:54 +08:00 |
|
raven02
|
87fc81e56d
|
Consolidate Rendering Mode
|
2013-07-21 23:17:42 +08:00 |
|
Henrik Rydgård
|
b17b120104
|
Merge pull request #2875 from Orphis/pbp-load-fix
Loader: Open PBP files even if we don't find the /PSP/GAME path
|
2013-07-21 05:24:04 -07:00 |
|
Florent Castelli
|
713f4747a6
|
Loader: Open PBP files even if we don't find the /PSP/GAME path
|
2013-07-21 14:11:52 +02:00 |
|
Henrik Rydgard
|
2b35aa9050
|
Add basic NewUI in-game menu.
|
2013-07-21 13:31:46 +02:00 |
|
Henrik Rydgård
|
679a6a98b2
|
Merge pull request #2874 from raven02/patch-3
Buildfix
|
2013-07-21 03:14:09 -07:00 |
|
Henrik Rydgard
|
03c665173f
|
Fix range of newui volume control. Delete some old junk.
|
2013-07-21 12:12:20 +02:00 |
|
raven02
|
12a3a42d9a
|
Buildfix
|
2013-07-21 17:59:04 +08:00 |
|
Henrik Rydgård
|
dec17c2dbd
|
Merge pull request #2873 from raven02/patch-2
Only show OK button when (flag & DS_OK) in message dialog
|
2013-07-21 02:52:57 -07:00 |
|
raven02
|
4c9422088b
|
Only show OK button when (flag & DS_OK) in message dialog
|
2013-07-21 17:52:04 +08:00 |
|
Henrik Rydgård
|
540800554a
|
Merge pull request #2872 from unknownbrackets/windows-ui
Call SetCursor always on the UI thread
|
2013-07-21 02:24:08 -07:00 |
|
Unknown W. Brackets
|
8717e745a8
|
Call SetCursor always on the UI thread.
Fixes #2862.
|
2013-07-21 02:21:50 -07:00 |
|
Henrik Rydgård
|
6ccaed10f6
|
Merge pull request #2871 from unknownbrackets/debugger
Allow selecting a range of in the debugger
|
2013-07-21 01:43:16 -07:00 |
|
Henrik Rydgård
|
0573768569
|
Merge pull request #2869 from unknownbrackets/ccc
Implement the majority of functions in sceCcc
|
2013-07-21 01:31:05 -07:00 |
|
Unknown W. Brackets
|
6086b9f5e4
|
Allow selecting a range of in the debugger.
This way you can copy a bunch of diasm'd instructions.
Just quick range selection, not really proper.
|
2013-07-21 01:07:26 -07:00 |
|
Unknown W. Brackets
|
d58439469b
|
Add basic stubs for sceCccIsValid*().
|
2013-07-21 00:01:45 -07:00 |
|
Unknown W. Brackets
|
8d54b80d0d
|
Implement the sceCcc charset conversions.
|
2013-07-20 23:54:06 -07:00 |
|
Unknown W. Brackets
|
282e7488e5
|
Implement the ucs/jis table lookup.
Not actually converting strings yet.
|
2013-07-20 23:02:35 -07:00 |
|
Unknown W. Brackets
|
cc7636f743
|
Implement sceCccEncode*().
|
2013-07-20 23:01:53 -07:00 |
|
Unknown W. Brackets
|
1813513b08
|
Implement sceCccStrlen*().
|
2013-07-20 22:02:10 -07:00 |
|
Unknown W. Brackets
|
fa85400178
|
Make sceCccDecode*() work.
|
2013-07-20 21:51:45 -07:00 |
|
Unknown W. Brackets
|
26523603c3
|
Listen to sceCccSetErrorChar*(), not used yet.
|
2013-07-20 21:51:22 -07:00 |
|
Unknown W. Brackets
|
6032f46a91
|
Merge pull request #2868 from sum2012/patch-1
Asian / non-Latin Windows build fix.
|
2013-07-20 21:22:08 -07:00 |
|
sum2012
|
c4cf84f7d6
|
(Asian ?) build fix
|
2013-07-21 11:55:55 +08:00 |
|
Henrik Rydgård
|
e978b085a6
|
Merge pull request #2864 from unknownbrackets/keymap
When mapping to an axis, center when both pressed
|
2013-07-20 12:30:44 -07:00 |
|
Unknown W. Brackets
|
13f6ca0019
|
When mapping to an axis, center when both pressed.
Fixes #2860.
|
2013-07-20 12:11:35 -07:00 |
|
Henrik Rydgard
|
51adb8c64f
|
Warning fixes, fix hw back button on Android
|
2013-07-20 20:49:08 +02:00 |
|
Henrik Rydgård
|
bd2c74cf24
|
Merge pull request #2861 from raven02/vendor
GPU-vendor-base alpha and color Testing
|
2013-07-20 11:43:48 -07:00 |
|
raven02
|
b96e0a0dfe
|
Add NOTICE_LOG to show GPU vendor
|
2013-07-21 01:39:37 +08:00 |
|
raven02
|
7ac496529b
|
Vendor Based Alpha and Color Testing
|
2013-07-21 01:14:36 +08:00 |
|
Henrik Rydgard
|
37d2b5ecbf
|
Correct inverted Y axis of new touch screen analog stick
|
2013-07-20 18:50:46 +02:00 |
|
Henrik Rydgård
|
bcfb31db28
|
Merge pull request #2856 from raven02/ui
Merge remaining items to new UI
|
2013-07-20 09:18:10 -07:00 |
|
raven02
|
7a359325b3
|
Comment out Arabia language
|
2013-07-20 23:27:03 +08:00 |
|
raven02
|
39c6c7f634
|
Merge items to new UI
|
2013-07-20 22:03:52 +08:00 |
|
raven02
|
cfd8ef494a
|
Add text shadow to Save Dialog
|
2013-07-20 21:33:40 +08:00 |
|
Henrik Rydgård
|
8d30ebf3b0
|
Merge pull request #2855 from thedax/master
Win32 UI: Fix minor texture filtering bug.
|
2013-07-20 05:58:16 -07:00 |
|
The Dax
|
ab59235367
|
Win32 UI: Fix minor texture filtering bug. Someone changed the default value from 0 to 1, so auto didn't actually do anything.
|
2013-07-20 08:52:46 -04:00 |
|
Henrik Rydgard
|
ff225fab5a
|
Finish the touch input rewrite, get rid of the fakeinput hacks.
|
2013-07-20 14:05:07 +02:00 |
|
Henrik Rydgard
|
4b539e842a
|
Also replace the on-screen cross
|
2013-07-20 12:54:33 +02:00 |
|
Henrik Rydgard
|
325f5dfc21
|
Replace some of the onscreen touch buttons with a new better impl that doesn't rely on InputState.
|
2013-07-20 12:08:13 +02:00 |
|
Henrik Rydgård
|
18d0d72b45
|
Merge pull request #2851 from thedax/framebufferConvertUIOption
UI on all platforms(including NewUI!): Add options to change FramebufferCPUConvert
|
2013-07-20 02:23:46 -07:00 |
|
The Dax
|
4f06bc66fd
|
Default FramebuffersCPUConvert to be true, remove option to enable/disable it on mobile/GLES2 platforms.
|
2013-07-20 04:45:49 -04:00 |
|
Henrik Rydgård
|
21414dc7ea
|
Update native
|
2013-07-20 09:45:08 +02:00 |
|
The Dax
|
28af84ba89
|
Capitalise all phrases in the key; I forgot it's a key value, eheh.
|
2013-07-19 20:36:58 -04:00 |
|
The Dax
|
0dd12765f8
|
Fix typos.
|
2013-07-19 20:27:34 -04:00 |
|
The Dax
|
9e535717f9
|
UI on all platforms(including NewUI!): Add options to change FramebufferCPUConvert without manual editing of INI file.
|
2013-07-19 19:23:17 -04:00 |
|
Henrik Rydgard
|
a372e0b854
|
Merge branch 'patch-11' of https://github.com/raven02/ppsspp into raven02-patch-11
|
2013-07-20 00:33:46 +02:00 |
|
Henrik Rydgård
|
2633498d29
|
Merge pull request #2833 from jtraynham/master
Added NewUI Support in iOS build
|
2013-07-19 14:40:48 -07:00 |
|
Jake Traynham
|
0e0aec812f
|
Cleaned up iOS code and updated iCade support; Fixed at3+ download screen
|
2013-07-19 16:37:41 -05:00 |
|
Jake Traynham
|
7a5794b314
|
Added NewUI Support in iOS build
|
2013-07-19 16:37:40 -05:00 |
|