18272 Commits

Author SHA1 Message Date
Stevoisiak
7248f9b524 Minor spelling corrections 2015-06-29 14:51:21 -04:00
Markus Wick
134a18fdad Merge pull request #2674 from lioncash/emplace
Use emplace() instead of insert() where applicable for maps.
2015-06-29 17:19:08 +02:00
Jules Blok
c06342c3cf Merge branch 'stable' 2015-06-29 11:04:17 +02:00
Jules Blok
9a244f07fa Merge pull request #2673 from Armada651/cheat-crash
CheatSearchTab: Check Core state instead of checking a memory pointer.
2015-06-29 11:02:16 +02:00
Lioncash
daa205990f Use emplace() instead of insert() where applicable for maps. 2015-06-28 19:52:40 -04:00
Jules Blok
3f39e38372 CheatSearchTab: Check Core state instead of checking a memory pointer. 2015-06-28 18:28:55 +02:00
Jules Blok
1120132d26 Merge branch 'stable' 2015-06-28 13:28:23 +02:00
Lioncash
2e2c984122 Merge pull request #2672 from JosJuice/fix-gamelist-encoding-2
Fix more game list name encoding errors caused by 4.0-6419 (d7900b4)
2015-06-28 06:08:24 -04:00
JosJuice
66136fc710 Fix more game list name encoding errors caused by 4.0-6419 (d7900b4)
4.0-6442 (a26cf63) didn't fix names read from INIs or titles.txt.
2015-06-28 10:39:24 +02:00
Linktothepast
cf17fccdd3 Address pr comments.
Changes nsmb emulation issues.
2015-06-28 10:31:28 +03:00
Admiral H. Curtiss
c5b81b1aff GameCubeConfig: Case insensitive compare & absolute path compare for the part-of-exe-dir check. 2015-06-27 18:34:54 +02:00
Linktothepast
bdf8b4eb35 Gameini updates.
Fixes issues 8713 and 8674. Also disables scaled efb copies by default
for New Super Mario Bros to take advantage of the recent efb to texture
spinning coin fix.
2015-06-27 12:33:43 +03:00
Admiral H. Curtiss
583e3fd9e0 GameCubeConfig: If the user selects a memcard file path within Dolphin's directory, store the path relative to it.
This makes Dolphin more portable in portable mode, since the memory card file is still found if the directory is moved somewhere else.

