17725 Commits

Author SHA1 Message Date
Markus Wick 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
comex 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
Scott Mansell 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
flacs 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
Lioncash 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
Ryan Houdek bfdbace69b Merge pull request #3025 from Tilka/fixfix
VertexLoaderX64: fix 2GB warnings
2015-09-23 21:09:02 +02:00
Lioncash 3556bc0bed Merge pull request #2995 from endrift/tasinputdlg-threading
DolphinWX: TAS fixes, take three
2015-09-23 21:09:01 +02:00
Scott Mansell 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
Scott Mansell 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
Pierre Bourdon 4120102305 Merge pull request #2996 from jcowgill/stable
Fix build error with -Werror=format-security
2015-09-07 15:29:41 +02:00
yerejm 8c8a2ab248 Reinstate format string.
Avoid the consequences in the unlikely event the path includes a %.
2015-09-07 14:15:54 +01:00
Lioncash 4f0e2f6b62 Merge pull request #2885 from endrift/tasinputdlg-threading
DolphinWX: Finish removing bandaid from 704f787
2015-09-02 20:14:37 +02:00
Lioncash 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
Lioncash 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
skidau 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
Markus Wick cc8380ee65 Merge pull request #2914 from JosJuice/fix-volumedirectory
Fix VolumeDirectory
2015-09-01 22:19:14 +02:00
Markus Wick 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
Lioncash 2dd7702af0 Merge pull request #2830 from JosJuice/disc-scrubber-nullptr
DiscScrubber: Add another nullptr check
2015-08-19 04:53:04 -04:00
JosJuice 20081a98f6 DiscScrubber: Add another nullptr check 2015-08-18 14:15:01 +02:00
Jules Blok 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
Markus Wick 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
Lioncash 8759d82b8a Merge pull request #2858 from lioncash/leak
DolphinWX: Fix memory leaks occurring in ISOProperties
2015-08-16 23:51:17 +02:00
Ryan Houdek 83f0ae9ab7 Merge pull request #2763 from endrift/update-gtest
Externals: Update gtest to r733
2015-08-16 10:12:08 +02:00
Scott Mansell 7c0b81f9a5 Merge pull request #2794 from randomstuff/evdev-stable
Stable device identifier for evdev
2015-08-16 10:06:26 +02:00
Markus Wick 24d8cc5c07 Merge pull request #2856 from mathieui/netplay-free
[netplay] Fix a crash
2015-08-16 10:03:49 +02:00