feedc0de/dolphin
1
0
Fork 0
forked from dolphin-emu/dolphin
Code Pull Requests Activity
12,039 Commits 12 Branches 16 Tags
932e3c1db2e9914367d2743deb3c66f95e552db9
Commit Graph

346 Commits

Author SHA1 Message Date
Lioncash
932e3c1db2 [Android] Tidy up the dialog buttons that don't do anything. 
All we want to do with these is dismiss the dialog. The same can be done by simply passing null.
 2014-03-09 23:02:08 -04:00
Pierre Bourdon
8863eb0671 Merge pull request #145 from lioncash/split-about-activity 
[Android] Split the AboutFragmentItem and InfoFragmentAdapter into their own class files.
 2014-03-10 02:20:25 +01:00
Tillmann Karras
161b67076a Update android.toolchain.cmake 
from https://raw.github.com/taka-no-me/android-cmake/master/android.toolchain.cmake
 2014-03-09 15:24:33 +01:00
Lioncash
53ed0051c8 [Android] Split the AboutFragmentItem and InfoFragmentAdapter into their own class files. 
It doesn't make sense conceptually to keep them within the AboutActivity, as they are entirely self-contained classes.
 2014-03-08 19:37:32 -05:00
Lioncash
c5fb4ac96f [Android] Remove unnecessary comment from VideoSettingsFragment. 
Misleading comment. We won't need to access index four for anything.
 2014-03-08 19:08:26 -05:00
Ryan Houdek
1f750904af Fix the OpenGL About tab. 
Move EGLHelper to be local to the creation of the about GL/GLES tabs so we don't have 3 EGL contexts running at a time.
Fix issues with OpenGL context creation here so we show the correct information.
This requires adding an EGL function to the NativeLibrary since Android's JAVA bindings don't expose eglBindAPI.
 2014-02-22 21:08:27 -06:00
Ryan Houdek
cf6e0b6015 Make it possible to build Dolphin for Android in OS X and also less of a pain with gradle. 2014-02-22 21:01:58 -06:00
Ryan Houdek
3666178f85 Remove Cache DL option from Android UI 
This option has been removed entirely from Dolphin, so remove the option from Android
 2014-02-06 17:02:38 -06:00
degasus
010a0d481a VideoCommon: remove Cache Displaylist 
This option was known to break every second game and only boost a bit.
It also seems to be broken because of streaming into pinned memory and buffer storage buffers.

v2: also remove dlc_desc
 2014-01-31 07:30:55 +01:00
Ryan Houdek
ac2ebd264d Merge pull request #5 from lioncash/android-info-fix 
[Android] Fix three limits in GLES2InfoFragment.java.
 2014-01-29 04:46:01 -08:00
Lioncash
74d9d7923e Fix three limits in GLES2InfoFragment.java. 2014-01-29 07:35:07 -05:00
Buildbot system user
7ed9f5e63e Upgrade Android API. 2014-01-28 23:35:13 +00:00
Lioncash
b9e7749fe6 [Android] Implement CPU info retrieval within the about menu. 
ARM only at the moment. Could potentially support x86 and MIPS if necessary.
Capable of parsing the manufacturer codes and part IDs of some (but not all part numbers). If anyone knows of part numbers that aren't in the list, please report them.
 2014-01-26 21:37:43 -05:00
Lioncash
521aa631dc [Android] Parse integer ranges in the GLES3 info tab. 
The info we retrieve will only ever have 2 elements given back to us.
 2014-01-22 12:28:46 -05:00
Lioncash
36863bf7b8 [Android] Get rid of the version check class in VideoSettingsFragment.java. Not needed anymore since the introduction of the EGLHelper class. Also decouples some classes from the VideoSettingsFragment.java class (yay). 
- Minor other change is that the EGL helper fields in GLES3InfoFragment.java, GLES2InfoFragment.java, and GLInfoFragment.java are made final.
 2014-01-22 11:56:25 -05:00
