Commit Graph

463 Commits

Author SHA1 Message Date
Themaister 5752608062 Declare in manifest that GLESv2 is used. 2013-01-06 00:46:28 +01:00
Themaister 284014a4cc Add font rendering enable/disable to Java. 2013-01-05 23:58:28 +01:00
Themaister 634132033b Add savefile/save state dir settings. 2013-01-05 23:39:44 +01:00
Themaister 5b58df5da0 Add ROM dir selection. 2013-01-05 23:21:32 +01:00
twinaphex dd74683f26 (Android) Take out earlier SixAxisIME code - we'll always use
gamepad emulation with this IME app now
2013-01-05 18:33:26 +01:00
twinaphex 25de472336 (Android) Put in keybinds for dancingpixelstudios PS3 IME app
gamepad emulation
2013-01-05 18:13:30 +01:00
twinaphex 4343d64b6f (Android) Disable debug input reporting by default 2013-01-05 17:55:04 +01:00
twinaphex aeebac522c (Android) Cleanups to the way messages are passed and pushed for
debug input key reporting
2013-01-05 17:35:50 +01:00
twinaphex 9a8e6a6432 (Android) Add debug input keycode reporting option 2013-01-05 17:09:13 +01:00
twinaphex 2aaf7e4b02 (Android) small cleanups 2013-01-05 07:50:17 +01:00
twinaphex cd46fc96a6 (Android) Refactor g_android 2013-01-05 07:38:59 +01:00
twinaphex fc55e48221 (Android) Cut down on g_android usage 2013-01-05 07:20:02 +01:00
twinaphex 413771f14f (Android) Change Log.e to Log.i for refresh rate notification 2013-01-05 06:25:28 +01:00
twinaphex 147cb8f0d1 (Android) get rid of window_ready member 2013-01-05 06:24:13 +01:00
twinaphex 1cae4de653 (Android) More elegant way of setting refresh rate 2013-01-05 06:02:02 +01:00
twinaphex 4617f02aaf (Android) Group touchscreen overlay settings with new input settings
screen
2013-01-05 05:05:40 +01:00
twinaphex 4eeac9a1d7 (Android) Add autodetect_enable entry to settings 2013-01-05 04:58:30 +01:00
twinaphex e76ce3d525 (Android) Should autodetect keyboards now and configure them 2013-01-05 04:07:44 +01:00
twinaphex c64af4d3d0 (Android) Should configure first four pads for Wiimote pads if
IME app is ccpcreations Wii IME
2013-01-05 00:58:06 +01:00
Themaister 870bf97e41 Fix second pass bug on Android. 2013-01-05 00:42:55 +01:00
Themaister f8b86b56dd Enable overlays by default. 2013-01-04 23:05:51 +01:00
Themaister 7c841c18b3 Only extract Overlays/.
Extracting lots of stuff
takes too much time.
2013-01-04 22:55:02 +01:00
Themaister 587c69aa46 Comment out asset extraction.
Slows down massively. Need to find a better solution.
2013-01-04 22:33:42 +01:00
Themaister 7bd1cf3da8 Only extract overlays and shaders from asset dir. 2013-01-04 22:20:21 +01:00
Themaister 3b7aa5c243 Add .dummy files to Overlays and Shaders. 2013-01-04 22:11:47 +01:00
Themaister f886b3bc95 Add more shader options. 2013-01-04 21:46:45 +01:00
twinaphex 085a90d018 Get rid of RARCH_GPU_PERFORMANCE_MODE 2013-01-04 21:32:22 +01:00
Themaister 3f8bfa1484 Enable FBO support for Android.
GLES2 supports FBOs natively.
2013-01-04 20:54:33 +01:00
Themaister ca8f29d58f Extract all assets/ into cache/. 2013-01-04 20:34:54 +01:00
Themaister 2267c4d65b Hook up XML shader and overlay prefs. 2013-01-04 16:46:22 +01:00
Themaister 100f5ac947 Start adding path settings. 2013-01-04 16:46:22 +01:00
twinaphex 6f0360e6c4 (Android) Fixes a whole lot of issues - should force AKEYCODE_BACK
on touchscreen to always exit RetroArch - etc.
2013-01-02 23:53:40 +01:00
twinaphex 72b7d885b6 Revert "Revert "Don't assume device IDs won't collide.""
This reverts commit 4e3ffc0d72.
2013-01-02 22:24:36 +01:00
twinaphex ab5c3501ea (Android) Get rid of #if 0 2013-01-02 22:24:18 +01:00
twinaphex afbf41f46e (Android) Can now combine IME app autodetection and USB pad
autodetection
2013-01-02 22:23:47 +01:00
Themaister 5a548ca447 More explicit error checking for JNI name lookup. 2013-01-02 21:54:35 +01:00
twinaphex 4e3ffc0d72 Revert "Don't assume device IDs won't collide."
This reverts commit ef5b656f23.
2013-01-02 21:21:06 +01:00
Themaister ef5b656f23 Don't assume device IDs won't collide. 2013-01-02 19:15:02 +01:00
twinaphex 4b18244c84 (Android) Turn off PERF_TEST 2013-01-02 19:09:58 +01:00
twinaphex 6a6155affe (Android) Drop preDispatchEvent again 2013-01-02 19:08:18 +01:00
twinaphex 3a69f1f151 (Android) Some more checks in input code 2013-01-02 18:46:51 +01:00
twinaphex 6bbcc1eeda Revert "Remove preDispatch call."
This reverts commit 8bf6e5b5ee.
2013-01-02 18:03:53 +01:00
twinaphex e296c4955f (Android) Makefile cleanup 2013-01-02 17:41:09 +01:00
Themaister 8bf6e5b5ee Remove preDispatch call.
Fix possible segfault for ID table lookup.
2013-01-02 16:51:09 +01:00
twinaphex 49709b90bf (Android) Add Vsync toggle in Settings 2013-01-02 06:43:31 +01:00
twinaphex 55376dc2b5 (Android) Add rewind and auto rotate options to settings 2013-01-02 04:54:08 +01:00
twinaphex ecd614c9ec (Android) Add Xperia Play binds (untested) 2013-01-01 23:19:43 +01:00
twinaphex a16800bc79 (Android) cut down on unneeded members in android_app struct 2013-01-01 04:11:44 +01:00
twinaphex 0755b6b579 (Android) Remove remnants of savedState glue code 2013-01-01 03:44:57 +01:00
Themaister 0b4cf2d053 Update license headers to 2013. 2013-01-01 01:41:15 +01:00
twinaphex f838901f74 (Android) Should fix L1 button on Sixaxis IME binds 2012-12-31 23:19:30 +01:00
twinaphex 8099d76943 (Android) Add dancingpixelstudios Sixaxis IME app binds 2012-12-31 22:26:44 +01:00
twinaphex c76ee4c6b4 (Android) Add more ccp IME app autodetection 2012-12-31 21:36:29 +01:00
Themaister 91d58deec0 Add option for Square pixels (1:1 PAR). 2012-12-31 21:33:15 +01:00
Themaister be602e417a More flexible aspect ratio options. 2012-12-31 21:24:59 +01:00
Themaister be5c271b0e Don't show save files in ROM browser. 2012-12-31 20:48:52 +01:00
Themaister ca2e6c3e24 Fix crash when device is rotate in settings. 2012-12-31 18:52:35 +01:00
Themaister fafe555a27 Remove debugging messages from Java config. 2012-12-31 18:28:46 +01:00
Themaister a00f2ae254 Merge branch 'master' of github.com:Themaister/RetroArch 2012-12-31 18:10:10 +01:00
Themaister fad341d7b0 Remove unused import. 2012-12-31 18:06:58 +01:00
Themaister a1d91845c5 Merge branch 'master' of github.com:Themaister/RetroArch
Conflicts:
	android/phoenix/src/org/retroarch/browser/ModuleActivity.java
