Commit Graph

9190 Commits

Author SHA1 Message Date
twinaphex d412c9f8d4 Fix some CXX_BUILD errors 2019-01-12 18:30:06 +01:00
Brad Parker f0e2f7dcf4 Merge branch 'master' into json_playlist 2019-01-11 09:02:11 -05:00
twinaphex 13ccf4d408 Silence some more static code analysis warnings 2019-01-11 01:35:18 +01:00
twinaphex c98b2e2292 Buildfixes and more static code analysis warning fixes 2019-01-10 22:24:43 +01:00
Twinaphex 5a12ca642c
Merge pull request #7967 from jdgleaver/rgui-gekko-colour-fix
(RGUI) Fix background + border colours for Gekko platforms
2019-01-10 15:16:31 +01:00
radius bd2a13e32c disable discord code in ozone 2019-01-10 09:01:03 -05:00
jdgleaver 74312180b9 (RGUI) Fix background + border colours for Gekko platforms 2019-01-10 13:16:08 +00:00
Brad Parker a331b7420e update copyrights 2019-01-09 17:19:19 -05:00
Brad Parker c7041260d7 add JSON playlist format 2019-01-09 17:13:13 -05:00
twinaphex 60533b10b7 (RGUI) Add specific color conversion for Gekko [Wii/Gamecube] 2019-01-09 22:05:33 +01:00
jdgleaver c433934415 (RGUI) Fix background + border colours for PS2 2019-01-09 15:34:52 +00:00
jdgleaver faaa6e081b (RGUI) Add colour themes 2019-01-09 10:50:24 +00:00
orbea 248c944ff8 Fix crash with the null menu driver and Qt frontend.
When failing to load content in the Qt companion ui while using the
null menu driver RetroArch will crash.

Now it just prints that it failed to load content in the Qt ui.
2019-01-08 23:01:05 -08:00
Twinaphex cdc0a79508
Merge pull request #7872 from natinusala/libnx-swkbd
libnx: implement swkbd for menu drivers
2019-01-09 00:29:31 +01:00
twinaphex b74b24e648 Change to C comment 2019-01-08 20:22:44 +01:00
Twinaphex 40997473ed
Merge branch 'master' into orbis2 2019-01-08 20:18:08 +01:00
orbea bfc366decc Squeeze extra blank lines with cat(1).
Example:

find . -type f -iname '*.c' | while read -r i; do
  cat -s "$i" > "$i.new"
  mv "$i.new" "$i"
done
2019-01-08 11:04:58 -08:00
Twinaphex 2c8ca91cf0
Merge pull request #7930 from orbea/opt
Fix crash with quick menu options.
2019-01-08 12:30:48 +01:00
Alfredo Monclus 628fc8a690 Fix #7934 2019-01-08 07:52:17 -03:00
orbea 098dc61ad3 Fix crash with quick menu options.
If the 'game specific options' setting is disabled the drop down menu
for the core options will crash on the first option and then have an
offset with all of the additional options.

