Merge branch 'Netcore' into Narry's_Mod

redscientistlabs · Feb 24, 2018 · c5c819e · c5c819e
2 parents a5904fc + 41b9113
commit c5c819e
Show file tree

Hide file tree

Showing 139 changed files with 11,564 additions and 7,496 deletions.
diff --git a/CMake/DolphinCompileDefinitions.cmake b/CMake/DolphinCompileDefinitions.cmake
@@ -1,4 +1,4 @@
-# Add a C or C++ compile definitions to the current scope
+# Add C or C++ compile definitions to the current scope
 #
 # dolphin_compile_definitions(def [def ...] [DEBUG_ONLY | RELEASE_ONLY])
 #

diff --git a/Data/Sys/GameSettings/GZ2.ini b/Data/Sys/GameSettings/GZ2.ini
@@ -17,3 +17,5 @@ EmulationIssues =
 [ActionReplay]
 # Add action replay cheats here.
 
+[Video_Hacks]
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/RZD.ini b/Data/Sys/GameSettings/RZD.ini
@@ -19,3 +19,4 @@ EmulationIssues =
 
 [Video_Hacks]
 EFBAccessEnable = True
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/SOM.ini b/Data/Sys/GameSettings/SOM.ini
@@ -22,5 +22,6 @@ EmulationIssues =
 [Video_Settings]
 
 [Video_Hacks]
+ImmediateXFBEnable = False
 
 [Video_Enhancements]
diff --git a/Data/Sys/GameSettings/SX4.ini b/Data/Sys/GameSettings/SX4.ini
@@ -18,3 +18,4 @@ EmulationIssues = The game randomly freezes.
 # Add action replay cheats here.
 
 [Video_Hacks]
+ImmediateXFBEnable = False
diff --git a/Externals/Bochs_disasm/stdafx.h b/Externals/Bochs_disasm/stdafx.h
@@ -6,7 +6,7 @@
 #pragma once
 
 
-#define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
+//#define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
 #define _CRT_SECURE_NO_DEPRECATE 1
 
 #include <stdio.h>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,3 +19,4 @@ EmulationIssues =

		[Video_Hacks]
		EFBAccessEnable = True
		ImmediateXFBEnable = False
Original file line number	Diff line number	Diff line change
Expand Up		@@ -18,3 +18,4 @@ EmulationIssues = The game randomly freezes.
		# Add action replay cheats here.

		[Video_Hacks]
		ImmediateXFBEnable = False