13204 Commits

Author SHA1 Message Date
aliaspider
f84e083d91 fix typo 2014-09-22 08:33:59 +01:00
Twinaphex
72ca4c3634 Merge pull request #1050 from aliaspider/master
add NEON optimizations for the CC resampler.
2014-09-22 09:31:11 +02:00
aliaspider
7899dea89f add NEON optimizations for the CC resampler. 2014-09-22 08:28:24 +01:00
twinaphex
40402174d9 Take out obsolete manipulation of driver.menu->old_input_state 2014-09-22 02:57:36 +02:00
twinaphex
0501172f7a Should fix issue https://github.com/libretro/RetroArch/issues/1039 2014-09-21 21:40:54 +02:00
Twinaphex
6353240af4 Get rid of unused variables 2014-09-21 18:02:23 +02:00
Twinaphex
a26c934572 Merge pull request #1048 from timostrunk/zip_ui
Zip ui
2014-09-21 17:59:39 +02:00
Timo Strunk
cb5c951a70 Merge remote-tracking branch 'upstream/master' into zip_ui
Conflicts:
	retroarch.c (defer_core was moved and modified by me)
2014-09-21 17:37:23 +02:00
Timo Strunk
547e2129ce Made deferred path correct in case of a compressed file 2014-09-21 17:18:45 +02:00
Twinaphex
90ea18ed63 Merge pull request #1047 from heuripedes/master
Fix environment callback regression
2014-09-21 16:37:44 +02:00
Higor Eurípedes
aa5810ba15 Fix environment callback regression 2014-09-21 09:33:51 -03:00
Timo Strunk
193f416f8f Zip UI cleanup before pull request 2014-09-21 11:03:32 +02:00
Timo Strunk
097eb15721 Included direct to file extraction into 7z and zip format readers. They are used in case of need_fullpath and archive usage 2014-09-21 10:48:12 +02:00
twinaphex
430e0f1911 Reimplement rarch_main_iterate - menu iteration frame now gets
called from here too. Do away with the hoky 'MENU_GAME' state
as well.
2014-09-21 09:18:26 +02:00
twinaphex
ff9a16d407 Refactor main entry iteration function 2014-09-21 08:05:35 +02:00
twinaphex
bdf9df6c2e Clean up more code in frontend.c 2014-09-21 07:39:17 +02:00
twinaphex
29aed58e4e Refactor MODE_LOAD_GAME 2014-09-21 06:50:10 +02:00
twinaphex
7056c9ca39 Refactor MENU_CLEAR_INPUT 2014-09-21 06:41:47 +02:00
twinaphex
9dc35b056f Refactor MODE_MENU_PREINIT code 2014-09-21 06:33:49 +02:00
Twinaphex
213bb63a12 Merge pull request #1046 from lioncash/warnings
iOS: Use accessors instead of direct variables
2014-09-21 06:05:12 +02:00
Lioncash
965dd829b7 iOS: Use accessors instead of direct variables 2014-09-20 23:58:10 -04:00
Twinaphex
0dd4c17b93 Merge pull request #1045 from lioncash/warnings
iOS: Kill off some more warnings.
2014-09-21 05:31:29 +02:00
twinaphex
76be2aecf8 Add SD_FLAG_CMD_APPLY_AUTO to setting 'Force-disable sRGB FBO' 2014-09-21 05:26:49 +02:00
Lioncash
a8345b217b iOS: Fix another signed/unsigned mismatch warning 2014-09-20 23:26:30 -04:00
Lioncash
402a08f554 iOS: Move instance variables in RetroArch_iOS over to properties. 2014-09-20 23:26:23 -04:00
twinaphex
395e2ed756 Add "Force-disable sRGB FBO" option for buggy Intel OpenGL drivers
on Windows - should hopefully fix messed up colors with it enabled (untested)
2014-09-21 05:23:51 +02:00
Twinaphex
45a31c9969 (iOS) Add HAVE_LAKKA and HAVE_GLUI 2014-09-21 05:07:47 +02:00
Twinaphex
44970a95a9 Merge pull request #1044 from lioncash/warnings
Fix a few iOS/misc warnings.
2014-09-21 05:01:55 +02:00
Lioncash
3f8d11e6b7 iOS: Minor cleanup
- Clean up trailing whitespace.
- Get rid of a redundant initialize call.
- Access variables through their property equivalents.
2014-09-20 22:56:44 -04:00
twinaphex
1e4cd8abe0 Move frame_time_last= 0 to rarch_set_action_state 2014-09-21 04:49:10 +02:00
Lioncash
f618b6de66 iOS: Fix mismatching types in iOS 7 keyboard code 2014-09-20 22:16:42 -04:00
Lioncash
1c62c36e3b shader_parse: Fix missing enum identifier warning 2014-09-20 22:07:52 -04:00
Twinaphex
bd8b5be03f Merge pull request #1043 from lioncash/warnings
iOS: Get rid of unsigned/signed comparison warnings.
2014-09-21 03:49:45 +02:00
Lioncash
1e02afcbdf iOS: Get rid of some unsigned/signed comparison warnings. 2014-09-20 21:48:36 -04:00
Twinaphex
68e1e3add8 Merge pull request #1041 from lioncash/ioswarn
iOS: Fix switch warning in RAGameView.m
2014-09-20 23:37:12 +02:00
twinaphex
9e362a4f35 Revert "Add stub functions for get_video_driver in frontends"
This reverts commit 98eaaf8f5fa64b71a53f18aab6e999cdbc0d63a9.
2014-09-20 23:35:55 +02:00
Lioncash
c4034080ac iOS: Fix switch warning in RAGameView.m 2014-09-20 17:31:03 -04:00
Twinaphex
c37e1505ae Check if driver.frontend_ctx is not NULL in find_video_driver 2014-09-20 23:30:54 +02:00
twinaphex
98eaaf8f5f Add stub functions for get_video_driver in frontends 2014-09-20 23:25:46 +02:00
Twinaphex
19df1d3197 Merge pull request #1040 from lioncash/ios-fix
iOS: Directly synthsize RAMenuItemBasic properties
2014-09-20 23:09:07 +02:00
Lioncash
ed192392f0 iOS: Directly synthsize RAMenuItemBasic properties
On iOS, when properties are not explicitly synthesized in their implementation, the compiler will attempt to do something that is called "autosynthesis", which is essentially it synthesizing the properties for you. However this problem with this is that it can trip up the compiler if you have a subclass of a base class that has a property with the same name as one in the base class.

