Commit Graph

42682 Commits

Author SHA1 Message Date
radius 789897481b fix a bug with the || clean-up, tried to clean up the whole thing a bit 2018-02-14 22:32:19 -05:00
Twinaphex be87075618
Merge pull request #6302 from bparker06/fseek
use 64-bit file offsets/seeking on windows
2018-02-14 07:29:34 +01:00
Brad Parker 95bb7f5aa5 use 64-bit file offsets/seeking on windows 2018-02-14 06:16:12 +00:00
twinaphex b01ac41c5f (XMB) C89 fixes 2018-02-14 05:42:42 +01:00
Twinaphex 186528a7e0
Merge pull request #6301 from fr500/master
remove the empty || that is shown when FPS display is disabled
2018-02-14 05:11:15 +01:00
radius 5b99a74cd8 remove the empty || that is shown when FPS display is disabled 2018-02-13 22:43:34 -05:00
Twinaphex a6539570a2
Merge pull request #6300 from GameDragon2k/master
Small fix for certain RetroAchievement conditions.
2018-02-14 03:59:21 +01:00
GameDragon2k 468256a8f8 Reset hits after evaluation. 2018-02-13 21:56:04 -05:00
GameDragon2k 79219c1640 Fix issue regarding Add Hits condition type 2018-02-13 21:43:41 -05:00
twinaphex 71b423c572 Don't use mmap for libretrodb - using mmap seems
to have adverse performance impact
2018-02-13 07:34:19 +01:00
Twinaphex 8f64909886
Merge pull request #6296 from fr500/master
de-hardcode rom count
2018-02-13 04:13:24 +01:00
radius a16cbe7cde de-hardcode rom count 2018-02-12 22:10:44 -05:00
Twinaphex d56bd2180f
Merge pull request #6294 from GregorR/netplay-intl-fix
Remove leftover positional intl strings.
2018-02-13 03:28:50 +01:00
Twinaphex 6cc7d124c0
Merge pull request #6295 from fr500/master
C89 build fixes
2018-02-13 03:24:19 +01:00
radius 755578fc43 C89 build fixes 2018-02-12 21:19:51 -05:00
Gregor Richards 6f69034f6a Fix for es and ja as well. 2018-02-12 13:41:20 -05:00
Gregor Richards c44e4de4f8 Remove leftover positional intl strings. 2018-02-12 13:01:02 -05:00
Andrés d3504abc5d
try to fix shader preset loading on WiiU 2018-02-12 12:27:16 -05:00
Twinaphex c6a9967b58
Merge pull request #6282 from fr500/master
Menu Subsystem Implementation
2018-02-12 08:56:51 +01:00
radius 1f2054d42f subsystem part 3: cleanups 2018-02-12 02:44:54 -05:00
radius d254c3eca4 subsystem part 3: fix saves 2018-02-12 02:39:26 -05:00
radius 9a23ee8017 subsystem part 3: remove more globals 2018-02-12 02:39:25 -05:00
radius 1b1ec37f36 subsystem part 3: these can be static again 2018-02-12 02:39:25 -05:00
radius 2a9046c06f subsystem part 3: cleanups 2018-02-12 02:39:25 -05:00
radius 9730fa5c51 subsystem part 2: load content! hacky 2018-02-12 02:39:25 -05:00
radius d3484528d1 subsystem part 2: load content? 2018-02-12 02:39:25 -05:00
radius 752e729ec2 subsystem part 2: set paths 2018-02-12 02:39:24 -05:00
radius b212640732 subsystem part 2: add a wrapper to set the current subsystem 2018-02-12 02:39:24 -05:00
radius 692c8683b2 subsystem part 2: add missing define, fix typo 2018-02-12 02:39:24 -05:00
radius 1951adeb5b subsystem part 2: add LABELS 2018-02-12 02:39:24 -05:00
radius 788bb4de50 subsystem part 1: proper labels for each entry 2018-02-12 02:39:24 -05:00
radius 597e0ce1ec subsystem part 1: get the required data to load content 2018-02-12 02:39:23 -05:00
Andrés 521433d1c7
Merge pull request #6293 from aliaspider/master
(D3D) better handling of frame duping.
2018-02-11 21:36:21 -05:00
aliaspider 72e6909aaa (D3D) better handling of frame duping. 2018-02-12 03:25:37 +01:00
Andrés c58af0d74e
Merge pull request #6292 from orbea/upnp
Makefile.common: Fix builtin-miniupnpc.
2018-02-11 20:20:37 -05:00
orbea e28db33f64 Makefile.common: Fix builtin-miniupnpc. 2018-02-11 17:07:04 -08:00
Twinaphex 34edaaf98b
Merge pull request #6291 from aliaspider/master
(D3D12) silence warning.
2018-02-12 01:32:16 +01:00
aliaspider 8a93e8d503 (D3D12) silence warning. 2018-02-12 01:29:44 +01:00
Twinaphex e428cec428
Merge pull request #6290 from aliaspider/master
(D3D11/12) add overlays.
2018-02-12 01:25:19 +01:00
aliaspider 98682197c9 (D3D11/12) add overlays. 2018-02-12 01:19:43 +01:00
Twinaphex 327e2237d6
Merge pull request #6289 from aliaspider/master
(D3D11/12) prevent double-free when resizing framebuffers.
2018-02-11 23:03:04 +01:00
aliaspider 19aed2af36 (D3D11/12) prevent double-free when resizing framebuffers.
(D3D12)
- correctly support lut/filtering/wrap options for slang shaders.
- rework frame sync.
2018-02-11 22:56:37 +01:00
twinaphex 56389466aa (input_overlay.c) Cleanups 2018-02-11 17:58:24 +01:00
twinaphex 6738d64546 Cleanups 2018-02-11 16:45:40 +01:00
twinaphex 2d8623fa10 Cleanup unused variable 2018-02-11 16:42:53 +01:00
twinaphex ce2fb1770b Some further cleanups 2018-02-11 16:20:05 +01:00
twinaphex d4bd06545f Small cleanups to menu_shader.c 2018-02-11 16:18:44 +01:00
twinaphex 02ae733b27 Try to fix console builds 2018-02-11 16:13:58 +01:00
Twinaphex 6ccb9aa00d
Merge pull request #6283 from BlueKore/master
Updated the locales
2018-02-11 15:57:30 +01:00
Diogo Barros 8c95a5731a
Merge branch 'master' into master 2018-02-11 12:59:44 +00:00