Ryan Houdek
52aa9c05bd
Merge pull request #2633 from sigmabeta/android-emulation-menu
...
Android: Add Quicksave/Load functionality, and cleanup in-game menu.
2015-06-23 20:47:10 -05:00
Ryan Houdek
c9a0e7d35b
Merge pull request #2650 from Tilka/fix_warnings
...
Fix some warnings
2015-06-23 20:41:58 -05:00
Tillmann Karras
c9af7def28
Fix some warnings
2015-06-23 21:11:56 +02:00
Jules Blok
21a70903ed
Merge branch 'stable'
2015-06-23 20:16:55 +02:00
flacs
2bc8993da5
Merge pull request #2648 from Tilka/comment_fix
...
x64FPURoundMode: fix comments
2015-06-23 20:03:11 +02:00
Tillmann Karras
de3c01dc2a
x64FPURoundMode: fix comments
2015-06-23 02:17:36 +02:00
flacs
319394d63e
Merge pull request #2637 from lioncash/devirt
...
Mixer: Devirtualize the logging functions.
2015-06-22 23:24:22 +02:00
comex
afaa0d92df
Merge pull request #2613 from AdmiralCurtiss/netplay-sram-sync
...
Netplay: Sync GameCube SRAM.
2015-06-22 12:48:38 -04:00
degasus
5bc88d5c6a
Revert "GeometryShaderGen: Don't use centroid in
for input variables."
...
This reverts commit 4cbaddb7ad1e84946a6fb1af1d853af15be90615.
2015-06-22 17:20:41 +02:00
Markus Wick
3f780c2628
Merge pull request #2626 from Parlane/fix_aniso_2
...
Fix aniso filtering on d3d to not set aniso filter when using 1x
2015-06-22 13:50:54 +02:00
comex
6d2631a173
Merge pull request #2639 from rukai/master
...
Translations fix for Linux & Mac OS X
2015-06-21 17:10:07 -04:00
Ryan Houdek
3f0f3c36fa
Merge pull request #2627 from sigmabeta/android-non-games
...
Android: Have non-games use their filename as a Game ID.
2015-06-21 15:06:49 -05:00
comex
f6d27a5ce8
Merge pull request #2641 from comex/trivial-fixes
...
Trivial fixes
2015-06-21 15:51:25 -04:00
comex
4b06089103
Fix linking to libav in non-default path
...
LIBAV_LDFLAGS has -L, LIBAV_LIBRARIES is just the names of the
I think this is not necessary for other dependencies because they
consist of a single library and go through a different path (check_lib)
that provides the full path to it. e.g. from my CMakeCache.txt:
ICONV_LIBRARIES:FILEPATH=/usr/lib/libiconv.dylib (good)
LIBAV_LIBRARIES:INTERNAL=avcodec;avformat;swscale;avutil (bad)
2015-06-21 15:45:02 -04:00
comex
700b850acd
Fix misc. clang warnings - mostly complaints about inconsistent use of override.
...
Previously, MacOpenFile only overrode anything on OS X; otherwise it was
just a useless method, which is presumably why it wasn't marked override
in the first place. Address this more sanely by wrapping it in #ifdef
__APPLE__.
2015-06-21 15:42:49 -04:00
Ryan Houdek
b0bc60d58a
Merge pull request #2638 from Sonicadvance1/aarch64_fix_vertexloader_colour
...
[AArch64] Fix a couple of bugs in the vertex loader
2015-06-21 12:52:36 -05:00
comex
d180e4469e
Disable warnings for wx headers
...
...by telling CMake to use -isystem for the static wx include directory.
AFAICT, this is already done by CMake's FindwxWidgets script in the
shared case.
2015-06-21 13:29:04 -04:00
rukai
c9e8179c5a
Added namespace to GetBundleDirectory to compile on Mac OSX
2015-06-21 20:41:41 +10:00
rukai
bbde9cbeae
Swapped out spaces for tabs
2015-06-21 20:41:41 +10:00
rukai
cc22151495
Fixes translation on Linux and potentially Mac OSX, by specifying location of *.gmo files
2015-06-21 20:41:41 +10:00
Ryan Houdek
a811370329
[AArch64] Fix a couple of bugs in the vertex loader
...
In particular this fixes the 6666 colour format
We were loading from the wrong location and it was causing /terrible/ colour changes.
This also fixes a bug in the all the colour formats(except 888) where the unaligned path was loading in to the wrong register.
2015-06-20 21:12:31 -05:00
Lioncash
9dd607b923
Mixer: Fix erroneous global prefixes on class variables
2015-06-20 21:48:50 -04:00
flacs
3948dc77c7
Merge pull request #2636 from lioncash/prototype
...
Hash: Remove the HashFNV prototype
2015-06-21 03:47:33 +02:00
Lioncash
d81dffd4f0
Mixer: Devirtualize DTK and DSP audio logging functions
...
Their functionality is already complete in the base class; there's no need to allow overriding.
2015-06-20 21:46:20 -04:00
Lioncash
fa7d93690e
Hash: Remove the HashFNV prototype
...
It has no function definition.
2015-06-20 21:23:25 -04:00
flacs
a702c4e01e
Merge pull request #2629 from lioncash/vertexloader-ifdef
...
VertexLoader: Remove the LOADERDECL define.
2015-06-21 03:17:38 +02:00
Lioncash
619e333dcc
VertexLoader: Remove the LOADERDECL define.
...
These functions aren't called from jitted code anymore so it isn't necessary.
2015-06-20 20:52:54 -04:00
sigmabeta
92c954c463
Android: Add Quicksave/Load functionality, and cleanup in-game menu.
2015-06-20 12:34:03 -04:00
Markus Wick
1003d08d81
Merge pull request #2632 from lioncash/var
...
RenderBase: Remove an unused variable
2015-06-20 09:28:27 +02:00
skidau
c18662432f
Merge pull request #2622 from AdmiralCurtiss/homebrew-video-modes
...
Fix Homebrew region inconsistency exposed by #2596 .
2015-06-20 11:49:57 +10:00
Lioncash
cfead69f67
RenderBase: Remove an unused variable
2015-06-19 20:30:29 -04:00
flacs
9b9bab2179
Merge pull request #2631 from lioncash/regcache
...
JitRegCache: Get rid of an unnecessary cast
2015-06-20 00:16:03 +02:00
flacs
8f60ef4ab5
Merge pull request #2630 from lioncash/var
...
HiresTextures: Remove unused variable
2015-06-20 00:15:28 +02:00
Lioncash
6ca6896b6e
JitRegCache: Get rid of an unnecessary cast
2015-06-19 18:10:56 -04:00
Lioncash
4c79aa8216
HiresTextures: Remove unused variable
2015-06-19 17:31:04 -04:00
Lioncash
c19903e0fe
Merge pull request #2628 from rukai/master
...
Exclusive fullscreen OSD notification consistency
2015-06-19 11:20:39 -04:00
rukai
f91a228697
OpenGL exclusive fullscreen OSD notification is made consistent with the one used for D3D.
2015-06-20 00:18:13 +10:00
sigmabeta
2bdf6537c8
Android: Have non-games use their filename as a Game ID.
2015-06-19 09:15:31 -04:00
Admiral H. Curtiss
7276d80adc
Boot: Decide setting.txt's country settings based on the game's video mode when no valid country code is found rather than defaulting to Europe.
2015-06-19 15:09:21 +02:00
Admiral H. Curtiss
1b8b99e9f1
ConfigManager: Set homebrew video mode based on Dolphin's PAL60 config instead of always using 50Hz.
...
This is a bit indirect, but since homebrew always boots in a European environment the framerate depends on the bPAL60 flag, which is always auto turned off if bNTSC is set to true as of 2e5e724f9401cb3dea28981a93b7467854f98dbb. By actually indicating that we're PAL on homebrew boot, the rest just falls into place.
2015-06-19 15:07:19 +02:00
Markus Wick
1376bd392e
Merge pull request #2593 from lioncash/hotkey
...
DolphinWX: Remove the Toggle IR hotkey.
2015-06-19 12:29:05 +02:00
Lioncash
458378528b
DolphinWX: Remove the Toggle IR hotkey.
...
This isn't necessary since Increase IR and Decrease IR are present.
2015-06-19 05:10:40 -04:00
Matthew Parlane
45aeeee699
Fix aniso filtering on d3d to not set aniso filter when using 1x
2015-06-19 20:55:32 +12:00
Markus Wick
f75b1024aa
Merge pull request #2623 from degasus/master
...
Revert "GeometryShaderGen: Don't use `centroid in` for input variables."
2015-06-18 20:33:28 +02:00
degasus
dd2183dbb5
Revert "GeometryShaderGen: Don't use centroid in
for input variables."
...
This reverts commit 4cbaddb7ad1e84946a6fb1af1d853af15be90615.
2015-06-18 20:25:32 +02:00
Markus Wick
156fb82117
Merge pull request #2620 from JosJuice/more-decodestring
...
Volume: Use DecodeString more
2015-06-18 14:57:10 +02:00
JosJuice
a825c7ddfe
Volume: Use DecodeString more
...
DecodeString handles the case where there is no trailing null byte,
so using it lets the code be a bit simpler.
2015-06-18 14:45:26 +02:00
skidau
3df28a4ea0
Merge pull request #2598 from JosJuice/cache-games-without-banners
...
Cache games without banners
2015-06-18 09:56:03 +10:00
Ryan Houdek
7662b30d0b
Merge pull request #2616 from sigmabeta/android-whoops-overlay
...
Android: Fix a bug making Input Overlay config screen only work in debug builds.
2015-06-16 14:49:41 -05:00
sigmabeta
0c993ad4a9
Android: Fix a bug making Input Overlay config screen only work in release OR debug builds, but not in both.
2015-06-16 15:42:11 -04:00