2012-12-31 18:03:46 +01:00
twinaphex 0de110a274 (Android) Create separate input_autodetect.c input file 2012-12-31 18:02:20 +01:00
twinaphex e2163317d7 (Android/RARCH_CONSOLE) Move DPAD_EMULATION enums to general.h -
makes it easier from maintenance perspective
2012-12-31 17:50:47 +01:00
Themaister cb9bb8455f Make basic settings work. 2012-12-31 17:46:15 +01:00
twinaphex 9f361de651 (Android) Autoconfigures IME app ccpcreations Wiimote pad 1 now 2012-12-31 17:39:04 +01:00
twinaphex 7855a25502 (Android) Can now grab current IME string from Java and pass it to
native
2012-12-31 16:36:28 +01:00
twinaphex ef42f6b58c (Android) Don't push message to queue if message is empty 2012-12-31 16:07:11 +01:00
twinaphex 33241abad2 (Android) Pass source to setup_keycode_lut too 2012-12-31 16:05:07 +01:00
Themaister 0270c106c5 Start adding setting dialogs. 2012-12-31 16:04:37 +01:00
Themaister 925a55c9e1 Start reworking settings menus into Java Phoenix.
Fix style according to Eclipse Ctrl+F.
Let frontend find default config.
Start adding popup menu for different settings.
Do not autodetect config on Android in native code.
2012-12-31 15:00:12 +01:00
Themaister cce0d9379a Fix warning in manifest. 2012-12-31 12:21:33 +01:00
Themaister bb95313175 Add boolean support to Java config file. 2012-12-31 12:18:47 +01:00
twinaphex 71fe22f8ba (Android) Add some more alternative name detection rules for
PS3 pad
2012-12-31 04:19:45 +01:00
twinaphex f375f550af (Android) Add Saturn USB pad / Toodles Champ / Mayflash Wii Classic
USB pad binds
2012-12-31 04:06:43 +01:00
Themaister 69491ea284 Add Java config file code. 2012-12-31 02:43:13 +01:00
twinaphex 6240fb0076 (Android) Add PS Move Navi binds 2012-12-31 01:06:33 +01:00
twinaphex 1bc1b61938 (Android) Autoconfigures MOGA pad now 2012-12-30 23:37:49 +01:00
twinaphex 30bb3a150a (Android) Add 'unbound' message for pads which are not autoconfigured 2012-12-30 22:06:52 +01:00
twinaphex 74f8845ac3 (Android) onSaveInstanceState callback- don't point to anything 2012-12-30 21:56:57 +01:00
twinaphex acefa9bfc4 (Android) Maps PS3 pad correctly now 2012-12-30 21:43:58 +01:00
Themaister 8a58858d84 Refactor out save stating and reentrancy.
It's not really needed.
2012-12-30 18:25:49 +01:00
twinaphex 45fa3d7ba7 (Android) PS3 pad detection - still need to sort out D-pad 2012-12-30 17:03:10 +01:00
Themaister 35e17e5017 Fix CPU hogging issue on Android when paused. 2012-12-30 16:54:16 +01:00
twinaphex 813a659f8a (Android) Detects Dual Strike now 2012-12-30 16:53:24 +01:00
twinaphex b264700eaf (Android) First stab at autodetection code 2012-12-30 16:33:13 +01:00
Themaister c91e0e23f4 Add JNI device name query. 2012-12-30 15:04:02 +01:00
Themaister 9fbd888566 Handle orientation without explict calls.
Appears to fix some kind of "race condition" in EGL.
2012-12-28 00:12:18 +01:00
Themaister 4651dd935a Improve multitouch. 2012-12-27 23:03:35 +01:00
twinaphex 9f80f36c16 (Android) Small refinement to input 2012-12-27 21:10:18 +01:00
twinaphex 16ab406a1a (Android) First stab at multitouch - far from satisfactory 2012-12-27 17:08:46 +01:00
twinaphex ad7a8cd468 (Android) Include native/jni/Android.mk file in phoenix/jni/Android.mk
file
2012-12-27 14:55:40 +01:00
Themaister 7458f7888f Set up multitouch querying. 2012-12-27 12:26:13 +01:00
notaz b1e8c84f55 (Android) Enable and fix warnings. 2012-12-26 03:11:33 +02:00
notaz 729bf464c5 (Android) Enable logger and overlay for phoenix.
Doesn't build otherwise for me.
2012-12-26 03:11:08 +02:00
Themaister e3378c219c Use crude ref-counting for driver handles. 2012-12-25 23:18:19 +01:00
Themaister 82f2bba8f2 Accept CONFIGFILE argument over JNI. 2012-12-25 15:21:01 +01:00
Themaister 4d802ccfbc Set custom refresh rate before starting main loop. 2012-12-25 14:00:24 +01:00
Themaister e4e0d9c72d Reset driver.* handles on driver reinit. 2012-12-25 00:01:06 +01:00
twinaphex f00c0311d3 (Android) Add more JNI macros 2012-12-24 22:15:01 +01:00
twinaphex 2ee5efc4a1 (Android) Orientation change now done in a stable way without freeing/
reiniting the video driver again
2012-12-24 20:17:16 +01:00
twinaphex e8a57f21cd (Android) Fix - restore state functionality broke again due to
'refactor' in driver.c - this does not work for re-entrancy - please
consult with me
2012-12-24 18:06:51 +01:00
twinaphex 70b5007a1e (Android) Wrapping all JNI usage seems impractical - settle for
a JNI helper header file instead
2012-12-24 17:22:57 +01:00
twinaphex bacad2f05a (Android) Some more JNI refactors - more coming up 2012-12-24 16:14:38 +01:00
twinaphex 480e36000e (Android/Phoenix) remove remnants 2012-12-24 15:23:06 +01:00
twinaphex e5e58912c1 (Android) Input - small nit changes 2012-12-24 15:05:59 +01:00
twinaphex 8f86172e3f (Android) Smaller 'overlay next' button for basic overlay
(Android) Mouse can be used to control overlay now too - is crash-prone
though after too many mouse clicks - reason unknown right now
2012-12-24 14:08:50 +01:00
twinaphex eb6937a7bd (Android) JNI wrapper - check some more for exceptions 2012-12-24 12:53:50 +01:00
twinaphex b03f5d8c4b (Android) Motion events now use correct pointer for event instead
of always pointer 0
2012-12-24 12:30:05 +01:00
twinaphex 8f6b5ab793 (Android) JNI - add safety checks 2012-12-24 11:26:38 +01:00
Themaister 35bf5c82c1 Make OVERLAY optional. 2012-12-23 18:39:01 +01:00
twinaphex 7116118051 Remove remnants of HAVE_CONFIGFILE 2012-12-23 18:16:33 +01:00
twinaphex ad8d09f754 (Android) Add a lot of actions to quick menu overlay 2012-12-23 17:51:32 +01:00
twinaphex 97ab249625 (Android) Overlay next button should work now along with other
overlay state inputs
2012-12-23 15:29:54 +01:00
twinaphex 269698661a (Console/Android) Simplify input_key_pressed implementation 2012-12-23 14:44:46 +01:00
twinaphex e58ca0b95b (Android) Refactor JNI code
(Android) Change overlay PNGs to TGAs - add 256x256 quickmenu
texture - change basic_overlay.cfg coords
2012-12-23 14:25:28 +01:00
twinaphex 04cabb0996 (Android) refactor JNI code - still can't load ClassLoader 2012-12-23 13:16:58 +01:00
twinaphex 5065e12ae7 (Android) ModuleActivity - comment out Toast hack 2012-12-23 07:32:04 +01:00
twinaphex 18bf8e2a16 (Android) Refactor JNI code 2012-12-23 07:30:15 +01:00
twinaphex 26c59ef649 (Android) Added autoconfiguration of Wiimote/Nunchuk/Wiimote - for
use with free Wii IME app from C.C.P. Cre@ions
2012-12-22 09:44:56 +01:00
twinaphex 7431bd5d22 (Android) Add more control schemes for USB gamepads 2012-12-22 07:13:32 +01:00
Toad King ff3ec9f8a5 (Android) minor cleanup 2012-12-21 19:00:18 -05:00
Toad King 462adce111 (Android) touch input fixes 2012-12-21 18:32:53 -05:00
twinaphex 75b36e6ba0 (Android) Tried with condition flag - still doesn't work 2012-12-21 08:08:50 +01:00
twinaphex 0df2eff66b (Android) Some input refactors 2012-12-21 04:14:47 +01:00
twinaphex 29ef7dc4ed (Android) Initial implementation of input overlay key input code -
not working yet due to need to determine whether or not touchscreen
is pressed in input_state_pressed
2012-12-21 01:31:01 +01:00
twinaphex 456593ddb1 (Android) Add way to tell where the event is coming from 2012-12-20 23:57:46 +01:00
twinaphex 909c392094 (Android) Build fix for building with input debug 2012-12-20 23:01:48 +01:00
twinaphex 92e5036eb6 Disable onLowMemory callback - after this has executed, it would
call Dalvik's garbage collector - definitely want to avoid that
2012-12-20 13:25:09 +01:00
twinaphex 3273ccb5d6 (Android) Add preDispatchEvent 2012-12-19 00:55:39 +01:00
twinaphex 60dd07364e (Android) Fix build 2012-12-18 20:56:33 +01:00
twinaphex 1c0fc0e65e (Android) Pack the LUT entries so that we can store eight 8-bit
values in them - this will allow for custom LUTs per controller
2012-12-18 18:56:16 +01:00
twinaphex 1564d04a1e Get rid of doubly #ifdef in retroarch.c 2012-12-18 07:46:40 +01:00
twinaphex 2e5f21db60 (Android) Do window ready checking differently 2012-12-18 06:01:56 +01:00
twinaphex 3570ba80d2 (Android) Move Android-specific pause functionality outside of
rarch_main_iterate
2012-12-18 03:18:53 +01:00
twinaphex 0210f8f72f (Android) Last input tweak for today 2012-12-17 20:53:36 +01:00
twinaphex 918052f5ba (Android) Rewrite activity_paused logic 2012-12-17 20:07:08 +01:00
twinaphex 74ae6ecf57 (Android) Better deinit - will now deinit RetroArch and save game
RAM if you forcibly stop RetroArch
2012-12-17 18:45:26 +01:00
twinaphex cd1ddbb9c7 (Android) Better restore state functionality 2012-12-17 17:58:08 +01:00
twinaphex dca1175854 (Android) Add performance counters for input poll 2012-12-16 17:13:49 +01:00
twinaphex 22f5f67522 (Android) Use AMotionEvent_getPointerCount() > 0 2012-12-16 16:35:49 +01:00
twinaphex 3eabba50f9 (Android) Onscreen input debugging 2012-12-16 15:46:53 +01:00
twinaphex 5f46f80b20 Revert "(Android) Simplify default binds - reduce code"
This reverts commit 68ab7e0372.
2012-12-16 06:54:49 +01:00
twinaphex 68ab7e0372 (Android) Simplify default binds - reduce code 2012-12-16 06:26:12 +01:00
twinaphex ae089a7b58 (Android) Make logging optional 2012-12-16 04:13:31 +01:00
twinaphex c54d4a6955 (Android) Volume keys work again with new input code - most
bound keyboard shortcuts should work now
2012-12-16 03:03:44 +01:00
twinaphex cf539edf91 (Android) android_input_poll now only reads and processes input
events - check_window polls for system messages once
2012-12-16 02:04:13 +01:00
twinaphex 7076685a1e (Android) First check if an event is in the event queue before
'getting' it
2012-12-16 00:08:30 +01:00
twinaphex 224eaab902 (Android) Input - only do motion event if type is of 'key down' 2012-12-15 23:05:21 +01:00
twinaphex 627fd567a9 (Android) Do Android pausing in a different way 2012-12-15 19:17:26 +01:00
twinaphex 7a67348b3c Change 1 << for bitmasks to 1ULL << 2012-12-15 18:00:30 +01:00