Merge remote-tracking branch 'origin/master' into wiimote-netplay

CMakeLists.txt

@@ -94,8 +94,8 @@ if(GIT_FOUND AND NOT DOLPHIN_WC_REVISION)
 		OUTPUT_VARIABLE DOLPHIN_WC_DESCRIBE
 		OUTPUT_STRIP_TRAILING_WHITESPACE)
 
-	# remove hash from description
-	STRING(REGEX REPLACE "-[^-]+((-dirty)?)$" "\\1" DOLPHIN_WC_DESCRIBE "${DOLPHIN_WC_DESCRIBE}")
+	# remove hash (and trailing "-0" if needed) from description
+	STRING(REGEX REPLACE "(-0)?-[^-]+((-dirty)?)$" "\\2" DOLPHIN_WC_DESCRIBE "${DOLPHIN_WC_DESCRIBE}")
 
 	# defines DOLPHIN_WC_BRANCH
 	EXECUTE_PROCESS(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD

Data/User/GameConfig/D43E01.ini

@@ -1,15 +1,27 @@
 # D43E01 - ZELDA OCARINA MULTI PACK
-[Core] Values set here will override the main dolphin settings.
-[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
+
+[Core]
+# Values set here will override the main dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
 EmulationIssues = Minor video glitches when pausing
-[OnFrame] Add memory patches to be applied every frame here.
-[ActionReplay] Add action replay cheats here.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
 PH_SZFar = 0
 PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
+PH_ZNear =
+PH_ZFar =
+

Data/User/GameConfig/D43J01.ini

@@ -1,14 +1,21 @@
 # D43J01 - ZELDA OCARINA MULTI PACK
+
 [Core]
-#Values set here will override the main dolphin settings.
+# Values set here will override the main dolphin settings.
+
 [EmuState]
-#The Emulation State. 1 is worst, 5 is best, 0 is not set.
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = 
+EmulationIssues =
+
 [OnLoad]
-#Add memory patches to be loaded once on boot here.
+# Add memory patches to be loaded once on boot here.
+
 [OnFrame]
+# Add memory patches to be applied every frame here.
 +$loophack
 0x806866E4:word:0x60000000
+
 [ActionReplay]
-[Video]
+# Add action replay cheats here.
+

Data/User/GameConfig/D43P01.ini

@@ -1,10 +1,23 @@
 # D43P01 - The Legend of Zelda: Ocarina of Time
+
+[Core]
+# Values set here will override the main dolphin settings.
+
 [EmuState]
-#The Emulation State.
-EmulationStateId = 1
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
 Issues="Dolphin doesn't support soft reset"
-EmulationIssues = 
-[OnFrame]#Add memory patches here.
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
 [ActionReplay]
+# Add action replay cheats here.
+
 [Video]
 ProjectionHack = 0
+

Data/User/GameConfig/D43U01.ini

@@ -1,10 +1,22 @@
 # D43U01 - ZELDA OCARINA MULTI PACK
-[Core] Values set here will override the main dolphin settings.
-[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+
+[Core]
+# Values set here will override the main dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = 
-[OnFrame] Add memory patches to be applied every frame here.
-[ActionReplay] Add action replay cheats here.
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
 [Video]
 ProjectionHack = 0
-[Gecko]
+

Data/User/GameConfig/DTLX01.ini

@@ -1,9 +1,20 @@
-# DTLX01 - ACTION REPLAY   
+# DTLX01 - ACTION REPLAY
+
 [Core]
+# Values set here will override the main dolphin settings.
 TLBHack = 1
-#Values set here will override the main dolphin settings.
+# Values set here will override the main dolphin settings.
+
 [EmuState]
-#The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 0
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
 [OnFrame]
+# Add memory patches to be applied every frame here.
+
 [ActionReplay]
+# Add action replay cheats here.
+

Data/User/GameConfig/DVDXDV.ini

@@ -1,6 +1,18 @@
 # DVDXDV - Unknown
-[Core] Values set here will override the main dolphin settings.
-[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = 
-[OnFrame] Add memory patches to be applied every frame here.
-[ActionReplay] Add action replay cheats here.
+
+[Core]
+# Values set here will override the main dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+

Data/User/GameConfig/FABP01.ini

@@ -1,9 +1,22 @@
-# FABP01 - Zelda: Link to Past 
-[Core] Values set here will override the main dolphin settings.
-[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = 
+# FABP01 - Zelda: Link to Past
+
+[Core]
+# Values set here will override the main dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
 EmulationStateId = 4
-[OnFrame] Add memory patches to be applied every frame here.
-[ActionReplay] Add action replay cheats here.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
 [Video]
 ProjectionHack = 0
+

Data/User/GameConfig/FBYE01.ini

@@ -1,8 +1,19 @@
 # FBYE01 - Super Mario Bros. 2
-[Core] Values set here will override the main dolphin settings.
-[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+
+[Core]
+# Values set here will override the main dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 3
 EmulationIssues = Can't see graphics
-[OnFrame] Add memory patches to be applied every frame here.
-[ActionReplay] Add action replay cheats here.
-[Video]
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+

Data/User/GameConfig/G2BE5G.ini

@@ -1,17 +1,30 @@
-# G2BE5G - Black & Bruised
-[Core] Values set here will override the main dolphin settings.
-[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-[OnFrame] Add memory patches to be applied every frame here.
-[ActionReplay] Add action replay cheats here.
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
+# G2BE5G - Black & Bruised
+
+[Core]
+# Values set here will override the main dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+

Data/User/GameConfig/G2BP7D.ini

@@ -1,17 +1,30 @@
-# G2BP7D - Black & Bruised
-[Core] Values set here will override the main dolphin settings.
-[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-[OnFrame] Add memory patches to be applied every frame here.
-[ActionReplay] Add action replay cheats here.
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
+# G2BP7D - Black & Bruised
+
+[Core]
+# Values set here will override the main dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+

Data/User/GameConfig/G2CE52.ini

@@ -1,7 +1,19 @@
 # G2CE52 - TC2 US
-[Core] Values set here will override the main dolphin settings.
+
+[Core]
+# Values set here will override the main dolphin settings.
 TLBHack=1
-[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 3
-[OnFrame] Add memory patches to be applied every frame here.
-[ActionReplay] Add action replay cheats here.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+

Data/User/GameConfig/G2FE78.ini

@@ -1,10 +1,21 @@
 # G2FE78 - Tak 2: The Staff of Dreams
-[Core] Values set here will override the main dolphin settings.
+
+[Core]
+# Values set here will override the main dolphin settings.
 TLBHack = 1
-[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = 
-[OnFrame] Add memory patches to be applied every frame here.
-[ActionReplay] Add action replay cheats here.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
 $Infinite Health
 04112828 48232224
 04344A4C D017021C
@@ -16,3 +27,4 @@ $Max JuJu Elements
 $Have All Cards/All Cards Mixable
 00000000 8439A5E0
 00000001 001E000A
+