Fixes https://github.com/libretro/RetroArch/issues/7915
2019-01-07 18:10:31 -08:00
radius 6613421537 [discord] fix 2019-01-07 19:08:53 -05:00
Twinaphex 6384313279
Merge pull request #7914 from orbea/menu
menu: Display menu drivers in alphabetical order.
2019-01-07 10:03:27 +01:00
Brad Parker 459a19be57 fix infinite loop with null menu driver 2019-01-07 00:31:57 -05:00
orbea d25b632b88 Fix segfault with null menu driver. (#7913) 2019-01-06 23:34:25 -05:00
Brad Parker 5bedd981ec allow shaders when menu is disabled 2019-01-06 23:03:28 -05:00
orbea 161785f588 menu: Display menu drivers in alphabetical order. 2019-01-06 17:38:16 -08:00
alfrix 18db7104cc More icons to ozone, update changelog 2019-01-06 01:04:32 -03:00
alfrix c92136015a a couple more icons 2019-01-06 01:03:27 -03:00
alfrix ac8d3d7a51 Simplify the icon search and handle incomplete themes better 2019-01-06 01:03:27 -03:00
alfrix e83b3adc20 More Icons 2019-01-06 01:03:27 -03:00
Andrés 714631b38d Discord ask-to-join fixes (#7903)
* C89 Fix

* use strlcat instead

* declare i on top

* declare buf on top
2019-01-05 19:16:28 -05:00
Brad Parker bbfbefa9dd easter egg 2019-01-05 18:33:29 -05:00
Twinaphex 90baac517d
Merge pull request #7732 from fr500/discord
WIP: Discord ask-to-join
2019-01-05 22:31:21 +01:00
Twinaphex e70806c51c
Merge pull request #7817 from orbea/clear
menu: Reset initial menu position after selecting a core.
2019-01-05 17:17:16 +01:00
Twinaphex 33c777cbfc
Merge pull request #7881 from orbea/sort
libretro-common: Sort config file conditionally.
2019-01-05 17:07:59 +01:00
jdgleaver 1398d889cb (RGUI) Fix colours for PSP and GEKKO builds 2019-01-04 13:41:15 +00:00
natinusala 6cd7c49c66 libnx: add fail-safe to swkbd 2019-01-04 14:37:28 +01:00
Francisco Javier Trujillo Mata 577456e3e7 Make a struct to save the colors used in the RGUI 2019-01-04 00:38:06 +01:00
Francisco Javier Trujillo Mata cca9bcc09d Make general functions to lead with RGUI colors 2019-01-04 00:38:06 +01:00
orbea 849259d8f6 libretro-common: Sort config file conditionally.
This allows optionally sorting configure files and is needed to fix the
order of inputs in the autoconfig profiles which should not be sorted
alphabetically.

Fixes https://github.com/libretro/RetroArch/issues/7873
2019-01-03 15:28:32 -08:00
psxdev 11186dd5e0 [ORBIS] Workaround weird behaviour with task with bg.png in xmb 2019-01-03 21:23:44 +01:00
natinusala a164f77c94 libnx: only use swkbd if in an application 2019-01-03 14:14:13 +01:00
orbea 5fcec0f561 menu: Add sublabel for 'menu_horizontal_animation'.
Fixes https://github.com/libretro/RetroArch/issues/5271.
2019-01-02 20:36:35 -08:00
natinusala 39282915f8 libnx: implement swkbd for menu drivers 2019-01-02 16:24:31 +01:00
twinaphex 9c5c0aea58 Start replacing WinRT ifdefs so that Windows Phone 8 can be detected
too
2019-01-02 13:30:58 +01:00
twinaphex 541dc13d64 We cannot have VLAs 2019-01-02 01:15:30 +01:00
Twinaphex e7befaba37
Merge pull request #7864 from fr500/master
[info] use sublabels for controller information
2019-01-01 18:35:58 +01:00
radius 051e5bd262 [gui] add sublabel for start core 2019-01-01 12:35:29 -05:00
radius 88b4ec61e7 [info] use sublabels for controller information 2019-01-01 12:29:20 -05:00
krzys-h 48d82929ff (UWP) Add support for loading cores from optional packages 2019-01-01 16:21:47 +01:00
twinaphex bb5cd1dfeb Change C++ comments to c 2018-12-31 21:08:25 +01:00
Francisco Javier Trujillo Mata d44ad6abd4 PS2 TODOs 2018-12-31 18:56:22 +01:00
Twinaphex 22e54dfc6b
Merge pull request #7839 from frangarcj/orbis2
[WIP] ORBIS / PS4 Port
2018-12-30 01:04:50 +01:00
twinaphex dd60b5d576 MSVC2017 Non-UWP buildfixes 2018-12-29 02:54:17 +01:00
twinaphex 0e5fbbb9e1 Silence some warnings 2018-12-29 02:12:50 +01:00
radius 9aa7b2bd62 [discord] add user avatar to ozone 2018-12-28 17:16:17 -05:00
radius 87c99a491b [discord] make the avatar download code a function instead of this mess 2018-12-28 17:16:15 -05:00
radius a6e6ccc244 [discord] **not-working** download the connecting user avatar seems something special needs to be done for https transfers on windows at least
see: https://github.com/libretro/RetroArch/issues/7451
2018-12-28 17:16:14 -05:00
krzys-h b201d669b5 First iteration of UWP support
Enough to kind of run

Working drivers: xinput, d3d11
Still missing: input driver with keyboard support, audio driver
2018-12-28 22:09:22 +01:00
Francisco José García García 19549ddccf [ORBIS] Fix __assert 2018-12-27 20:18:53 +01:00
Twinaphex 3548956509
Merge pull request #7827 from orbea/kiosk
menu: Hide options for the kiosk menu.
2018-12-26 19:10:41 +01:00
orbea b84b1b083a menu: Hide options for the kiosk menu.
This hides 'reset core association', 'start recording' and
'start streaming' when the kiosk menu is active.

Fixes https://github.com/libretro/RetroArch/issues/7824
Fixes https://github.com/libretro/RetroArch/issues/7825
2018-12-26 09:40:42 -08:00
orbea ff63852a7c menu: Hide 'Parent Directory' in compressed archives.
When browsing compressed archives 'Parent Directory' will not work and
will endlessly recurse into non-existent empty directories where the
user will have to press the back button to get out of every instance.

This will now hide 'Parent Directory' in compressed archives to avoid
this issue. The user will still be able to press the back button to
exit.

Fixes https://github.com/libretro/RetroArch/issues/2604
2018-12-26 09:19:03 -08:00
Twinaphex 5e1ec17742
Merge pull request #7804 from fr500/fixes
reset on hardcore enable
2018-12-26 04:45:43 +01:00
orbea 7e2aafa382 menu: Reset initial menu position after selecting a core.
Fixes https://github.com/libretro/RetroArch/issues/2506 (Again)

v2: Only reset the menu posiition after selecting a core and not when
    just toggling the menu.
2018-12-24 22:45:19 -08:00
orbea 476abf7dad materialui: Move 'Start Core' before 'Load Core'.
This matches other menu drivers better where its already like this in
rgui, xmb and ozone.
2018-12-24 15:32:24 -08:00
radius 90d816f31a reset on toggle everytime 2018-12-23 16:24:18 -05:00
orbea d51b801221 ozone: Fix crash with menu_use_preferred_system_color_theme.
Fixes https://github.com/libretro/RetroArch/issues/7805
2018-12-23 11:41:43 -08:00
radius 6eae0df010 reset on hardcore enable 2018-12-23 11:16:55 -05:00
Twinaphex c46e3468e2
Merge pull request #7796 from orbea/xmb
xmb: Don't show a black background without assets.
2018-12-23 13:39:33 +01:00
radius 0b8e39dd6b fix #7002 2018-12-22 20:36:42 -05:00
orbea 45c85aa6fe xmb: Don't show a black background without assets.
This also now only hides the time icon instead of the entire time
without assets.

Fixes https://github.com/libretro/RetroArch/issues/7795
2018-12-22 15:51:43 -08:00
Twinaphex f353feba8a
Merge pull request #7789 from jdgleaver/buff-size-fix
Fix gcc -Wformat-truncation= warning (redux)
2018-12-22 19:45:24 +01:00
Twinaphex 326395ff17
Merge pull request #7794 from orbea/load
menu: Reset position after pushing quick menu.
2018-12-22 19:45:08 +01:00
Twinaphex 1df95bb28b
Merge pull request #7793 from fr500/fixes
move core sideloading to load core menu
2018-12-22 19:44:45 +01:00
orbea 4da7092aff menu: Reset position after pushing quick menu.
Fixes:
  https://github.com/libretro/RetroArch/issues/5595
  https://github.com/libretro/RetroArch/issues/2506
2018-12-21 18:43:14 -08:00
radius c70e322496 cleanup 2018-12-21 18:19:48 -05:00
radius 09deb96397 move core sideloading to load core menu 2018-12-21 18:17:17 -05:00
jdgleaver c2d4b70f8c menu_displaylist_parse_options_remappings(): increase buffer sizes, remove string precision qualifier (alternative to PR #7782) 2018-12-21 16:12:20 +00:00
orbea 2ab78dc67b menu: Use the default dir for recording output when unset. 2018-12-20 16:13:10 -08:00
Twinaphex 1d3874a142
Merge pull request #7779 from jdgleaver/rgui-colours
(RGUI) Enable customisation of background and border colours
2018-12-20 20:51:12 +01:00
Twinaphex 3bd1c3fa6a
Merge pull request #7782 from orbea/format
Fix gcc -Wformat-truncation= warning.
2018-12-20 20:49:37 +01:00
orbea e6eedd05f5 Fix gcc -Wformat-truncation= warning.
menu/menu_displaylist.c: In function ‘menu_displaylist_ctl’:
menu/menu_displaylist.c:3441:28: warning: ‘ [’ directive output may be truncated writing 2 bytes into a region of size between 1 and 255 [-Wformat-truncation=]
                         "%s [%s %u]", descriptor, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_USER), p + 1);
                            ^~
menu/menu_displaylist.c:3441:25: note: using the range [0, 4294967295] for directive argument
                         "%s [%s %u]", descriptor, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_USER), p + 1);
                         ^~~~~~~~~~~~
