Merge branch 'master' into android-new-control-input-overlay

Conflicts:
	Source/Core/DolphinWX/Src/Android/ButtonManager.h

.gitignore

@@ -1,41 +1,22 @@
-
-#ignore thumbnails created by windows
+# Ignore files created by windows
 Thumbs.db
-#Ignore files built by Visual Studio
-*.obj
-*.exe
-*.pdb
-*.user
-*.aps
-*.pch
-*.vspscc
-*_i.c
-*_p.c
-*.ncb
-*.suo
-*.tlb
-*.tlh
-*.bak
-*.cache
-*.ilk
-*.log
-[Bb]in
-[Dd]ebug/
-*.lib
-*.sbr
-obj/
-[Rr]elease*/
-_ReSharper*/
-[Tt]est[Rr]esult*
-Binary
+# Ignore files created by OS X
+.DS_Store
+# Ignore autogenerated source files
 Source/Core/Common/Src/scmrev.h
+# Ignore files output by build
+/[Bb]uild/
+/[Bb]inary/
+# Ignore files created by visual studio
+*.ipch
 *.opensdf
 *.sdf
-[Bb]uild
-*.ipch
-.sconsign.dblite
-Externals/scons-local/*
-.DS_Store
+*.suo
+*.vcxproj.user
+*.obj
+# Ignore files created by posix people
 *~
-#Ignore transifix configuration directory
+# Ignore transifix configuration directory
 .tx
+# Ignore tlog files
+*.tlog

.hgeol

@@ -1,3 +0,0 @@
-[patterns]
-Data/User/Wii/**.* = BIN
-** = native

.hgignore

@@ -1,25 +0,0 @@
-syntax:glob
-Binary
-*.obj
-*.pdb
-*.idb
-*.ilk
-*.pch
-*.sdf
-*.suo
-*.vcxproj.*.user
-*/Win32/Release
-*/Win32/DebugFast
-*/Win32/Debug
-*/x64/Release
-*/x64/DebugFast
-*/x64/Debug
-Source/ipch
-BuildLog.htm
-Source/Core/Common/Src/svnrev.h
-Externals/wxWidgets/build/msw/*/Release
-Externals/wxWidgets/build/msw/*/DebugFast
-Externals/wxWidgets/build/msw/*/Debug
-*.svn*
-Data/User/GameConfig
-Data/User/Shaders

Data/Sys/GameSettings/G3DE6L.ini

@@ -2,6 +2,7 @@
 
 [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.

Data/Sys/GameSettings/G3DP6L.ini

@@ -0,0 +1,19 @@
+# G3DP6L - Carmen Sandiego
+
+[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.
+EmulationStateId = 4
+
+[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/Sys/GameSettings/G3DX6L.ini

@@ -0,0 +1,19 @@
+# G3DX6L - Carmen Sandiego
+
+[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.
+EmulationStateId = 4
+
+[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/Sys/GameSettings/G5NEAF.ini

@@ -0,0 +1,31 @@
+# G5NEAF - Namco Museum 50th Anniversary
+
+[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 = 0
+UseXFB = True
+UseRealXFB = False

Data/Sys/GameSettings/G5NP69.ini

@@ -0,0 +1,31 @@
+# G5NP69 - Namco Museum 50th Anniversary
+
+[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 = 0
+UseXFB = True
+UseRealXFB = False

Data/Sys/GameSettings/GE9E5D.ini

@@ -18,3 +18,6 @@ EmulationIssues =
 [ActionReplay]
 # Add action replay cheats here.
 
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+

Data/Sys/GameSettings/GFUP6V.ini

@@ -0,0 +1,19 @@
+# GFUP6V - FutureTactics
+
+[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.
+EmulationStateId = 4
+
+[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/Sys/GameSettings/GGNE5D.ini

@@ -0,0 +1,26 @@
+# GGNE5D - The Grim Adventures of Billy & Mandy
+
+[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.
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for the videos to display.
+
+[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
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True

Data/Sys/GameSettings/GIAE7D.ini

@@ -6,7 +6,7 @@
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Little shadow bug
+EmulationIssues = 
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -17,3 +17,6 @@ EmulationIssues = Little shadow bug
 [ActionReplay]
 # Add action replay cheats here.
 
+[Video_Hacks]
+EFBCopyEnable = True
+EFBToTextureEnable = False

Data/Sys/GameSettings/GIAP7D.ini

@@ -0,0 +1,22 @@
+# GIAP7D - Ice Age 2 The Meltdown
+
+[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_Hacks]
+EFBCopyEnable = True
+EFBToTextureEnable = False

Data/Sys/GameSettings/GICD78.ini

@@ -0,0 +1,22 @@
+# GICD78 - The Incredibles
+
+[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 =
+
+[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_Hacks]
+EFBCopyEnable = True
+EFBToTextureEnable = False

Data/Sys/GameSettings/GICE78.ini

@@ -19,3 +19,6 @@ EmulationIssues =
 $Infinite Health
 04097DB8 38000064
 
+[Video_Hacks]
+EFBCopyEnable = True
+EFBToTextureEnable = False

Data/Sys/GameSettings/GICF78.ini

@@ -0,0 +1,22 @@
+# GICF78 - The Incredibles
+
+[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 =
+
+[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_Hacks]
+EFBCopyEnable = True
+EFBToTextureEnable = False

Data/Sys/GameSettings/GICH78.ini

@@ -0,0 +1,22 @@
+# GICH78 - The Incredibles
+
+[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 =
+
+[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_Hacks]
+EFBCopyEnable = True
+EFBToTextureEnable = False

Data/Sys/GameSettings/GICJG9.ini

@@ -0,0 +1,22 @@
+# GICJG9 - The Incredibles
+
+[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 =
+
+[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_Hacks]
+EFBCopyEnable = True
+EFBToTextureEnable = False

Data/Sys/GameSettings/GICP78.ini

@@ -0,0 +1,22 @@
+# GICP78 - The Incredibles
+
+[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 =
+
+[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_Hacks]
+EFBCopyEnable = True
+EFBToTextureEnable = False

Data/Sys/GameSettings/GJKD52.ini

@@ -0,0 +1,20 @@
+# GJKD52 - Jedi Knight II: Jedi Outcast
+
+[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
+
+[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_Settings]
+SafeTextureCacheColorSamples = 512