izzy/dolphin
0
0
Fork 0
mirror of https://github.com/izzy2lost/dolphin.git synced 2026-06-19 01:16:48 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into wii-network

Browse Source 
Conflicts:
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp
This commit is contained in:
Matthew Parlane
2013-02-23 17:02:58 +13:00
parent 3d480c088f ba979582e2
commit c30b8c9eae
136 changed files with 1076 additions and 1371 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+9 -3
View File
@@ -3,7 +3,8 @@
#
cmake_minimum_required(VERSION 2.6)
option(USE_GLES "Enables GLES, disables OGL" OFF)
option(USE_GLES "Enables GLES And EGL, disables OGL" OFF)
option(USE_EGL "Enables EGL OpenGL Interface" OFF)
option(DISABLE_WX "Disable wxWidgets (use CLI interface)" OFF)
option(FASTLOG "Enable all logs" OFF)
@@ -259,10 +260,15 @@ endif(GDBSTUB)
# Enabling GLES also disables the OpenGL plugin.
if(USE_GLES)
message("GLES rendering enabled")
add_definitions(-DUSE_GLES)
add_definitions(-DUSE_EGL)
add_definitions(-DUSE_GLES=1)
add_definitions(-DUSE_EGL=1)
set(USE_EGL True)
endif()
if(USE_EGL)
message("EGL OpenGL interface enabled")
add_definitions(-DUSE_EGL=1)
endif()
add_definitions(-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE)
########################################
Data/User/GameConfig/GF8E69.ini
+7 -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 =
EmulationIssues = The videos are messed up, skip them.
[OnFrame] Add memory patches to be applied every frame here.
[ActionReplay] Add action replay cheats here.
$Master Code
@@ -40,3 +40,9 @@ $Away Team Never Scores
00416F8C 00000000
[Video]
ProjectionHack = 0
PH_SZNear = 0
PH_SZFar = 0
PH_ExtraParam = 0
PH_ZNear =
PH_ZFar =
[Gecko]
Data/User/GameConfig/GF8P69.ini
+16
View File
@@ -0,0 +1,16 @@
# GF8P69 - FIFA Street
[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 = The videos are messed up, skip them.
[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]
Data/User/GameConfig/GOSE41.ini
+5 -3
View File
@@ -1,9 +1,11 @@
# GOSE41 - Open Season
[Core] Values set here will override the main dolphin settings.
TLBHack = 1
MMU = 1
FastDiscSpeed = 1
BlockMerging = 1
[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
EmulationStateId = 2
EmulationIssues = Severe graphic issues.
EmulationStateId = 4
EmulationIssues = Needs MMU (Slow).
[OnFrame] Add memory patches to be applied every frame here.
[ActionReplay] Add action replay cheats here.
[Video]
Data/User/GameConfig/GOSP41.ini
+5 -3
View File
@@ -1,9 +1,11 @@
# GOSP41 - Open Season
[Core] Values set here will override the main dolphin settings.
TLBHack = 1
MMU = 1
FastDiscSpeed = 1
BlockMerging = 1
[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
EmulationStateId = 2
EmulationIssues = Severe graphic issues.
EmulationStateId = 4
EmulationIssues = Needs MMU (Slow).
[OnFrame] Add memory patches to be applied every frame here.
[ActionReplay] Add action replay cheats here.
[Video]
Data/User/GameConfig/GOSX41.ini
+5 -3
View File
@@ -1,9 +1,11 @@
# GOSX41 - Open Season
[Core] Values set here will override the main dolphin settings.
TLBHack = 1
MMU = 1
FastDiscSpeed = 1
BlockMerging = 1
[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
EmulationStateId = 2
EmulationIssues = Severe graphic issues.
EmulationStateId = 4
EmulationIssues = Needs MMU (Slow).
[OnFrame] Add memory patches to be applied every frame here.
[ActionReplay] Add action replay cheats here.
[Video]
Data/User/GameConfig/PH_PRESETS.ini
+1 -1
View File
@@ -33,7 +33,7 @@ PH_ExtraParam = 1
[5]
Title = Tales of Symphonia GC
PH_ZNear = 0.0002
PH_ZNear = 0.00026
# ---------------------------------------------------
Data/User/GameConfig/R22E01.ini
+1 -2
View File
@@ -17,5 +17,4 @@ PH_ZFar =
SafeTextureCacheColorSamples = 512
[Video_Hacks]
EFBEmulateFormatChanges = True
[Wii]
EFBEmulateFormatChanges = True
Data/User/GameConfig/R22J01.ini
+1 -2
View File
@@ -17,5 +17,4 @@ PH_ZFar =
SafeTextureCacheColorSamples = 512
[Video_Hacks]
EFBEmulateFormatChanges = True
[Wii]
EFBEmulateFormatChanges = True
Data/User/GameConfig/R22P01.ini
+1 -2
View File
@@ -17,5 +17,4 @@ PH_ZFar =
SafeTextureCacheColorSamples = 512
[Video_Hacks]
EFBEmulateFormatChanges = True
[Wii]
EFBEmulateFormatChanges = True
Data/User/GameConfig/R3ME01.ini
+19 -20
View File
@@ -1,20 +1,19 @@
# R3ME01 - Metroid Prime Trilogy
[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 = Disable EuRGB60(PAL60) to avoid a black bar appearing.
[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_Hacks]
EFBToTextureEnable = False
EFBCopyEnable = True
[Wii]
DisableWiimoteSpeaker = 1
# R3ME01 - Metroid Prime Trilogy
[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 = Disable EuRGB60(PAL60) to avoid a black bar appearing.
[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_Hacks]
EFBToTextureEnable = False
EFBCopyEnable = True
[Wii]
Data/User/GameConfig/R3MP01.ini
+19 -20
View File
@@ -1,20 +1,19 @@
# R3MP01 - Metroid Prime Trilogy
[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 = Disable EuRGB60(PAL60) to avoid a black bar appearing.
[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_Hacks]
EFBToTextureEnable = False
EFBCopyEnable = True
[Wii]
DisableWiimoteSpeaker = 1
# R3MP01 - Metroid Prime Trilogy
[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 = Disable EuRGB60(PAL60) to avoid a black bar appearing.
[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_Hacks]
EFBToTextureEnable = False
EFBCopyEnable = True
[Wii]
Data/User/GameConfig/R4QE01.ini
+19 -20
View File
@@ -1,20 +1,19 @@
# R4QE01 - Mario Strikers Charged
[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
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_Enhancements]
[Video_Hacks]
DlistCachingEnable = False
[Wii]
DisableWiimoteSpeaker = 1
# R4QE01 - Mario Strikers Charged
[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
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_Enhancements]
[Video_Hacks]
DlistCachingEnable = False
[Wii]
Data/User/GameConfig/R4QJ01.ini
+19 -20
View File
@@ -1,20 +1,19 @@
# R4QJ01 - Mario Strikers Charged
[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
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_Enhancements]
[Video_Hacks]
DlistCachingEnable = False
[Wii]
DisableWiimoteSpeaker = 1
# R4QJ01 - Mario Strikers Charged
[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
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_Enhancements]
[Video_Hacks]
DlistCachingEnable = False
[Wii]
Data/User/GameConfig/R4QK01.ini
+19 -20
View File
@@ -1,20 +1,19 @@
# R4QK01 - Mario Power Soccer
[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
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_Enhancements]
[Video_Hacks]
DlistCachingEnable = False
[Wii]
DisableWiimoteSpeaker = 1
# R4QK01 - Mario Power Soccer
[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
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_Enhancements]
[Video_Hacks]
DlistCachingEnable = False
[Wii]
Data/User/GameConfig/R4QP01.ini
+19 -20
View File
@@ -1,20 +1,19 @@
# R4QP01 - Mario Strikers Charged
[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
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_Enhancements]
[Video_Hacks]
DlistCachingEnable = False
[Wii]
DisableWiimoteSpeaker = 1
# R4QP01 - Mario Strikers Charged
[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
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_Enhancements]
[Video_Hacks]
DlistCachingEnable = False
[Wii]
Data/User/GameConfig/R5WEA4.ini
+1 -2
View File
@@ -15,5 +15,4 @@ PH_ZFar =
[Gecko]
[Video_Settings]
SafeTextureCacheColorSamples = 512
[Wii]
SafeTextureCacheColorSamples = 512
Data/User/GameConfig/R5WJA4.ini
+1 -2
View File
@@ -15,5 +15,4 @@ PH_ZFar =
[Gecko]
[Video_Settings]
SafeTextureCacheColorSamples = 512
[Wii]
SafeTextureCacheColorSamples = 512
Data/User/GameConfig/R7PE01.ini
+18 -19
View File
@@ -1,19 +1,18 @@
# R7PE01 - Punch Out
[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 = Disable "Use EuRGB60 (PAL60) mode" in the wii configuration tab for the game to run
[OnFrame] Add memory patches to be applied every frame here.
+$Patch
0x8011E0F8:dword:0x4E800020
[ActionReplay] Add action replay cheats here.
[Video]
ProjectionHack = 0
PH_SZNear = 0
PH_SZFar = 0
PH_ExtraParam = 0
PH_ZNear =
PH_ZFar =
[Gecko]
[Wii]
DisableWiimoteSpeaker = 1
# R7PE01 - Punch Out
[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 = Disable "Use EuRGB60 (PAL60) mode" in the wii configuration tab for the game to run
[OnFrame] Add memory patches to be applied every frame here.
+$Patch
0x8011E0F8:dword:0x4E800020
[ActionReplay] Add action replay cheats here.
[Video]
ProjectionHack = 0
PH_SZNear = 0
PH_SZFar = 0
PH_ExtraParam = 0
PH_ZNear =
PH_ZFar =
[Gecko]
[Wii]
Data/User/GameConfig/R7PP01.ini
+12 -13
View File
@@ -1,13 +1,12 @@
# R7PP01 - Punch Out
[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 = 5
[OnFrame] Add memory patches to be applied every frame here.
+$Patch
0x8011F1CC:dword:0x4E800020
[ActionReplay] Add action replay cheats here.
[Video]
ProjectionHack = 0
[Wii]
DisableWiimoteSpeaker = 1
# R7PP01 - Punch Out
[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 = 5
[OnFrame] Add memory patches to be applied every frame here.
+$Patch
0x8011F1CC:dword:0x4E800020
[ActionReplay] Add action replay cheats here.
[Video]
ProjectionHack = 0
[Wii]

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