Commit Graph

8461 Commits

Author SHA1 Message Date
twinaphex
33de14a6ca Revert "(Android) Some preliminary changes for new libretro core naming convention - still not"
This reverts commit 1bcf1afc9e.

Conflicts:
	android/phoenix/src/org/retroarch/browser/CoreSelection.java
2013-10-10 16:49:27 +02:00
twinaphex
6f0018b16e Revert "(Android) Some preliminary changes for new libretro core naming convention - still not"
This reverts commit 1bcf1afc9e.

Conflicts:
	android/phoenix/src/org/retroarch/browser/CoreSelection.java
2013-10-10 16:47:44 +02:00
twinaphex
f35fc9e1f7 Revert "(Android) Changes for filename naming convention changes"
This reverts commit d9b909aadb.
2013-10-10 16:47:19 +02:00
Lioncash
e177f6f35a [Android] Add comments to prefs.xml to clarify which section starts where within the XML. 2013-10-10 10:31:03 -04:00
Lioncash
6b5f21479e [Android] No need to call flush() before closing a stream. close() calls the flush method before actually closing the stream. 2013-10-10 10:12:09 -04:00
Squarepusher
8a2364181e Merge pull request #330 from lioncash/master
More simplifications and API 'correctness' for Android.
2013-10-10 04:18:25 -07:00
Lioncash
05f6226544 [Android] Made it unnecessary for HistorySelection.java, CoreSelection.java, and DirectoryActivity.java to implement an AdapterView. Since these now extend ListActivity, they can just override the method onListItemClick(). 2013-10-10 02:39:01 -04:00
Lioncash
5df0f7e2d1 [Android] Made DirectoryActivity extend a ListActivity, since that's basically what its purpose is - to act as a list view. 2013-10-10 02:27:58 -04:00
twinaphex
d9b909aadb (Android) Changes for filename naming convention changes 2013-10-10 04:25:32 +02:00
twinaphex
1bcf1afc9e (Android) Some preliminary changes for new libretro core naming convention - still not
working here
2013-10-10 03:41:53 +02:00
Squarepusher
2ee352c795 Merge pull request #329 from lioncash/master
[Android] Decouple a large amount of preference handling functionality from the MainMenuActivity in the Android front-end. Along with numerous simplifications/optimizations.
2013-10-09 07:18:03 -07:00
Lioncash
99de59d71e [Android] Missed a string key within updateConfigFile in UserPreferences.java. Fixed that. 2013-10-09 00:48:55 -04:00
Lioncash
e71bce0cbd [Android] Simplify LayoutInflater retrieval for KeyBindPreference.java and SeekbarPreference.java.
Simplify application info retrieval in OverlayActivity.java.
2013-10-09 00:26:07 -04:00
Lioncash
16127e046c [Android] Join declaration and assignment of a ConfigFile object in CoreSelection.java. Also made two variables final. 2013-10-08 23:54:52 -04:00
Lioncash
a16be6af65 [Android] Remove a redundant context variable in ReportIME.java. 2013-10-08 23:52:10 -04:00
Lioncash
2464e30ca5 [Android] Bump the application manifest targetSDKVersion tag from 17 to 18, since 4.3 is the latest API level. 2013-10-08 23:45:11 -04:00
Lioncash
84ee7658c2 [Android] Simplify another conversion of a double to a String within DisplayRefreshRateTest.java. Removed an unused import from RefreshRateSetOS.java. 2013-10-08 23:39:10 -04:00
Lioncash
73f97281fe [Android] Simplify WindowManager retrieval within RefreshRateSetOS.java. Also simplified the conversion of a double to a String.
No need to first turn the double into the object Double. Double has a toString() method for this.
2013-10-08 23:33:00 -04:00
Lioncash
ac2c9840ff [Android] Simplify LayoutInflater retrieval within IconAdapter.java. Also removed abstract from the methods within the interface IconAdapterItem. Methods within an interface are implicitly abstract.
Joined the declaration and assignment of an Intent within HistorySelection.java.
2013-10-08 23:30:15 -04:00
Lioncash
8fb23d0fcc [Android] Very minor clean-up in MainMenuActivity.java and CoreSelection.java. 2013-10-08 23:11:46 -04:00
Lioncash
c7ff040bf3 [Android] Get rid of getPreferences from MainMenuActivity.java. No longer needed. Now located within UserPreferences.java. 2013-10-08 23:05:54 -04:00
Lioncash
8112c1e36f [Android] Move readCPUInfo into UserPreferences.java. Also, a little bit of documentation in UserPreferences.java. 2013-10-08 22:55:07 -04:00
Lioncash
da6b6f4f50 [Android] Remove some functions I missed when cleaning up MainMenuActivity.java. These are moved into UserPreferences. They aren't needed in here any more. 2013-10-08 22:22:40 -04:00
Lioncash
ed649b44ab [Android] Initial implementation of new UserPreferences. Unifies preference loading and saving into one central class and moves it out of the MainMenuActivity.java. 2013-10-08 22:11:29 -04:00
Lioncash
010e691993 [Android most of new UserPreferences class finish. Not implemented however. 2013-10-08 20:52:44 -04:00
Lioncash
348cdb32b6 Fix a typo in the class name checking in function startActivity in MainMenuActivity.java. 2013-10-08 19:53:26 -04:00
Lioncash
1cc576b20f [Android] Clean up the manifest a little. 2013-10-08 19:51:37 -04:00
Lioncash
547219c244 [Android] Put the directory activities into a separate package to keep them separate from the rest of the files. Do the same for preference classes as well. 2013-10-08 19:50:23 -04:00
Lioncash
f1b6f95c40 [Android] Get rid of a typecast om ConfigFile.java. 2013-10-08 19:25:40 -04:00
Themaister
fee10d3d76 Fix OSX/Windows build. 2013-10-08 22:49:50 +02:00
Themaister
ee3b000425 Reapply for BB. 2013-10-08 12:28:38 +02:00
Themaister
f46f26c42a Revert "(Show FPS) Fix issue with DRM EGL context showing corrupted"
This reverts commit 10baf8456d.
2013-10-08 12:27:25 +02:00
twinaphex
3d1b0fcdfc (RMenu) Use menu_settings.c function for setting (Show Framerate) 2013-10-08 10:16:36 +02:00
twinaphex
3a83c7711b (RMenu/RGUI) Rename 'Debug Info Messages' to 'Show Framerate' 2013-10-08 10:10:53 +02:00
twinaphex
285c881198 Merge branch 'master' of https://github.com/libretro/RetroArch 2013-10-08 10:06:41 +02:00
ToadKing
a999b56f33 implement deferred loading for consoles 2013-10-07 22:33:02 -04:00
twinaphex
10baf8456d (Show FPS) Fix issue with DRM EGL context showing corrupted
string - check if buf_fps is not null before pushing string to message
queue - do this for all context files from now on
2013-10-08 03:14:34 +02:00
twinaphex
c2b55b9974 (XDK) Fix message queue 2013-10-07 23:57:55 +02:00
twinaphex
a18c04ef94 (XDK) Build fix 2013-10-07 23:48:43 +02:00
twinaphex
271e193048 (XDK) Simplify update_window_title 2013-10-07 23:39:45 +02:00
Themaister
880dec8c7f Clarify cg2glsl requires cgc 3.1. 2013-10-07 23:09:49 +02:00
Themaister
4627c106e4 Fix NTSC shaders by preprocessing first.
If vertex shader is in an #include, it wouldn't get column_major fix
applied.
2013-10-07 23:06:41 +02:00
Themaister
fa39a1ec39 Add -quiet and -I to cg2glsl.
Fixes cases where #include is used.
2013-10-07 22:50:48 +02:00
Themaister
7f7b5b1f7b Install cg2glsl with make install. 2013-10-07 22:09:05 +02:00
twinaphex
acde3339cf (Filebrowser/RMenu) More fixes 2013-10-07 22:00:54 +02:00
Themaister
84c84814cf Fix possible crash with uninitialized buf_fps.
If fps count == 0, buf_fps would not be written to.
Also, make writing into buf_fps optional. Drop always_write variable as
it doesn't serve a purpose anymore.
2013-10-07 21:54:29 +02:00
twinaphex
d8ee1bb133 (Filebrowser PS3) Fix crash at startup 2013-10-07 21:37:53 +02:00
twinaphex
a98f0336df Implement FPS show message option (Debug Info Text) for most
graphics contexts using message queue
2013-10-07 20:22:08 +02:00
twinaphex
c0c6ecc6cb Rewrite gfx_get_fps - now outputs proper string for FPS output 2013-10-07 20:17:07 +02:00
twinaphex
80079e297b (GLX) Hook up preliminary onscreen FPS (enabled by setting "Debug
Info Messages" in RGUI to ON
2013-10-07 17:11:48 +02:00