Timo Strunk
|
1e44a4056c
|
Merge remote-tracking branch 'upstream/master' into zip_support
|
2014-09-11 18:03:34 +02:00 |
|
Timo Strunk
|
203e890463
|
Forgot to add JOYLIB for zip support
|
2014-09-11 18:03:02 +02:00 |
|
twinaphex
|
cb4833cfc8
|
(D3D) Buildfix #1
|
2014-09-11 18:02:33 +02:00 |
|
twinaphex
|
e89e157996
|
(D3D) Share functions inbetween XDK and D3D PC drivers
|
2014-09-11 17:47:56 +02:00 |
|
Twinaphex
|
e73387ca08
|
Merge pull request #973 from lioncash/osx
osx: Get rid of direct instance variables in settings interfaces
|
2014-09-11 16:56:21 +02:00 |
|
Lioncash
|
cc4714ea70
|
osx: Get rid of direct instance variables in settings interfaces
The properties already do the same thing
|
2014-09-11 10:41:13 -04:00 |
|
Twinaphex
|
2981f0f6cd
|
Merge pull request #972 from lioncash/flags
osx: Remove a redundant compile flag
|
2014-09-11 16:27:48 +02:00 |
|
Lioncash
|
bcbb4beddd
|
osx: Remove a redundant compile flag
This is already defined
|
2014-09-11 10:08:15 -04:00 |
|
Twinaphex
|
de32fc8e3a
|
Merge pull request #971 from lioncash/dead
Remove some dead stores
|
2014-09-11 16:02:23 +02:00 |
|
Lioncash
|
4e0b25d0fc
|
Remove some dead stores
|
2014-09-11 09:30:40 -04:00 |
|
twinaphex
|
080a79d9c5
|
(DirectInput) Build fix
|
2014-09-11 07:37:59 +02:00 |
|
twinaphex
|
b360a308ce
|
(Android) Build fix
|
2014-09-11 07:35:42 +02:00 |
|
twinaphex
|
b4eab4760e
|
(settings data) Take out unnecessary g_extern.verbose line
|
2014-09-11 07:32:52 +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
|
35dd24654f
|
(menu_entries.c) do menu_build_scroll_indices always at the end
of the menu_parse_and_resolve function
|
2014-09-11 06:20:10 +02:00 |
|
twinaphex
|
088f8c2497
|
(Menu) Refactor driver settings
|
2014-09-11 06:11:50 +02:00 |
|
twinaphex
|
b26a9c68d1
|
(Menu) Implement video_message_pos_x/video_message_pos_y options
|
2014-09-11 05:55:59 +02:00 |
|
twinaphex
|
66a1c32028
|
(Menu) Fix video_font_path option
|
2014-09-11 05:48:35 +02:00 |
|
twinaphex
|
a5177941af
|
(Menu) Fix font_size option
|
2014-09-11 05:29:42 +02:00 |
|
twinaphex
|
ee24b40c1a
|
(GLUI) Fix warnings
|
2014-09-11 04:42:31 +02:00 |
|
Twinaphex
|
e26e28020a
|
Merge pull request #970 from lakkatv/glui
(GLUI) Fix disp_set_label
|
2014-09-11 04:24:25 +02:00 |
|
Jean-André Santoni
|
075659723f
|
(GLUI) Fix disp_set_label
|
2014-09-11 04:22:30 +02:00 |
|
Twinaphex
|
57dd0c3ad6
|
Merge pull request #969 from lakkatv/glui
(GLUI) GL based RGUI display driver clone
|
2014-09-11 04:12:59 +02:00 |
|
Jean-André Santoni
|
5e433abf8b
|
(GLUI) GL based RGUI display driver clone
|
2014-09-11 04:07:07 +02:00 |
|
twinaphex
|
259c3f0de3
|
Revert "(Settings data) refactor setting_data_*_setting functions"
This reverts commit 4438f7373207b54bc57db1c623fded59a6b94881.
|
2014-09-11 03:42:07 +02:00 |
|
twinaphex
|
5bc3e3ea0a
|
(Menu) menu_entries.c - Cast file_type to menu_file_type_t
|
2014-09-11 02:09:04 +02:00 |
|
twinaphex
|
7b27cda61b
|
(RMenu) Build fix
|
2014-09-11 01:59:28 +02:00 |
|
twinaphex
|
30b31e3c45
|
(Menu/Disp) Fix core name representation
|
2014-09-11 01:57:25 +02:00 |
|
twinaphex
|
973004bee3
|
(menu_common_backend.c) Refactor duplicate code
|
2014-09-11 01:23:20 +02:00 |
|
twinaphex
|
478fa43261
|
(Rsound) Build fix
|
2014-09-11 00:51:46 +02:00 |
|
Twinaphex
|
307c552b2a
|
Merge pull request #968 from lakkatv/lakka
(Lakka) Savestate switching
|
2014-09-11 00:38:26 +02:00 |
|
Jean-André Santoni
|
0301b924ca
|
(Lakka) Savestate switching
|
2014-09-11 00:09:53 +02:00 |
|
Twinaphex
|
e945192c35
|
Merge pull request #967 from lakkatv/lakka
(Lakka) Fix subitems allocation
|
2014-09-10 23:16:03 +02:00 |
|
Jean-André Santoni
|
eb2c735ba3
|
(Lakka) Fix subitems allocation
|
2014-09-10 23:13:19 +02:00 |
|
twinaphex
|
4438f73732
|
(Settings data) refactor setting_data_*_setting functions
|
2014-09-10 22:05:11 +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
|
84563583d1
|
Merge pull request #966 from lakkatv/lakka
Use setting_data_get_string_representation + fix a bug
|
2014-09-10 15:16:10 +02:00 |
|
Jean-André Santoni
|
684af29c06
|
(Lakka) Use setting_data_get_string_representation
|
2014-09-10 14:38:41 +02:00 |
|
Timo Strunk
|
ecd877f476
|
Converted C++ to C comments
|
2014-09-10 11:31:29 +02:00 |
|
Timo Strunk
|
67b310ec07
|
Included ZLIB libs in Windows compile
|
2014-09-10 11:09:51 +02:00 |
|
Jean-André Santoni
|
2aa628d935
|
(Lakka) First subitem bugfix
|
2014-09-10 10:58:02 +02:00 |
|
Timo Strunk
|
8074679c62
|
Added missing ZLIB object files also to windows makefile
|
2014-09-10 10:48:45 +02:00 |
|
Timo Strunk
|
1f3a14750b
|
Compiled zlib in due to some missing dependencies - slimming from previous commit
|
2014-09-10 10:41:59 +02:00 |
|
Timo Strunk
|
a04ce2fe88
|
Compiled zlib in due to some missing dependencies - slimming incoming in future commits
|
2014-09-10 10:35:33 +02:00 |
|
Timo Strunk
|
5b2edff6f0
|
This commit removes zip from the default valid_extensions. Please review this commit before merging to master.
|
2014-09-10 10:31:12 +02:00 |
|