17725 Commits

Author SHA1 Message Date
c55481882f Merge pull request #2687 from AdmiralCurtiss/temp-settings-ini-hotfix
Config Hotfix: Prevent per-game settings (ie. GameINI) being stored to the global user configuration.
2015-12-02 15:34:28 +01:00
110ec72cff Merge pull request #2816 from comex/huh-where-did-this-go
Make the LLVM detect script verify that the dynamic library actually exists.
2015-10-28 21:37:36 +01:00
452a0f8042 Merge pull request #2717 from phire/fix-reordering
PPCAnalyst: Don't swap instruction which might cause interrupts.
2015-10-03 16:21:13 +02:00
bfd5c6c69d Merge pull request #3066 from degasus/master
GLInterface: Fix VideoSW on linux + OSX (v2)

Conflicts:
	Source/Core/VideoBackends/OGL/GLInterface/GLX.cpp
2015-09-23 21:09:03 +02:00
2814aa20c8 Merge pull request #2829 from JosJuice/fix-wii-fst-size-2
Fix reading Wii FST size (for real this time)
2015-09-23 21:09:02 +02:00
bfdbace69b Merge pull request #3025 from Tilka/fixfix
VertexLoaderX64: fix 2GB warnings
2015-09-23 21:09:02 +02:00
3556bc0bed Merge pull request #2995 from endrift/tasinputdlg-threading
DolphinWX: TAS fixes, take three
2015-09-23 21:09:01 +02:00
2cd05f2225 Merge pull request #2968 from t27duck/lost_levels_missing_ini
Add missing INI file for SMB: The Lost Levels
2015-09-23 21:09:01 +02:00
31584057a3 Merge pull request #2933 from t27duck/mm5_missing_ini
Added missing Mega Man 5 INI file
2015-09-23 21:09:00 +02:00
4120102305 Merge pull request #2996 from jcowgill/stable
Fix build error with -Werror=format-security
2015-09-07 15:29:41 +02:00
8c8a2ab248 Reinstate format string.
Avoid the consequences in the unlikely event the path includes a %.
2015-09-07 14:15:54 +01:00
4f0e2f6b62 Merge pull request #2885 from endrift/tasinputdlg-threading
DolphinWX: Finish removing bandaid from 704f787
2015-09-02 20:14:37 +02:00
de5b14444b Merge pull request #2834 from endrift/tasinputdlg-threading
DolphinWX: Ensure TASInputDlg only gets modified on the main thread
2015-09-02 20:14:13 +02:00
7efd9fd56c Merge pull request #2696 from RisingFog/tasinput
Fix random hangs when loading savestates with TAS Input
2015-09-01 22:20:36 +02:00
a522aa5bfc Merge pull request #2689 from RisingFog/patch-1
Fix TASInput Crash When Stick Bitmap Is Null
2015-09-01 22:20:01 +02:00
cc8380ee65 Merge pull request #2914 from JosJuice/fix-volumedirectory
Fix VolumeDirectory
2015-09-01 22:19:14 +02:00
994d13af83 Merge pull request #2894 from Sonicadvance1/no_more_eaten_canary
Fix the shader overrunning our max shader size.
2015-09-01 22:12:35 +02:00
2dd7702af0 Merge pull request #2830 from JosJuice/disc-scrubber-nullptr
DiscScrubber: Add another nullptr check
2015-08-19 04:53:04 -04:00
20081a98f6 DiscScrubber: Add another nullptr check 2015-08-18 14:15:01 +02:00
d01356d312 Merge pull request #2828 from JosJuice/sonic-riders-sudtr
Set Speed Up Disc Transfer rate in the Sonic Riders INI
2015-08-17 17:05:11 +02:00
2edace65b5 Merge pull request #2857 from Danbsky/gameini
Gameini: Add ZTP Hyrule Field Speed Hack to GC NTSC-J version
2015-08-16 23:51:39 +02:00
8759d82b8a Merge pull request #2858 from lioncash/leak
DolphinWX: Fix memory leaks occurring in ISOProperties
2015-08-16 23:51:17 +02:00
83f0ae9ab7 Merge pull request #2763 from endrift/update-gtest
Externals: Update gtest to r733
2015-08-16 10:12:08 +02:00
7c0b81f9a5 Merge pull request #2794 from randomstuff/evdev-stable
Stable device identifier for evdev
2015-08-16 10:06:26 +02:00
24d8cc5c07 Merge pull request #2856 from mathieui/netplay-free
[netplay] Fix a crash
2015-08-16 10:03:49 +02:00
7950c77332 Merge pull request #2854 from Tilka/valgrind
Fix some small stuff found with Valgrind

