Commit Graph

16 Commits

Author SHA1 Message Date
xiushu
14e7658bbb Implement on-screen touch combo keys.
Replace A,B,cross1,square1,triangle1 with number images 1-6

Rebuild the atlas, update the code to use combo keys 1-5

Also add psp_display.png from pull request #8082.
2015-10-24 13:22:43 +02:00
Henrik Rydgard
fef70c528b Possibly fix weird control visibility issue #7417 although I don't quite get it.. 2015-02-04 10:43:49 +01:00
Siddharth
b50f4d4287 merged upstream changes 2013-10-27 11:48:59 +05:30
Siddharth
ee58091b87 link Choice onClick to checkbox Toggle so that click is registered
fix merge linker error
2013-10-27 11:30:23 +05:30
Henrik Rydgård
4590e44954 add "onFinish" to screens so that ESC (etc) works the same as the back
touch button.
2013-10-25 13:19:08 +02:00
The Dax
62e3afd297 Tidy up a couple things. toggleSwitch doesn't need to be public. 2013-10-21 16:57:31 -04:00
ufdada
022c033f57 Translating the Back and Toggle All Buttons
Correcting the Toggle all Button function (it was reverting the selection)
2013-10-20 17:57:35 +02:00
The Dax
fd7ae05b80 Fix incorrect translation category. 2013-10-20 10:53:46 -04:00
Henrik Rydgard
950951920a buildfix 2013-10-20 12:47:00 +02:00
The Dax
fc64b9a64f Make the text and images centered. 2013-10-20 00:36:05 -04:00
The Dax
d18253e7d5 Fix Android build, adjust includes. 2013-10-20 00:12:55 -04:00
The Dax
7bfa071370 Make the header and Control Visibility texts translatable. 2013-10-19 23:56:04 -04:00
The Dax
cdf819c9eb Remove rebase junk, update CMakeLists.txt, update Android.mk. 2013-10-19 23:51:58 -04:00
The Dax
3d1f396467 Make non-image Choices translatable from the MappableControls section. 2013-10-19 23:24:38 -04:00
The Dax
d099692ed0 Make Toggle All actually function. 2013-10-19 23:24:38 -04:00
The Dax
a88a30fb1d Add a touch control visibility screen. All touch controls can now be toggled on or off, except for the Pause button on platforms that have it, as a safety precaution. 2013-10-19 23:24:09 -04:00