Lioncash
5c4d087e8f [Android] Greatly clean up the previous commits. Now here is the long list of cleaned up things: 
- Spaces -> Tabs | Consistency
- Javadoc everything that was added and not documented.
- Remove duplicated code regarding the adapter that used to reside in DolphinInfoFragment.java. Now it resides in AboutActivity.java without a second duplication of it.
- Properly retrieve all of the contexts in the EGL initialization in EGLHelper.java.
- Remove the attribute EGL_RENDERABLE_TYPE from the pbuffersurface attributes in EGLHelper.java. With this present, the EGL context will always fail to reinitialize if destroyed and attempted to be recreated.
- Break the inner class Limit within GLES2InfoFragment.java, GLES3InfoFragment.java, and GLInfoFragment.java into its own single class. Greatly reduces code duplication.
- Introduce a Type enum into Limit.java (one of the wildly rare cases in Java where an enum is actually an OK solution). Removes duplicated constants from the Java files stated in the previous bullet note.
- Add a copyright comment to the top of EGLHelper.java. Forgot to do this initially, my bad.
- Add some missing override annotations to GLES2InfoFragment.java, GLES3InfoFragment.java, and GLInfoFragment.java.
- Use StringBuilders in the previously mentioned three Java files. This is better than using a String in this instance, as the String object won't have to be recreated multiple times (ala concatenation).
- Fix some constant accessors in the previously mentioned three Java files.
- Added the 'final' modifier to the above three classes and to Limit.java. These classes serve a single purpose only, and are not intended to be inherited.
 2014-01-22 00:41:23 -05:00
Ryan Houdek
7e9b8d18a7 [android-about-menu-info] Add desktop OpenGL tab population. 
Since showing every single limit that desktop OGL supports is crazy, Let's just show the basic information, and extensions.
 2014-01-21 17:55:00 -06:00
Ryan Houdek
d3ccf1c7b5 [android-about-menu-info] Have information populate the GLES2 and GLES3 tabs. 
There is a /lot/ of information in these tabs, we may have to think about changing how the information looks
OpenGL isn't done yet since there are a million limits on desktop GL, may just show a few things and extensions there.
 2014-01-21 17:45:39 -06:00
Lioncash
0dc437e94d [Android] Finally check if regular OpenGL is possible on devices and display/hide it's fragment based upon this in AboutActivity.java. 
Also added another constructor to EGLHelper which can be used to quickly query for information.
 2014-01-21 00:12:40 -05:00
Lioncash
f8abdbf91a [Android] Initial introduction of the EGLHelper utility class. Should simplify all interop with the EGL/GL APIs. Not hooked up yet. However it is entirely functional. 2014-01-19 18:29:43 -05:00
Lioncash
45964e4b46 [Android] Initial implementation of the extended info menu. 
Most fragments are not implemented yet. This is just a working base framework for it.
 2014-01-07 19:47:15 -05:00
Lioncash
e6497bca5a [Android] Simplify instantiations of OverlayConfigButton.java. Also simplified resizeDrawable even more. We just acquire the resource instance and then get the display metrics directly. 2014-01-02 12:23:17 -05:00
Lioncash
5635c94a30 [Android] Simplify resizeDrawable in OverlayConfigButton.java. 
Also add a missing override to onRestart in DolphinEmulator.java.
 2014-01-02 11:53:28 -05:00