menu/menu_displaylist.c:3440:16: note: ‘snprintf’ output 6 or more bytes (assuming 260) into a destination of size 255
                snprintf(desc_label, sizeof(desc_label),
                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                         "%s [%s %u]", descriptor, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_USER), p + 1);
                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2018-12-20 11:45:48 -08:00
orbea 5175c67381 menu: Fix directory settings.
The "Recording Output" and "Screenshot" directory settings accidentally
overwrote each other.

Fixes https://github.com/libretro/RetroArch/issues/7776
2018-12-20 11:13:28 -08:00
jdgleaver f603d4ec30 (RGUI) Enable customisation of background and border colours 2018-12-20 16:13:16 +00:00
Brad Parker 458bb9fbb5 add option to toggle menu by holding down start button 2018-12-19 14:53:17 -05:00
Twinaphex 26568a6bc2
Merge pull request #7770 from jdgleaver/rgui-user-index
(RGUI) Add user index label to control menu entries
2018-12-19 17:47:53 +01:00
jdgleaver f68d756af3 (RGUI) Add user index label to control menu entries 2018-12-19 12:19:29 +00:00
Stuart Carnie 11a7d34358
fix: animations deleted during update mutate tween list, causing crash
defer deletes resulting from callbacks until after update loop
2018-12-18 17:12:19 -07:00
Twinaphex 22fcd0be67
Merge pull request #7762 from orbea/rgui
Fix gcc -Wformat-truncation= warnings.
2018-12-18 10:12:50 +01:00
Brad Parker 4b323a45df paths can be const 2018-12-17 09:38:12 -05:00
Brad Parker 971591fb9c use filestream/VFS for core sideload 2018-12-17 09:25:52 -05:00
orbea 13e29308d5 Fix gcc -Wformat-truncation= warnings.
menu/drivers/rgui.c: In function ‘rgui_render’:
menu/drivers/rgui.c:670:53: warning: ‘%-*s’ directive output may be truncated writing up to 2147483648 bytes into a region of size between 0 and 252 [-Wformat-truncation=]
       snprintf(message, sizeof(message), "%c %-*.*s %-*s",
                                                     ^~~~
menu/drivers/rgui.c:676:13:
             type_str_buf);
             ~~~~~~~~~~~~