Conflicts:
	Source/Core/Core/PowerPC/CachedInterpreter.cpp
2015-08-16 10:03:47 +02:00
da832d9671 Merge pull request #2852 from aserna3/master
Changed GC adapter "Direct Connect" to false by default

Conflicts:
	Source/Core/Core/ConfigManager.cpp
2015-08-16 09:52:23 +02:00
48898803c0 Merge pull request #2817 from comex/clientca-typo
Forgot to add a slash in one bit of code I switched from D_WIIUSER_IDX to D_SESSION_WIIROOT_IDX.
2015-08-15 12:10:21 +02:00
f801ccc9b2 Merge pull request #2024 from RisingFog/irgui
Add UI Support for up to 8x Internal Resolutions
2015-08-13 12:37:31 +02:00
6911e2470a Merge pull request #2835 from degasus/master
Wiimotes: Initialize all atomic<bool> globally.
2015-08-12 21:47:03 +02:00
44e918e213 Set Speed Up Disc Transfer rate in the Sonic Riders INI
091db36 added a new delay for disc commands in an attempt to fix issues.
It fixed Sonic Riders crashing after the third level... or so we thought.
091db36 also happened changed the order disc reads happen in so that the
data is copied to memory before the emulated delay is finished. This was
inaccurate and caused an audio problem in Resident Evil 3, leading to the
old order being restored in 8cc6e5c. Now that the order is correct,
Sonic Riders is broken again, despite 091db36's delay still existing.
We're more or less back to square one - nobody knows what's broken, and
nobody knows how to fix it. This commit restores SUDTR to Sonic Rider's
game INI so that it'll work out of the box in 5.0 just like in 4.0.
2015-08-10 16:05:04 +02:00
d431525292 Merge pull request #2818 from endrift/fix-gdbstub-build-stable
PowerPC: Fix GDBStub build (stable)
2015-08-09 03:21:19 -04:00
417c592a41 PowerPC: Fix GDBStub build 2015-08-08 22:18:36 -07:00
e99e8c51cd Merge pull request #2815 from JosJuice/fix-elf-crash
Fix GC software crashing at boot if no disc is inserted
2015-08-08 23:27:56 -04:00
1d48a2f179 Fix GC software crashing at boot if no disc is inserted
Same fix as 0b44d7c, plus a way to skip loading the apploader
just like EmulatedBS2_Wii has been able to do for a long time.
2015-08-08 22:31:51 +02:00
837cbfa4e3 CMakeLists: Update version number. 2015-07-31 19:12:37 +02:00
cd56661573 Automatic translation resources update from Transifex 5.0-rc 2015-07-31 10:04:05 +00:00
0778cc42ee Automatic translation template update 2015-07-28 10:01:32 +00:00
4d5f693d88 Merge pull request #2777 from Armada651/hotkey-down
HotkeyManager: Activate hotkey when key is pressed.
2015-07-25 14:08:03 +02:00
3814b5b702 HotkeyManager: Activate hotkey when key is pressed.
As opposed to activating the hotkey when it is released.
2015-07-25 13:53:27 +02:00
75fc213359 FrameTools: Disable hotkeys while a modal dialog is shown. 2015-07-25 13:05:00 +02:00
0092f5207b Core: Don't return true on IsRunning() when stopping emulation. 2015-07-25 13:04:37 +02:00
59eb7a864d Revert "Join the emu thread in Core::Stop. Get rid of Core::Shutdown which did that before."
This reverts commit ba664b3293.

Added documentation to Core::Shutdown() to prevent breaking changes.
2015-07-25 13:04:22 +02:00
2c7ae7787d Merge pull request #2768 from Armada651/focus-pause
CFrame: Ignore "Pause on Focus Lost" when not started.
2015-07-23 08:11:45 +02:00
703b1e8654 CFrame: Ignore "Pause on Focus Lost" when not started. 2015-07-22 19:31:23 +02:00
caa2f15105 DiscIO: Check if m_Disc is null in ParsePartitionData() 2015-07-20 16:21:34 +02:00
b5fe028e18 Merge pull request #2752 from Armada651/osx-beep
CFrame: Claim all keyboard events on OS X.
2015-07-20 13:55:05 +02:00
ccb56ddf97 CFrame: Claim all keyboard events on OS X. 2015-07-20 10:11:11 +02:00
da38e3a8ae Merge pull request #2741 from endrift/fix-freebsd-build-stable
Fix FreeBSD (stable)
2015-07-13 19:51:18 +12:00
87e19f1c19 Merge pull request #2705 from phire/fixrumble
evdev: Delete rumble effects on the correct file descriptor.
2015-07-13 12:05:54 +12:00