Commit Graph

571 Commits

Author SHA1 Message Date
Monroe88 a87efba091 Only apply shader parameters immediately in Shader Parameters (Current). 2014-09-23 21:19:03 -05: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 193f416f8f Zip UI cleanup before pull request 2014-09-21 11:03:32 +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
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 97ea43994e Zipfiles open or run half finished 2014-09-20 19:10:05 +02:00
Timo Strunk 9c9543e7eb Added toggle button to open zip files in load content and detect core 2014-09-19 20:31:53 +02:00
twinaphex fffed52892 Silence warning 'variable is used before its value is set' 2014-09-16 01:09:10 +02:00
twinaphex a09e04f679 Split up driver_menu.h into three separate header files -
for menu display API, menu backend API, and menu driver general API
2014-09-16 00:52:07 +02:00
twinaphex bbcf2e5eda (Menu) Implement stub functions for shader manager functions in menu_common_backend.c 2014-09-15 21:54:03 +02:00
twinaphex 756356870b (Menu) Refactor more code to menu_action.c 2014-09-15 07:52:08 +02:00
twinaphex 696b1cdef8 (Menu) Refator common code into calls to menu_action_setting_apply 2014-09-15 00:34:00 +02:00
twinaphex 899e69f921 (Settings/menu) Add WITH_CMD to settings_data.c 2014-09-14 23:44:32 +02:00
twinaphex 3d689bd40f (Menu) Add SD_FLAG_EXIT to signal to the menu that we want to cleanly
exit out of the menu
2014-09-14 22:39:33 +02:00
twinaphex eff9bf17a8 Reimplement menu toggle in menu - now remembers last menu
(Disp) Menu display drivers shouldn't influence control flow
of menu, so take this out and move menu toggle control flow
to menu_backend driver
instead
2014-09-14 18:07:00 +02:00
twinaphex 01c9d033ae (GX) Build fixes 2014-09-12 22:12:41 +02:00
Timo Strunk 6386bfdb14 Menu now loads file from carchive correctly in the cases of deferred core and the standard case (like MENU_FILE_PLAIN) 2014-09-12 17:52:16 +02:00
twinaphex 85f0db5bad (Menu) Create menu_action_setting_driver and have Lakka and RGUI both
use it
2014-09-12 06:46:43 +02:00
twinaphex f5e523a8c3 Refactor/rename menu_action.c functions 2014-09-12 06:04:02 +02:00
twinaphex 4a14658278 (Menu) Split up reusable menu_action code to menu_action.c 2014-09-12 05:54:58 +02:00
twinaphex d96de429ea (Menu) Add RARCH_CMD_LOAD_CONTENT_PERSIST 2014-09-12 05:01:24 +02:00
twinaphex 550ebc0e49 (Menu) Fix case where we load content with 'Load Content' 2014-09-12 04:09:01 +02:00
Twinaphex fd001f6b52 Merge pull request #975 from lioncash/realloc
settings_data: Guard against possible realloc/malloc failures
2014-09-12 02:25:14 +02:00
Lioncash 8cf195868e settings_data: Guard against possible realloc/malloc failures 2014-09-11 20:21:11 -04:00
Jean-André Santoni 8b01b78123 (Lakka) Allow editing some boolean, uint and float settings 2014-09-11 22:07:41 +02:00
twinaphex 75d2e13dcb Make drivers non-const 2014-09-11 07:06:20 +02:00
twinaphex f1ccf07603 (Menu) Add type MENU_FILE_DRIVER 2014-09-11 06:28:52 +02:00
twinaphex 088f8c2497 (Menu) Refactor driver settings 2014-09-11 06:11:50 +02:00
twinaphex 66a1c32028 (Menu) Fix video_font_path option 2014-09-11 05:48:35 +02:00
twinaphex 973004bee3 (menu_common_backend.c) Refactor duplicate code 2014-09-11 01:23:20 +02:00
twinaphex 176951cc5f (Menu) Add more MENU_FILE_* types 2014-09-10 20:59:16 +02:00
twinaphex 3af183dfe3 (Menu) Create two new types - MENU_FILE_SHADER and MENU_FILE_SHADER_PRESET 2014-09-10 18:36:35 +02:00
twinaphex 0eea8307a5 (Menu) Refactor common code in disp/rgui | rmenu | rmenu_xui 2014-09-10 18:26:02 +02:00
twinaphex 05f32cdcfc (Menu) Add MENU_FILE_DIRECTORY type to switch 2014-09-10 17:24:02 +02:00
twinaphex 0cbb85915f (Menu) Refactor menu_action_ok 2014-09-10 17:11:24 +02:00
twinaphex c329501e2f (Menu) Refactor hardcoded input settings 2014-09-08 22:30:09 +02:00
twinaphex 1c1194cdca (Menu) Refactor two input settings 2014-09-08 22:12:22 +02:00
twinaphex 9f25746100 (menu_common_backend.c) cleanups 2014-09-08 19:53:42 +02:00
twinaphex 3709e524bc (Menu) Move settings data descriptions to settings_data.c 2014-09-08 06:12:43 +02:00
twinaphex bbc03fe14d (Menu) Refactor 2014-09-07 06:43:20 +02:00
twinaphex 88b77df234 (Menu) Create setting_data_get_label and move code from menu_common_backend.c
to settings_data.c
2014-09-07 06:00:41 +02:00
Twinaphex c2ef81f542 Merge pull request #952 from timostrunk/compressed_file_menu
Compressed file menu
2014-09-06 22:11:03 +02:00
twinaphex fface89461 Move/rename menu_replace_config to retroarch.c (rarch_replace_config) 2014-09-06 22:05:33 +02:00
Timo Strunk 3b7dc34c1a Made GUI react on compressed files and give them a different label in RGUI 2014-09-06 21:03:22 +02:00
Twinaphex 6fdc22eb0b Merge pull request #943 from lioncash/printf-fmt
Fix some printf specifiers to the correct signed-ness
2014-09-06 03:40:26 +02:00
twinaphex a3443a7911 (Menu) Refactor ST_PATH settings 2014-09-06 02:47:31 +02:00
Lioncash ab1ab62a6d Fix some printf specifiers to the correct signed-ness 2014-09-05 19:43:32 -04:00
twinaphex 7e6aa11c5b (Menu) Fix Shader Preset Save As option 2014-09-06 01:34:05 +02:00
twinaphex 780688ec92 (Menu) Refactor netplay_tcp_udp_port setting with MENU_FILE_LINEFEED 2014-09-06 00:16:05 +02:00
twinaphex 5793042b7d (Menu) Add MENU_FILE_LINEFEED 2014-09-06 00:12:58 +02:00
twinaphex 3dcb74ddbb (Menu) Combine get_description functions 2014-09-05 04:21:46 +02:00
twinaphex f7e1cb870f (Menu) Immediately apply changes to shader parameters 2014-09-05 03:44:19 +02:00
twinaphex d72b368dc5 (Menu) Ugly hack but it gets the shader passes working again 2014-09-05 03:24:06 +02:00
twinaphex 030977b020 (Menu) Refactor menu shader passes - shader pass needs to be
fixed still
2014-09-05 02:24:01 +02:00
twinaphex 9913edc365 (Menu) Refactor shader pass string representation 2014-09-05 00:41:03 +02:00
twinaphex 082b22e670 (Menu) Rename video_shader_passes to video_shader_num_passes 2014-09-05 00:29:33 +02:00
twinaphex 7bf45b23e9 (Menu) Fix shader parameters 2014-09-05 00:13:50 +02:00
twinaphex dd3c6588ea (Menu) Fix shader label representation 2014-09-04 23:54:38 +02:00
twinaphex 609ccb80d2 (Menu) Refactor video_shader_preset 2014-09-04 21:43:07 +02:00
twinaphex b117a09697 (Menu) Refactor SHADER_PRESET_SAVE 2014-09-04 21:23:28 +02:00
twinaphex 447e65c6f4 (Menu) Refactor disk_index/disk_image_append settings 2014-09-04 21:19:02 +02:00
twinaphex f6625b4edf (Menu) Refactor MENU_DISK_OPTIONS 2014-09-04 21:11:53 +02:00
twinaphex d14effc3b0 (Menu) Refactor MENU_SETTINGS_CONFIG 2014-09-04 19:43:54 +02:00
twinaphex b98c74bf25 (Menu) Refactor MENU_SETTINGS_SHADER_OPTIONS 2014-09-04 19:34:28 +02:00
twinaphex 1404dd42d7 (Menu) Refactor MENU_SETTINGS_PATH_OPTIONS 2014-09-04 19:24:27 +02:00
twinaphex fb9c3f5555 (Menu) Refactor MENU_SETTINGS_OPTIONS 2014-09-04 19:20:14 +02:00
twinaphex e77ba49b3a (Menu) Refactor MENU_SETTINGS_VIDEO_OPTIONS 2014-09-04 19:02:42 +02:00
twinaphex 497e497c3f (Menu) Refactor MENU_SETTINGS_AUDIO_OPTIONS 2014-09-04 18:37:31 +02:00
twinaphex 7f34615a49 (Menu) Fix video_shader_pass setting 2014-09-04 17:45:02 +02:00
twinaphex c61e552f08 (Menu) Get rid of performance counters enums 2014-09-04 05:27:47 +02:00
twinaphex eac82398a5 (Menu) Fix core_list action OK 2014-09-04 05:20:51 +02:00
twinaphex 288a4af1b0 (menu_common_backend.c) Cut down on code duplication 2014-09-04 05:18:42 +02:00
twinaphex 0f12c67054 (Deferred core) Fix direct loading of deferred core 2014-09-04 05:10:44 +02:00
twinaphex ca9fd4bc81 (Deferred Core) Fixed deferred core 2014-09-04 04:54:30 +02:00
twinaphex 21e85d1a17 (Menu) Deferred core list shows up again - correct core propagating
doesnt' though
2014-09-04 04:34:03 +02:00
twinaphex 4beeec62be (Menu) Move up detect_core_list else 2014-09-04 04:20:22 +02:00
twinaphex 2da1924a57 Revert "(Menu) Change label detect_core_list to deferred_core_list for consistency"
This reverts commit 47d8bd8882.
2014-09-04 04:10:41 +02:00
twinaphex 47d8bd8882 (Menu) Change label detect_core_list to deferred_core_list for consistency 2014-09-04 03:55:00 +02:00
twinaphex 3452eb76e7 (Menu) refactor menu_action_ok 2014-09-04 02:15:06 +02:00
twinaphex c5ebf22bfc (Menu) Refactor menu_action_ok 2014-09-04 02:03:34 +02:00
twinaphex 5ef289fe28 (Menu) Refactor more hardcoded enums 2014-09-04 00:25:19 +02:00
twinaphex a72a866db3 (Menu) Remove MENU_SETTINGS_CORE enum 2014-09-04 00:18:26 +02:00
twinaphex a88198a12e (Menu) Get rid of hardcoded MENU_SETTINGS_PERFORMANCE_COUNTERS enum 2014-09-03 22:04:46 +02:00
twinaphex 836124c217 (Menu) Create menu_entries_get_description 2014-09-03 21:26:05 +02:00
twinaphex a03d1475f9 (Menu) Refactor hardcoded APPLY_SHADER_CHANGES enum 2014-09-03 21:18:01 +02:00
twinaphex 8600b6dd8c (Menu) menu_action_ok - cleanup 2014-09-03 20:57:50 +02:00
twinaphex d539bed82c Hide more manipulation of lifecycle_state behind rarch_main_set_state
function
2014-09-03 18:36:46 +02:00
twinaphex 5a5d58d8e8 Refactor more direct manipulation of g_extern.lifecycle_state 2014-09-03 16:58:20 +02:00
twinaphex c92269dedf Move core_info/core_info_current to global 2014-09-03 14:57:29 +02:00
twinaphex 5574e00ae3 (Menu/General) Refactor rarch_defer_core 2014-09-03 05:59:16 +02:00
twinaphex b68b4f13e6 (Menu) Get rid of OPEN_HISTORY enum 2014-09-03 03:16:40 +02:00
twinaphex 98c5e73d81 (Menu) Rewrite menu_action_ok shader options 2014-09-03 03:04:06 +02:00
twinaphex 865f812644 (Menu) Refactor more code in menu_action_ok to not be dependent
on menu setting IDs
2014-09-03 02:05:52 +02:00
twinaphex 6bc7e3452e (Menu) Refactor menu_action_ok for ST_DIR settings 2014-09-03 01:33:28 +02:00
twinaphex aa21cfda0e (Menu) Get rid of more hardcoded enums 2014-09-03 01:14:29 +02:00
twinaphex 223e062b66 (Menu) Correctly propagate label for ST_PATH settings 2014-09-03 00:49:30 +02:00
twinaphex bc1358a021 Refactor load_menu_content_history 2014-09-03 00:14:02 +02:00
twinaphex bc611b8cc1 (Menu) Add MENU_FILE_PLAYLIST_ENTRY 2014-09-02 23:42:40 +02:00
twinaphex 9bd3800ca0 Dehardcode driver.menu->menu_stack in menu_entries too 2014-09-02 15:25:53 +02:00