Ryan Houdek
|
ba18f38e70
|
Merge branch 'master' into android-new-control-input-overlay
Conflicts:
Source/Android/res/values-ja/strings.xml
Source/Android/res/values/strings.xml
Source/Android/src/org/dolphinemu/dolphinemu/AboutFragment.java
Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java
Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java
Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListActivity.java
Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java
|
2013-11-24 16:12:00 -06:00 |
|
Lioncash
|
23c84c220f
|
[Android] Add ability to take screenshots into the emulation menu.
|
2013-11-15 22:21:50 -05:00 |
|
Lioncash
|
77eb9ce725
|
[Android] Add the capability to dynamically enable and disable the input overlay during emulation.
|
2013-10-25 23:10:17 -04:00 |
|
Ryan Houdek
|
bab91494d5
|
Merge branch 'master' into android-core-control
|
2013-09-23 00:47:57 -05:00 |
|
Lioncash
|
f753b9ae97
|
[Android] Show the full text for save and load states if there's room on the screen. If not, let it overflow into a context menu.
|
2013-09-07 19:19:28 -04:00 |
|
Lioncash
|
a83d4e7226
|
[Android] Correct a typo for the load state menu root in the menu overlay XML. Should be "loadStateRoot", not "loadtateRoot"
|
2013-09-04 07:19:02 -04:00 |
|
Lioncash
|
cf96bfc2be
|
[Android] Add a button in the emulation view that allows a person to exit emulation and go back to the game list.
However, this does not work correctly yet. It will stop correctly. But the SurfaceView will not render the next game selected.
|
2013-08-29 22:52:09 -04:00 |
|
Lioncash
|
dac9659c58
|
[Android] Preliminary save-state support. Have the UI set up. Crashes with SIGABRT however.
|
2013-08-29 21:07:17 -04:00 |
|