menu/drivers/rgui.c:670:42: note: assuming directive output of 254 bytes
       snprintf(message, sizeof(message), "%c %-*.*s %-*s",
                                          ^~~~~~~~~~~~~~~~
menu/drivers/rgui.c:670:7: note: ‘snprintf’ output between 4 and 4294967300 bytes into a destination of size 255
       snprintf(message, sizeof(message), "%c %-*.*s %-*s",
       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
             entry_selected ? '>' : ' ',
             ~~~~~~~~~~~~~~~~~~~~~~~~~~~
             (int)(RGUI_TERM_WIDTH(fb_width) - (entry_spacing + 1 + 2) - entry_title_buf_utf8len + entry_title_buf_len),
             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
             (int)(RGUI_TERM_WIDTH(fb_width) - (entry_spacing + 1 + 2) - entry_title_buf_utf8len + entry_title_buf_len),
             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
             entry_title_buf,
             ~~~~~~~~~~~~~~~~
             entry_spacing,
             ~~~~~~~~~~~~~~
             type_str_buf);
             ~~~~~~~~~~~~~
menu/drivers/rgui.c:670:53: warning: ‘%-*s’ directive output may be truncated writing up to 2147483648 bytes into a region of size between 0 and 252 [-Wformat-truncation=]
       snprintf(message, sizeof(message), "%c %-*.*s %-*s",
                                                     ^~~~
menu/drivers/rgui.c:676:13:
             type_str_buf);
             ~~~~~~~~~~~~
menu/drivers/rgui.c:670:42: note: assuming directive output of 254 bytes
       snprintf(message, sizeof(message), "%c %-*.*s %-*s",
                                          ^~~~~~~~~~~~~~~~
menu/drivers/rgui.c:670:7: note: ‘snprintf’ output between 4 and 4294967300 bytes into a destination of size 255
       snprintf(message, sizeof(message), "%c %-*.*s %-*s",
       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
             entry_selected ? '>' : ' ',
             ~~~~~~~~~~~~~~~~~~~~~~~~~~~
             (int)(RGUI_TERM_WIDTH(fb_width) - (entry_spacing + 1 + 2) - entry_title_buf_utf8len + entry_title_buf_len),
             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
             (int)(RGUI_TERM_WIDTH(fb_width) - (entry_spacing + 1 + 2) - entry_title_buf_utf8len + entry_title_buf_len),
             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
             entry_title_buf,
             ~~~~~~~~~~~~~~~~
             entry_spacing,
             ~~~~~~~~~~~~~~
             type_str_buf);
             ~~~~~~~~~~~~~
2018-12-16 20:22:53 -08:00
Twinaphex af0bf7a992
Merge pull request #7761 from orbea/c89
Fix gcc warnings with C89_BUILD.
2018-12-17 05:18:13 +01:00
Twinaphex 6dcdb843e8
Merge pull request #7758 from fr500/sideload
Sideload
2018-12-17 05:15:41 +01:00
orbea 169002ef7f Fix a gcc -Wformat= warning with C89_BUILD.
The posix spec claims "%r" is equivelent to "%I : %M : %S %p".

Source: http://pubs.opengroup.org/onlinepubs/9699919799/functions/strftime.html

menu/menu_driver.c:395:15: warning: ISO C90 does not support the ‘%r’ gnu_strftime format [-Wformat=]
             "%r", localtime(&time_));
               ^
2018-12-16 19:59:47 -08:00
twinaphex 862a4e099b Duplicate entry removed 2018-12-17 00:07:35 +01:00
radius 6c936274b7 make file copy operation a function
add sublabels

improve localization
2018-12-16 16:55:12 -05:00
Twinaphex 708c9c0774
Merge pull request #7754 from orbea/c89
Fix C89 build with clang.
2018-12-16 19:47:17 +01:00
Twinaphex fc6b3b7335
Merge pull request #7755 from fr500/fixes
subsystem: remember last used folder
2018-12-16 19:46:01 +01:00