This also means that we have to explicitly compare absolute paths if we want to check for both slots containing the same file.
2015-06-27 01:11:44 +02:00
Jules Blok
a71e81a143 Merge pull request #2659 from Armada651/openal-conv
OpenALStream: Fix sample conversion.
2015-06-27 00:13:02 +02:00
Admiral H. Curtiss
df70f50fdf GetExeDirectory() shouldn't return paths with /../ in the middle. 2015-06-26 23:51:40 +02:00
sigmabeta
fd82f90fce Android: Show transition animation when exiting game. 2015-06-26 15:01:23 -04:00
Admiral H. Curtiss
69b7296fc2 WiimoteReal: Make sure that Wiimote thread isn't already running before starting it.
This fixes a crash when switching a Wiimote's internal slot or type in the Dolphin config.
2015-06-26 20:48:45 +02:00
Jules Blok
cff6d9f922 Merge pull request #2640 from AdmiralCurtiss/real-wiimote-crash-fix
WiimoteReal: Fix crash when switching a real Wiimote to a different slot or type during emulation.
2015-06-26 20:33:50 +02:00
Admiral H. Curtiss
716c54217a WiimoteReal: Make sure that Wiimote thread isn't already running before starting it.
This fixes a crash when switching a Wiimote's internal slot or type in the Dolphin config.
2015-06-26 17:12:18 +02:00
sigmabeta
0fcf0e1d21 Android: Show transition animation while game loads. 2015-06-26 08:32:51 -04:00
Tillmann Karras
2711d5201b Interpreter: turn SNaNs into QNaNs 2015-06-26 09:29:18 +02:00
Tillmann Karras
b78310bbe5 Interpreter: simplify fres 2015-06-26 09:29:18 +02:00
Ryan Houdek
6818f2e092 Merge pull request #2661 from Sonicadvance1/aarch64_slwx
[AArch64] Implement slwx in the recompiler.
2015-06-26 01:28:06 -05:00
Tillmann Karras
174ada3a62 Interpreter: assign directly instead via variables 2015-06-26 08:16:34 +02:00
Tillmann Karras
b2c21e800a Interpreter: drop unused macros 2015-06-26 08:16:34 +02:00
Tillmann Karras
ca36ff0551 Interpreter: consolidate fdiv/fdivs/ps_div 2015-06-26 08:07:46 +02:00
Ryan Houdek
63a2180c1f [AArch64] Implement slwx in the recompiler.
I streamed this implementation earlier today to get people to have a feel for implementing instructions in the AArch64 recompiler.
This one was a fairly simple one to implement.
2015-06-26 00:51:06 -05:00
sigmabeta
0679e43efe Android: Show screenshot on EmulationActivity before game starts. 2015-06-25 21:43:00 -04:00
Jules Blok
da7ec75350 Merge pull request #2643 from comex/fix-do-file-search
Fix DoFileSearch returning the passed-in directories themselves.
2015-06-25 15:20:16 +02:00
comex
384a1b4e3b Fix DoFileSearch returning the passed-in directories themselves.
Fixes https://code.google.com/p/dolphin-emu/issues/detail?id=8697&can=3
2015-06-25 15:17:52 +02:00
Jules Blok
86dd81cf6b OpenALStream: Fix sample conversion.
Looks like it wasn't symmetric anymore.
2015-06-25 12:42:41 +02:00
Lioncash
75006056f6 Merge pull request #2658 from sigmabeta/android-dont-crash
Android: Don't crash trying to hide toolbar in game.
2015-06-25 06:38:02 -04:00
Jules Blok
75a9740ab7 Merge branch 'stable' 2015-06-25 12:24:15 +02:00
Jules Blok
8fd5f249fa Merge pull request #2656 from Armada651/ogl-inv-depth
OGL: Allow inverted depth ranges.
2015-06-25 12:06:56 +02:00
Lioncash
0034492151 Add an OSD notification for screenshot saving 2015-06-25 09:23:37 +02:00
Jules Blok
30eae0d258 Merge pull request #2657 from lioncash/screenshot
Render: Add an OSD notification for screenshot saving
2015-06-25 09:22:26 +02:00
sigmabeta
e970f757d0 Android: Don't crash trying to hide toolbar in game. 2015-06-24 22:53:33 -04:00
Ryan Houdek
521f6e89c3 Merge pull request #2624 from sigmabeta/android-save-screenshot
Android: Save screenshot at end of an emulation session.
2015-06-24 21:39:47 -05:00
Lioncash
67c5ce5d96 Add an OSD notification for screenshot saving 2015-06-24 21:44:38 -04:00
Jules Blok
dbfdbf7dbd D3D: Cosmetics.
Merge two cases which should've already been merged.
2015-06-24 23:16:53 +02:00
Jules Blok
743296f1c4 OGL: Allow inverted depth ranges. 2015-06-24 22:28:36 +02:00
Jules Blok
2a5dd69c72 Merge branch 'stable' 2015-06-24 19:34:16 +02:00
Jules Blok
6274cdb478 Merge pull request #2655 from mimimi085181/texturecache-iterator-fix
Quick fix for an invalid iterator
2015-06-24 19:27:08 +02:00
mimimi085181
829fc3dc2d Quick fix for an invalid iterator 2015-06-24 19:12:46 +02:00
Tillmann Karras
6d273f6119 Jit64: fix pre-SSE4.1 fallback of ps_sum1 2015-06-24 18:32:10 +02:00
Jules Blok
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
Ryan Houdek
3c5122e963 Merge pull request #2654 from Tilka/assert
Logging: trigger _assert_() in release builds
2015-06-24 11:14:08 -05:00
Tillmann Karras
2bd11469a5 Jit64: fix pre-SSE4.1 fallback of ps_sum1 2015-06-24 16:48:26 +02:00
Tillmann Karras
a725c06425 Logging: trigger _assert_() in release builds 2015-06-24 15:16:55 +02:00
Tillmann Karras
83ab721939 Fix -Wformat-extra-args warning 2015-06-24 14:44:09 +02:00