Also consider how properties work. Say we have a property like so:

@property int someVar;

This is telling the compiler to make a getter and a setter for a class member variable named someVar which is of type int. So the following functions will be created.
+(int) someVar(), which is the getter.
+(void) setSomeVar:(int) var, which is the setter.

In this case, RAMenuItemBasic inherits from NSObject, which already has a function named "description", yet we were trying to generate a getter/setter for our own variable named that, which leads to clashing. This is why the property was never being synthesized correctly. Directly declaring the synthesizing calls ourself fixes this.
2014-09-20 16:54:06 -04:00
Timo Strunk
adfa00e193 Removed MENU_ACTION_Y, small bugfix with selections in zip select 2014-09-20 20:42:21 +02:00
Timo Strunk
3575f353bf Choosing whether to open or load a zip file in detect core should work now 2014-09-20 20:07:26 +02:00
Timo Strunk
864a5cdc4f Always interpret files as carchives in case of detect_core_list to allow browsing them. 2014-09-20 20:06:52 +02:00
Timo Strunk
547cdefd1c Failsafe in case extraction dir is wrong 2014-09-20 20:05:54 +02:00
Timo Strunk
97ea43994e Zipfiles open or run half finished 2014-09-20 19:10:05 +02:00
Timo Strunk
d114a80dab File.c now autoextracts in case of need_fullpath 2014-09-20 18:52:23 +02:00
Twinaphex
cfd078812e (Apple) iOS Xcode 6 build fix 2014-09-20 05:26:33 +02:00
Alcaro
ef4fbc752d Merge branch 'master' of github.com:libretro/RetroArch 2014-09-20 00:08:56 +02:00
Alcaro
af2d5ed53f Move this to the bottom for consistency with the other null drivers. 2014-09-20 00:03:35 +02:00