Ryan Houdek
2ed24d5311 [Android] Fix the gradle build system to allow for building from terminal. It will now copy the library files correctly and sign the resulting apk. 2013-12-24 15:28:24 -06:00
Ryan Houdek
86b3719d14 [Android] Add a gradle build file for use with Android Studio 4.0 2013-12-23 12:26:55 -07:00
Ryan Houdek
6737904c83 [Android] Stop copying assets that don't need to be copied anymore. 2013-12-21 16:20:14 -06:00
Ryan Houdek
2e1aa64958 [Android] Fix joysticks only capable of right/down movements. Also make it capable of using onscreen joystick even if controller 1 is bound. 2013-12-12 21:24:39 -06:00
Ryan Houdek
50df037bb5 [Android] Fix gamepad input. 2013-12-12 14:42:25 -06:00
Ryan Houdek
2a0adc3972 [Android] Make our OpenGL ES 3 check in the UI less stupid. 2013-12-12 11:58:38 -06:00
Ryan Houdek
bc01785264 [Android] Fix an issue that occurs due to the warning dialog. 2013-11-30 19:48:08 -06:00
Ryan Houdek
65ce711a21 [Android] 0.13 release. 2013-11-30 14:28:48 -06:00
Ryan Houdek
020331383a [Android] Fix alert when using crappy Qualcomm drivers. 2013-11-30 14:28:00 -06:00
Ryan Houdek
2ad686a2a2 [Android-overlay] Z-button support. 2013-11-29 21:50:42 -06:00
Ryan Houdek
b9f03444cd [Android-overlay] Fix Java imports. 2013-11-29 21:32:27 -06:00
Ryan Houdek
7bdd8191db Merge branch 'master' into android-new-control-input-overlay 
Conflicts:
	Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java
 2013-11-29 21:27:17 -06:00
Ryan Houdek
00a25cdaf5 [Android-overlay] Disable Wiimote configuration until it is wired up. 2013-11-29 21:12:36 -06:00
Lioncash
f6e89356c7 [Android] Simplify some things in the overlay. Also Javadoc the new static function. 2013-11-29 20:06:39 -05:00
Ryan Houdek
49eef423a8 [Android-overlay] Add the new overlay icons. Support configuring them. Disable hardfloat since it has issues since Dalvik doesn't understand passing floats due to ABI differences. 2013-11-29 18:37:33 -06:00
Lioncash
7f85c3215b [Android] Add Javadoc to InputOverlayDrawableJoystick. 2013-11-25 17:18:31 -05:00
Lioncash
76843b450b [Android] Build the configuration window for the overlay programmatically. Moved the overlay configuration classes into their own package. Also launch the overlay config activity through the preference XML via an embedded Intent. Lets us remove code explicitly handling this. 2013-11-25 14:23:28 -05:00
Ryan Houdek
7ed8e6a29c [Android] Fix the check for the Qualcomm graphics driver version for v53 drivers with the screen being rotated 90 degrees. Initialize the OpenGL information grabbing only once. Check for v14 Qualcomm drivers and spit out an error if the user tries selecting OpenGL ES 3. 2013-11-24 22:45:48 -06:00
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
Ryan Houdek
f292819ff5 [Android] Due to recent changes in code breaking Tegra 4 support, and also the upcoming code which will be breaking GLES2 support entirely. Taking the initiative to drop the remaining support code from the codebase in preparation for the upcoming changes. For a look at how Dolphin on Tegra 4 looked like prior and would not have been able to be fixed at all due to Tegra 4 not supporting the precision we need in our shaders; Look at this Youtube video http://youtu.be/Ga7Jc_Ote7U 2013-11-24 15:49:23 -06:00
Ryan Houdek
f6f2b1fc60 [Android-overlay] Support multiple gamepads with touch screen controls. 2013-11-24 15:04:53 -06:00
Lioncash
42f8562e5c [Android] Basic Wiimote binding settings now implemented. 2013-11-19 19:28:10 -05:00
Lioncash
7e544d8996 [Android] Basic UI functionality for enabling/disabling aforementioned Gamecube controllers. 2013-11-19 16:14:40 -05:00
Lioncash
53ab104d5f [Android] Expand the input binding UI in the settings to handle 4 Gamecube controllers in the future. 
Other changes:

 - Broke out MotionAlertDialog into it's own separate class.
 - Made a preference specifically for handling input bindings.
 2013-11-19 15:53:30 -05:00
Ryan Houdek
ae11fba069 [Android] Make joysticks less dumb from a configuration standpoint. 2013-11-18 14:48:08 -06:00
Lioncash
ee32c8b4e9 [Android] Remove accidental fragment tag in GameListActivity (it was useless, since it's an empty string) 2013-11-16 15:17:37 -05:00
Lioncash
11a156615f [Android] Like the previous commit (but for the GameListFragment), don't constantly create a new adapter when filling the game list. 2013-11-16 05:30:58 -05:00