Merge branch 'master' into wii-network

Conflicts:
	Source/Core/Core/CMakeLists.txt
This commit is contained in:
Matthew Parlane
2013-04-11 19:55:36 +12:00
369 changed files with 21804 additions and 18869 deletions
+1 -1
View File
@@ -2,7 +2,7 @@
[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 = Needs LLE audio for sound ingame.
EmulationIssues =
[OnFrame] Add memory patches to be applied every frame here.
[ActionReplay] Add action replay cheats here.
[Video]
+1 -1
View File
@@ -2,7 +2,7 @@
[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 = Needs LLE audio for sound ingame.
EmulationIssues =
[OnFrame] Add memory patches to be applied every frame here.
[ActionReplay] Add action replay cheats here.
[Video]
+1 -1
View File
@@ -3,7 +3,7 @@
TLBHack = 1
[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
EmulationStateId = 4
EmulationIssues = Sound issues need lle audio to be fixed.
EmulationIssues =
[OnFrame] Add memory patches to be applied every frame here.
[ActionReplay] Add action replay cheats here.
[Video]
+1 -1
View File
@@ -3,7 +3,7 @@
TLBHack = 1
[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
EmulationStateId = 4
EmulationIssues = Sound issues need lle audio to be fixed.
EmulationIssues =
[OnFrame] Add memory patches to be applied every frame here.
[ActionReplay] Add action replay cheats here.
[Video]
+1 -1
View File
@@ -3,7 +3,7 @@
TLBHack = 1
[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
EmulationStateId = 4
EmulationIssues = Sound issues need lle audio to be fixed.
EmulationIssues =
[OnFrame] Add memory patches to be applied every frame here.
[ActionReplay] Add action replay cheats here.
[Video]
+1 -1
View File
@@ -3,7 +3,7 @@
TLBHack = 1
[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
EmulationStateId = 4
EmulationIssues = Sound issues need lle audio to be fixed.
EmulationIssues =
[OnFrame] Add memory patches to be applied every frame here.
[ActionReplay] Add action replay cheats here.
[Video]
+1 -1
View File
@@ -3,7 +3,7 @@
TLBHack = 1
[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
EmulationStateId = 4
EmulationIssues = Sound issues need LLE audio to be fixed and the videos are messed up.
EmulationIssues = Videos are messed up, skip them.
[OnFrame] Add memory patches to be applied every frame here.
[ActionReplay] Add action replay cheats here.
[Video]
+1 -1
View File
@@ -3,7 +3,7 @@
TLBHack = 1
[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
EmulationStateId = 4
EmulationIssues = Sound issues need LLE audio to be fixed and the videos are messed up.
EmulationIssues = Videos are messed up, skip them.
[OnFrame] Add memory patches to be applied every frame here.
[ActionReplay] Add action replay cheats here.
[Video]
+1 -1
View File
@@ -3,7 +3,7 @@
TLBHack = 1
[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
EmulationStateId = 4
EmulationIssues = Sound issues need LLE audio to be fixed and the videos are messed up.
EmulationIssues = Videos are messed up, skip them.
[OnFrame] Add memory patches to be applied every frame here.
[ActionReplay] Add action replay cheats here.
[Video]
+1 -1
View File
@@ -3,7 +3,7 @@
TLBHack = 1
[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
EmulationStateId = 4
EmulationIssues = Sound issues need LLE audio to be fixed and the videos are messed up.
EmulationIssues = Videos are messed up, skip them.
[OnFrame] Add memory patches to be applied every frame here.
[ActionReplay] Add action replay cheats here.
[Video]
+1 -1
View File
@@ -2,7 +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.
EmulationIssues = Sound issues need LLE audio to be fixed and the videos are messed up.
EmulationIssues = Videos are messed up, skip them.
EmulationStateId = 4
[OnFrame] Add memory patches to be applied every frame here.
[ActionReplay] Add action replay cheats here.
+1 -1
View File
@@ -2,7 +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.
EmulationIssues = Sound issues need LLE audio to be fixed and the videos are messed up.
EmulationIssues = Videos are messed up, skip them.
EmulationStateId = 4
[OnFrame] Add memory patches to be applied every frame here.
[ActionReplay] Add action replay cheats here.
+1 -1
View File
@@ -3,7 +3,7 @@
TLBHack = 1
[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
EmulationStateId = 4
EmulationIssues = Needs LLE audio for proper sound.
EmulationIssues =
[OnFrame] Add memory patches to be applied every frame here.
[ActionReplay] Add action replay cheats here.
[Video]
+1 -1
View File
@@ -3,7 +3,7 @@
TLBHack = 1
[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
EmulationStateId = 4
EmulationIssues = Needs LLE audio for proper sound.
EmulationIssues =
[OnFrame] Add memory patches to be applied every frame here.
[ActionReplay] Add action replay cheats here.
[Video]
+1 -1
View File
@@ -3,7 +3,7 @@
TLBHack = 1
[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
EmulationStateId = 4
EmulationIssues = Needs LLE audio for proper sound.
EmulationIssues =
[OnFrame] Add memory patches to be applied every frame here.
[ActionReplay] Add action replay cheats here.
[Video]
+1 -1
View File
@@ -3,7 +3,7 @@
TLBHack = 1
[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
EmulationStateId = 4
EmulationIssues = Needs LLE audio for proper sound.
EmulationIssues =
[OnFrame] Add memory patches to be applied every frame here.
[ActionReplay] Add action replay cheats here.
[Video]
+1 -1
View File
@@ -3,7 +3,7 @@
TLBHack = 1
[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
EmulationStateId = 4
EmulationIssues = Needs LLE audio for proper sound.
EmulationIssues =
[OnFrame] Add memory patches to be applied every frame here.
[ActionReplay] Add action replay cheats here.
[Video]
+1 -1
View File
@@ -214,5 +214,5 @@ PH_ExtraParam = 0
PH_ZNear =
PH_ZFar =
[Video_Settings]
EFBScale = 1
EFBScale = -1
[Gecko]
+1 -1
View File
@@ -13,5 +13,5 @@ PH_ExtraParam = 0
PH_ZNear =
PH_ZFar =
[Video_Settings]
EFBScale = 1
EFBScale = -1
[Gecko]
+1 -1
View File
@@ -105,6 +105,6 @@ PH_ExtraParam = 0
PH_ZNear =
PH_ZFar =
[Video_Settings]
EFBScale = 1
EFBScale = -1
[Gecko]

Some files were not shown because too many files have changed in this diff Show More