16217 Commits

Author SHA1 Message Date
T. Joseph Carter
234909bbe5 Merge branch 'master' of https://github.com/libretro/RetroArch 2015-02-10 09:44:02 -08:00
twinaphex
c2bd8dbf71 Make file_list_push more stable 2015-02-10 18:42:09 +01:00
T. Joseph Carter
8cf5afa8aa Merge branch 'master' of https://github.com/libretro/RetroArch 2015-02-10 09:34:35 -08:00
twinaphex
b7d845df77 input_joypad_pressed - cleanup 2015-02-10 18:26:56 +01:00
twinaphex
5eed4fd897 (CoreText) Fix Y coordinate draw offset 2015-02-10 17:48:51 +01:00
twinaphex
64372ed4b1 (XMB) Fixes 2015-02-10 17:46:35 +01:00
twinaphex
6f165b6801 Create video_driver_set_shader 2015-02-10 17:20:02 +01:00
T. Joseph Carter
790aa9db19 Merge branch 'master' of https://github.com/libretro/RetroArch 2015-02-10 08:14:41 -08:00
twinaphex
820595379e Create video_driver_has_focus 2015-02-10 17:14:40 +01:00
T. Joseph Carter
3cf6850941 Merge branch 'master' of https://github.com/libretro/RetroArch 2015-02-10 08:00:04 -08:00
twinaphex
81ca20c9b5 Create wrapper function for 'is video alive' 2015-02-10 16:54:08 +01:00
twinaphex
5921f8055d Refactor this 2015-02-10 16:50:41 +01:00
twinaphex
d98cd5a680 runloop.c - create check_video_alive - try to prevent segfaults
at all costs
2015-02-10 16:46:49 +01:00
twinaphex
23640fd12e input_keys_pressed - do early return in case driver.input
or driver.input_data is NULL
2015-02-10 16:38:47 +01:00
T. Joseph Carter
294f1c7579 Merge branch 'master' of https://github.com/libretro/RetroArch 2015-02-10 07:38:28 -08:00
T. Joseph Carter
3a7a4305cb Merge branch 'master' of https://github.com/libretro/RetroArch 2015-02-10 07:32:28 -08:00
T. Joseph Carter
a5028cab03 Merge kivutar's menu fix for xmb 2015-02-10 07:31:19 -08:00
Twinaphex
aba3ae1898 Merge pull request #1404 from lakkatv/xmb
(Menu) remove unused callback in the menu driver
2015-02-10 15:41:22 +01:00
Jean-André Santoni
f331eba299 (Menu) iterate was not used either 2015-02-10 15:06:41 +01:00
Jean-André Santoni
e330f03124 (Menu) init_lists was not used either 2015-02-10 15:02:38 +01:00
Jean-André Santoni
274cfe0f9f (Menu) input_postprocess was not used anymore by any menu driver 2015-02-10 14:52:25 +01:00
T. Joseph Carter
4bcaf40551 New project file should work. xmb still doesn't 2015-02-10 05:34:28 -08:00
T. Joseph Carter
f294dec776 How many copies of this do we need? Just one. 2015-02-10 00:10:51 -08:00
T. Joseph Carter
4ac5919d68 Give retroarch an icon in new OSX project 2015-02-10 00:09:27 -08:00
T. Joseph Carter
241a95630e Merge branch 'master' of https://github.com/libretro/RetroArch 2015-02-10 00:07:06 -08:00
T. Joseph Carter
b14cc6a635 fetch-submodules script for RA 2015-02-09 23:53:42 -08:00
T. Joseph Carter
9e80ac26ee New OSX project file. Very incomplete still. 2015-02-09 23:24:01 -08:00
twinaphex
3880856c94 Make rarch_defer_core more robust for 'load_game' 2015-02-10 03:05:58 +01:00
twinaphex
9efc11045d rarch_update_system_info - simplify 2015-02-10 02:59:01 +01:00
Twinaphex
95089ce7d1 Merge pull request #1403 from lakkatv/xmb
(XMB) Fix more duplicate icon bugs
2015-02-10 02:52:30 +01:00
Jean-André Santoni
3b2aa6ba40 (XMB) Fix more duplicate icon bugs 2015-02-10 02:50:22 +01:00
Twinaphex
0c5f10389b Merge pull request #1402 from lakkatv/xmb
(XMB) Display bug fix and code refactoring
2015-02-09 23:56:31 +01:00
Jean-André Santoni
a2380c4182 (XMB) Display bug fix and code refactoring 2015-02-09 22:54:14 +01:00
twinaphex
f3002c334f Move GLSL driver higher up the priority list 2015-02-09 21:49:29 +01:00
twinaphex
e0184f0877 We don't want to allow the user to disable fonts and lock himself
out of seeing a GUI - gets rid of hack in gl.c
2015-02-09 19:11:53 +01:00
Twinaphex
5ddadf5935 Merge pull request #1400 from lioncash/null
settings_data: Fix potential null pointer dereference
2015-02-09 17:13:57 +01:00
Lioncash
304f0e0492 settings_data: Fix potential null pointer dereference 2015-02-09 11:03:16 -05:00
Toad King
206797c6f9 creating all our mutexes with the same name very bad :P 2015-02-08 22:51:45 -06:00
twinaphex
55c898b880 rthreads.c - Take out code that is prone to deadlocks 2015-02-09 03:55:29 +01:00
twinaphex
0b926373ce (GLX) Buildfix 2015-02-09 02:03:41 +01:00
Twinaphex
db64c41ae7 Silence some warnings 2015-02-09 01:46:58 +01:00
Twinaphex
4c7ff4a22e Merge pull request #1399 from iKarith/master
Maybe make iOS project work (no promises for OSX yet)
2015-02-08 21:58:31 +01:00
Toad King
7c3655ba5d fix 2015-02-08 14:51:07 -06:00
T. Joseph Carter
fda087a954 Add modules back to XCode project 2015-02-08 11:34:39 -08:00
T. Joseph Carter
1f5e263939 The modules subdir IS needed on iOS, put it back 2015-02-08 10:52:10 -08:00
T. Joseph Carter
cecb8507f8 Merge branch 'master' of https://github.com/iKarith/RetroArch 2015-02-08 10:39:41 -08:00
T. Joseph Carter
224b0b4ec4 Merge branch 'master' of https://github.com/libretro/RetroArch 2015-02-08 10:37:53 -08:00
T. Joseph Carter
7754620cdb Possibly make iOS app build work (no shaders yet) 2015-02-08 10:36:59 -08:00
twinaphex
e5654ac385 (D3D) Buildfix 2015-02-08 18:46:03 +01:00
Alcaro
0acccbfa43 Why are we trying to support both the experimental and final version of something that's still experimental? 2015-02-08 18:42:40 +01:00