137 Commits

Author SHA1 Message Date
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
Themaister
cb9bb8455f Make basic settings work. 2012-12-31 17:46:15 +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
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
Themaister
69491ea284 Add Java config file code. 2012-12-31 02:43:13 +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
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
82f2bba8f2 Accept CONFIGFILE argument over JNI. 2012-12-25 15:21:01 +01:00
twinaphex
480e36000e (Android/Phoenix) remove remnants 2012-12-24 15:23:06 +01:00
twinaphex
7116118051 Remove remnants of HAVE_CONFIGFILE 2012-12-23 18:16:33 +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
10483e08e1 (Phoenix) Can now go back to 'Select libretro core' from 'select
ROM' menu by pressing Back button by returning RESULT_CANCELED
from DirectoryActivity
2012-12-10 19:13:39 +01:00
twinaphex
fdc65d7851 (Android) - New phoenix frontend - use startActivityForResult for filebrowsing
- Get rid of most PHOENIX_LEGACY ifdefs - code now works for both Phoenix and
Phoenix-legacy
- Refresh rate auto-configuration should work now on Phoenix
- Going to get rid of Phoenix-legacy soon altogether
2012-12-09 20:33:08 +01:00
twinaphex
ecc2376e6f (Phoenix Legacy) Adding back phoenix legacy for now 2012-12-08 12:37:00 +01:00
meancoot
3ca708a9b8 (Android) Fix eclipse project. 2012-12-08 05:04:05 -05:00
meancoot
c57c9b79cf (Android) Delete unneeded android-support-v4.jar 2012-12-07 15:50:46 -05:00
meancoot
6eb1f60415 (Android) Add parent directory item to file lists. 2012-12-07 15:46:17 -05:00
meancoot
fc1cf035d7 Delete original phoenix directory; Rename andretro directory to phoenix. 2012-12-06 01:47:52 -05:00
Toad King
1e03bb3d50 [ANDROID] "handle" all config changes while executing the emulator
re-init video code on orientation change
2012-12-04 17:36:02 -05:00
Toad King
ba0a09eb91 [ANDROID] use WRITE_EXTERNAL_STORAGE permission 2012-12-02 14:35:13 -05:00
twinaphex
623822126a (Android) Set buffer count to 4 instead of 8 for Jelly Bean and
higher - test experimental lower latency for fast OpenSL mixer
2012-12-02 07:32:28 +01:00
Toad King
d1b9015aef [ANDROID] pass phone version to activity 2012-11-30 20:54:29 -05:00
twinaphex
f1709aefec (Android) remove force_16bit from duplicate config file (TODO - try
to see if we can remove this altogether)
2012-11-20 23:56:11 +01:00
twinaphex
6932f866ca (Android) Try to reduce call stack by pointing everything in thread entry function 2012-11-03 21:03:14 +01:00
twinaphex
8161aec704 (Android Phoenix) Some build fixes 2012-10-22 20:11:00 +02:00
twinaphex
46fd925d01 (Android) Can now select libretro core from Phoenix too, argument
gets passed to native activity
2012-10-16 11:59:08 +02:00
twinaphex
99bb0734c8 (Android) Remove unnecessary icons for native activity 2012-10-16 02:20:53 +02:00
twinaphex
7a3e29539a (Android) Picks up ROM filename argument now in android_main -
passed from Java phoenix to native activity
2012-10-16 02:06:20 +02:00
twinaphex
bbbdb1ccc0 (Android) Cut down on engine_draw_frame usage 2012-10-15 21:49:17 +02:00
twinaphex
4f8a040411 (Android) Now starts up the native activity correctly when a ROM has been
selected - arguments still need to be passed and right now it's just doing
some glClears - however - POC more or less works - now to make it run Rarch
2012-10-14 07:21:12 +02:00
twinaphex
b89e0e90c9 (Android) Phoenix works again 2012-10-14 05:24:34 +02:00
twinaphex
6e730dab47 (Android) Split up project into native / phoenix - phoenix now doesn't
show main screen/rom browser (sigh)
2012-10-14 05:18:53 +02:00