Commit Graph

75 Commits

Author SHA1 Message Date
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 Rydgard
2b35aa9050 Add basic NewUI in-game menu. 2013-07-21 13:31:46 +02: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 Rydgard
ff225fab5a Finish the touch input rewrite, get rid of the fakeinput hacks. 2013-07-20 14:05:07 +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
papel
a61117dec4 Correct function. 2013-07-17 03:34:43 -03:00
papel
99754bcd7a Merge branch 'master' of https://github.com/hrydgard/ppsspp 2013-07-17 02:33:53 -03:00
papel
9b6f1abed8 Version to savestate and open other game in other screens. 2013-07-17 02:33:26 -03:00
Henrik Rydgard
81411a74ed Experimental: Make orientation change possible on Android. 2013-07-16 22:51:25 +02:00
Henrik Rydgard
3703599bee Fix touch screen controls, Fixes 2789 2013-07-15 20:30:23 +02:00
Henrik Rydgard
09a7bd08fa Assorted UI cleanups. Add a bunch of little image files that may be used in the Ouya port later. 2013-07-15 17:41:24 +02:00
The Dax
9af456a179 Fix breaking the button.. :| 2013-07-11 15:55:33 -04:00
The Dax
93e1404056 Remove dead code. 2013-07-11 15:51:45 -04:00
The Dax
0bc27f6d95 Make SpeedToggle button switch between only fixed/standard. There's no need for it to be a tri-state button when there is a separate button for unlimited speed. 2013-07-11 15:43:51 -04:00
Henrik Rydgard
b879f32284 Fix further Android joystick issues, including flickering pause menu. Fixes #2708 2013-07-08 17:47:22 +02:00
Henrik Rydgård
476382d2cc Merge pull request #2692 from unknownbrackets/keymap-axis
Do axis keymap as well (should replace right stick bind)
2013-07-08 01:14:02 -07:00
Unknown W. Brackets
a32cf817ff Fix some minor warnings. 2013-07-07 20:31:04 -07:00
Unknown W. Brackets
82442fa68a Cut down on analog stick latency. 2013-07-07 16:25:15 -07:00
Unknown W. Brackets
fc50094725 Add back the right stick, but no UI.
Not sure where to fit it...
2013-07-07 16:17:04 -07:00
Unknown W. Brackets
e45863cb87 Support binding analog backwards. 2013-07-07 16:14:28 -07:00
Unknown W. Brackets
5f382c5ab0 Unpress the reverse direction, avoids sticking. 2013-07-07 16:10:21 -07:00
Unknown W. Brackets
8e5d115c8e Get basic axis mapping working. 2013-07-07 16:10:20 -07:00
Henrik Rydgard
bab30279c2 fbo_unbind should not be necessary when pausing anymore. 2013-07-08 01:01:47 +02:00
Henrik Rydgard
a4e95e5ce9 Fix touch buttons that got broken. Also, make the onscreen turbo a pure unthrottle, I don't understand how the other is supposed to work heh (checking iFrameLimit?) 2013-07-08 00:08:43 +02:00
Henrik Rydgard
ab1b7e7288 Get rid of remaining legacy key mappings. Make Pause and F3 mappable, add default mappings. You may need to manually map these if you have an old ppsspp.ini. 2013-07-07 14:08:08 +02:00
Henrik Rydgard
47dae8c004 Fix bug with unthrottle as virtual key. Add button to restore default key mappings. 2013-07-07 11:25:19 +02:00
Henrik Rydgard
cee45d0ad2 Win32: Switch to RawInput for keyboard processing. Lets us distinguish LSHIFT/RSHIFT and LCTRL/RCTRL. 2013-07-07 11:25:18 +02:00
Unknown W. Brackets
861eafef26 Make pause/speed virtual buttons work again.
Fixes #2669.
2013-07-06 23:06:35 -07:00
Unknown W. Brackets
efb2ab52b4 Add a rapid fire virtual key, like before. 2013-07-06 23:06:34 -07:00
Unknown W. Brackets
1ab86a68c9 Add rapid fire ctrl interface, minor cleanup. 2013-07-06 23:06:32 -07:00
Henrik Rydgard
989f791f79 Fix virtual analog stick getting stuck. Fixes #2653. 2013-07-06 22:08:43 +02:00
Henrik Rydgard
b0ee3a173a Add mechanism for unlimited mappable virtual keys (not restricted by some bitfield). Use it to implement X/Y analog key mapping. 2013-07-06 20:45:44 +02:00
Henrik Rydgard
cc58e34cf8 Remove legacy key mapping and associate devices with keys (DInput has been left behind for now, will be fixed up soon). Saving is broken, will be fixed soon. 2013-07-06 20:45:44 +02:00
Daniel Dressler
78e0d301c3 Fix misleading var name
Update() can be called at subframe intervals.
2013-07-04 12:12:50 -07:00
Daniel Dressler
1c513c1bd0 Fix forgetting pressed keys 2013-07-04 10:59:19 -07:00
Daniel Dressler
5983a838a5 Fix emu screen trashing legacy input 2013-07-03 19:04:29 -07:00
Daniel Dressler
f24d9c4c4e Merge branch 'master' of github.com:hrydgard/ppsspp 2013-07-02 20:56:43 -07:00
Daniel Dressler
770456156d Make both modern and legacy key mapping input work 2013-07-02 20:49:30 -07:00
Daniel Dressler
643133238f Make emu core use key mapped keys 2013-06-30 21:43:01 -07:00
Unknown W. Brackets
5684c32165 Just use FPS except in the name.
Hopefully users don't get confused.  I don't think "internal FPS" is gonna
fit for all languages in a way that makes sense.
2013-06-30 00:05:38 -07:00
Unknown W. Brackets
4f68703cfd Rename "VPS"/"FPS" to "Speed"/"FPES" so it's clear.
Still scaled to 60, but could change to 100 instead?

"FPES" is "frames per emulated second."  Or we could change it instead...
2013-06-29 20:06:34 -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
29271f67d7 Sync KeyMap to native changes 2013-06-24 21:34:14 -07:00
raven02
d24ad28ceb Follow as 1/2/3 option 2013-06-19 15:24:35 +08:00
raven02
de4d970ab6 Toggle to adjust VPS/FPS/Both , new timeFormat/dateFormat/buttonPerference 2013-06-19 15:09:01 +08:00
Henrik Rydgård
c4abec3560 Add option for very transparent touch buttons 2013-06-17 20:28:22 +02:00
Unknown W. Brackets
6ff9cf64ca Measure flips per second. 2013-06-17 00:20:27 -07:00
The Dax
c8917bfbaf No need to have an if true there. 2013-06-14 13:11:35 -04:00