2a5dd69c72
Merge branch 'stable'
2015-06-24 19:34:16 +02:00
6274cdb478
Merge pull request #2655 from mimimi085181/texturecache-iterator-fix
...
Quick fix for an invalid iterator
2015-06-24 19:27:08 +02:00
829fc3dc2d
Quick fix for an invalid iterator
2015-06-24 19:12:46 +02:00
6d273f6119
Jit64: fix pre-SSE4.1 fallback of ps_sum1
2015-06-24 18:32:10 +02:00
519a7c4a29
Merge pull request #2652 from Tilka/ps_sum1
...
Jit64: fix pre-SSE4.1 fallback of ps_sum1 with AccurateNaNs=True
2015-06-24 18:28:33 +02:00
3c5122e963
Merge pull request #2654 from Tilka/assert
...
Logging: trigger _assert_() in release builds
2015-06-24 11:14:08 -05:00
2bd11469a5
Jit64: fix pre-SSE4.1 fallback of ps_sum1
2015-06-24 16:48:26 +02:00
a725c06425
Logging: trigger _assert_() in release builds
2015-06-24 15:16:55 +02:00
83ab721939
Fix -Wformat-extra-args warning
2015-06-24 14:44:09 +02:00
84e42904a2
Netplay: Sync Video Mode settings. (Progressive Scan and PAL60)
...
Must match so that Wii games don't desync, especially PAL games.
2015-06-24 12:41:10 +02:00
5b23182793
Common: drop GEKKO define
...
Afaict, it was used to build parts of Dolphin with DSPSpy, but that's
been broken forever, so lets clean up a little bit.
2015-06-24 12:13:41 +02:00
8b4734133e
IPC_HLE: Don't open/close file for every single file operation.
...
On the first boot of Pokemon Snap it copies a 144KB file to the Wii's
NAND, but it only copies 32 bytes per IPC write call.
This was causing dolphin to open and close the same file over 4000
times. This wouldn't usually be a huge issue, except some operating
systems (namely Windows) allow 3rd party programs (namely antivirus
software) to hook all accesses to the filesystem.
This causes the antivirus software to scan the same file for viruses
4000+ times, which is kind of slow.
This fix reduces the initial boot time of pokemon snap from 3+ min
to just a few seconds. Could also improve other games which write
things to NAND.
Will break a few things, see the next commit for an improved fix.
2015-06-24 19:23:10 +12:00
8493feb89f
Merge pull request #2602 from mimimi085181/partial-texture-updates2
...
Support partial texture updates via efb copies
2015-06-24 09:22:50 +02:00
03124ec3f0
IPC_HLE: Simplify lifecycle of devices with shared pointers.
...
This also fixes a memory/filehandle leak when loading savestates.
2015-06-24 19:22:04 +12:00
7935c1c57a
Android: Ensure that the target folder for screenshots exists before attempting to save.
2015-06-23 23:08:10 -04:00
8ca620db7f
Android: Invalidate Picasso screenshot cache every time a screenshot is displayed.
2015-06-23 22:36:27 -04:00
a028805626
Android: Save screenshot at end of an emulation session.
2015-06-23 22:22:01 -04:00
2cea910431
Merge pull request #2644 from sigmabeta/android-material-design
...
Android: Numerous Material Design additions to the UI.
2015-06-23 21:00:35 -05:00
6b24b604e5
Android: MainActivity now contains a tab switcher separating games by platform.
2015-06-23 21:54:09 -04:00
8b5b83c29a
Android Refactor: GameGridActivity is now MainActivity, and uses a Toolbar that reacts to the game grid scrolling.
2015-06-23 21:54:09 -04:00
fa2d06e7a4
Android: Switch all activities to AppCompat-based Material themes, and use Support Library version of Floating Action Button.
2015-06-23 21:54:02 -04:00
bb89a81053
Merge pull request #2635 from sigmabeta/android-seriously-now
...
Android: Remove Low and Medium DPI versions of all images.
2015-06-23 20:47:16 -05:00
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
c9a0e7d35b
Merge pull request #2650 from Tilka/fix_warnings
...
Fix some warnings
2015-06-23 20:41:58 -05:00
c9af7def28
Fix some warnings
2015-06-23 21:11:56 +02:00
21a70903ed
Merge branch 'stable'
2015-06-23 20:16:55 +02:00
2bc8993da5
Merge pull request #2648 from Tilka/comment_fix
...
x64FPURoundMode: fix comments
2015-06-23 20:03:11 +02:00
de3c01dc2a
x64FPURoundMode: fix comments
2015-06-23 02:17:36 +02:00
319394d63e
Merge pull request #2637 from lioncash/devirt
...
Mixer: Devirtualize the logging functions.
2015-06-22 23:24:22 +02:00
afaa0d92df
Merge pull request #2613 from AdmiralCurtiss/netplay-sram-sync
...
Netplay: Sync GameCube SRAM.
2015-06-22 12:48:38 -04:00
5bc88d5c6a
Revert "GeometryShaderGen: Don't use `centroid in` for input variables."
...
This reverts commit 4cbaddb7ad
2015-06-22 17:20:41 +02:00
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
6d2631a173
Merge pull request #2639 from rukai/master
...
Translations fix for Linux & Mac OS X
2015-06-21 17:10:07 -04:00
acd6cb79a4
Fix DoFileSearch returning the passed-in directories themselves.
...
Fixes https://code.google.com/p/dolphin-emu/issues/detail?id=8697&can=3
2015-06-21 16:07:56 -04:00
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
f6d27a5ce8
Merge pull request #2641 from comex/trivial-fixes
...
Trivial fixes
2015-06-21 15:51:25 -04:00
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
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
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
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
0ed6b5623f
Support partial texture updates via efb copies
2015-06-21 14:02:44 +02:00
c9e8179c5a
Added namespace to GetBundleDirectory to compile on Mac OSX
2015-06-21 20:41:41 +10:00
bbde9cbeae
Swapped out spaces for tabs
2015-06-21 20:41:41 +10:00
cc22151495
Fixes translation on Linux and potentially Mac OSX, by specifying location of *.gmo files
2015-06-21 20:41:41 +10:00
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
9dd607b923
Mixer: Fix erroneous global prefixes on class variables
2015-06-20 21:48:50 -04:00
3948dc77c7
Merge pull request #2636 from lioncash/prototype
...
Hash: Remove the HashFNV prototype
2015-06-21 03:47:33 +02:00
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
fa7d93690e
Hash: Remove the HashFNV prototype
...
It has no function definition.
2015-06-20 21:23:25 -04:00
a702c4e01e
Merge pull request #2629 from lioncash/vertexloader-ifdef
...
VertexLoader: Remove the LOADERDECL define.
2015-06-21 03:17:38 +02:00
Jules Blok