Merge r9050 into trunk/output/gamedb/gamedb_n64.txt

This commit is contained in:
hegyak 2015-02-07 04:08:30 +00:00
parent 6700f50a99
commit a340c5ca52
2 changed files with 17 additions and 9 deletions

View File

@ -1,6 +1,8 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.31101.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Version", "Version\Version.csproj", "{0CE8B337-08E3-4602-BF10-C4D4C75D2F13}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Client.Common", "BizHawk.Client.Common\BizHawk.Client.Common.csproj", "{24A0AA3C-B25F-4197-B23D-476D6462DBA0}"
@ -54,6 +56,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Bizware.BizwareGL.G
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Bizware.BizwareGL.SlimDX", "Bizware\BizHawk.Bizware.BizwareGL.SlimDX\BizHawk.Bizware.BizwareGL.SlimDX.csproj", "{E6B436B1-A3CD-4C9A-8F76-5D7154726884}"
EndProject
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "BizHawk.Installer", "BizHawk.Installer\BizHawk.Installer.wixproj", "{A1A56BC8-8199-4C8D-B5C9-76401D3A0A70}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x86 = Debug|x86
@ -112,20 +116,24 @@ Global
{0CE8B337-08E3-4602-BF10-C4D4C75D2F13}.Debug|x86.Build.0 = Debug|x86
{0CE8B337-08E3-4602-BF10-C4D4C75D2F13}.Release|x86.ActiveCfg = Release|x86
{0CE8B337-08E3-4602-BF10-C4D4C75D2F13}.Release|x86.Build.0 = Release|x86
{A1A56BC8-8199-4C8D-B5C9-76401D3A0A70}.Debug|x86.ActiveCfg = Debug|x86
{A1A56BC8-8199-4C8D-B5C9-76401D3A0A70}.Debug|x86.Build.0 = Debug|x86
{A1A56BC8-8199-4C8D-B5C9-76401D3A0A70}.Release|x86.ActiveCfg = Release|x86
{A1A56BC8-8199-4C8D-B5C9-76401D3A0A70}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{24A0AA3C-B25F-4197-B23D-476D6462DBA0} = {B51F1139-3D2C-41BE-A762-EF1F9B41EACA}
{DD448B37-BA3F-4544-9754-5406E8094723} = {B51F1139-3D2C-41BE-A762-EF1F9B41EACA}
{C4366030-6D03-424B-AE53-F4F43BB217C3} = {B51F1139-3D2C-41BE-A762-EF1F9B41EACA}
{24A0AA3C-B25F-4197-B23D-476D6462DBA0} = {B51F1139-3D2C-41BE-A762-EF1F9B41EACA}
{2D2890A8-C338-4439-AD8B-CB9EE85A94F9} = {B51F1139-3D2C-41BE-A762-EF1F9B41EACA}
{E1A23168-B571-411C-B360-2229E7225E0E} = {3627C08B-3E43-4224-9DA4-40BD69495FBC}
{F51946EA-827F-4D82-B841-1F2F6D060312} = {3627C08B-3E43-4224-9DA4-40BD69495FBC}
{E1A23168-B571-411C-B360-2229E7225E0E} = {3627C08B-3E43-4224-9DA4-40BD69495FBC}
{197D4314-8A9F-49BA-977D-54ACEFAEB6BA} = {3627C08B-3E43-4224-9DA4-40BD69495FBC}
{9F84A0B2-861E-4EF4-B89B-5E2A3F38A465} = {0540A9A6-977E-466D-8BD3-1D8590BD5282}
{5160CFB1-5389-47C1-B7F6-8A0DC97641EE} = {0540A9A6-977E-466D-8BD3-1D8590BD5282}
{2D2890A8-C338-4439-AD8B-CB9EE85A94F9} = {B51F1139-3D2C-41BE-A762-EF1F9B41EACA}
{337CA23E-65E7-44E1-9411-97EE08BB8116} = {0540A9A6-977E-466D-8BD3-1D8590BD5282}
{E6B436B1-A3CD-4C9A-8F76-5D7154726884} = {0540A9A6-977E-466D-8BD3-1D8590BD5282}
EndGlobalSection

View File

@ -168,10 +168,10 @@ DD5D64DD140CB7AA28404FA35ABDCABA33C29260 G Diddy Kong Racing (Europe) (En,Fr,De)
0CB115D8716DBBC2922FDA38E533B9FE63BB9670 G Diddy Kong Racing (USA) (En,Fr) N64 Glide_enable_hacks_for_game=3;Glide64mk2_enable_hacks_for_game=5
E31A7567D408C890065029BA537F830765B17D94 G Donald Duck - Goin' Quackers (USA) (En,Fr,De,Es,It) N64 Glide_detect_cpu_write=true;Glide_filtering=0;Glide64mk2_detect_cpu_write=true
C42FAFB06BE6EB7DE08370D07F19571B7661074B G Donald Duck - Quack Attack (Europe) (En,Fr,De,Es,It) N64 RiceFastTextureCRC=1;Glide_detect_cpu_write=true;Glide_filtering=0;Glide64mk2_detect_cpu_write=true
F96AF883845308106600D84E0618C1A066DC6676 G Donkey Kong 64 (Europe) (En,Fr,De,Es) N64 Glide_lodmode=1;Glide_depth_bias=64;Glide_filtering=0;Glide_fb_clear=true;Glide64mk2_lodmode=1;expansionpak=1
F0AD2B2BBF04D574ED7AFBB1BB6A4F0511DCD87D G Donkey Kong 64 (Japan) N64 Glide_lodmode=1;Glide_depth_bias=64;Glide_filtering=0;Glide_fb_clear=true;Glide64mk2_lodmode=1;expansionpak=1
B4717E602F07CA9BE0D4822813C658CD8B99F993 G Donkey Kong 64 (USA) (Demo) (Kiosk) N64 Glide_filtering=0;Glide_fb_clear=true;expansionpak=1
CF806FF2603640A748FCA5026DED28802F1F4A50 G Donkey Kong 64 (USA) N64 RiceEmulateClear=true;Glide_lodmode=1;Glide_depth_bias=64;Glide_filtering=0;Glide_fb_clear=true;Glide64mk2_lodmode=1;expansionpak=1
F96AF883845308106600D84E0618C1A066DC6676 G Donkey Kong 64 (Europe) (En,Fr,De,Es) N64 Glide_lodmode=1;Glide_depth_bias=64;Glide_filtering=0;Glide_fb_clear=true;Glide64mk2_lodmode=1;expansionpak=1;SaveType=EEPROM_16K
F0AD2B2BBF04D574ED7AFBB1BB6A4F0511DCD87D G Donkey Kong 64 (Japan) N64 Glide_lodmode=1;Glide_depth_bias=64;Glide_filtering=0;Glide_fb_clear=true;Glide64mk2_lodmode=1;expansionpak=1;SaveType=EEPROM_16K
B4717E602F07CA9BE0D4822813C658CD8B99F993 G Donkey Kong 64 (USA) (Demo) (Kiosk) N64 Glide_filtering=0;Glide_fb_clear=true;expansionpak=1;SaveType=EEPROM_16K
CF806FF2603640A748FCA5026DED28802F1F4A50 G Donkey Kong 64 (USA) N64 RiceEmulateClear=true;Glide_lodmode=1;Glide_depth_bias=64;Glide_filtering=0;Glide_fb_clear=true;Glide64mk2_lodmode=1;expansionpak=1;SaveType=EEPROM_16K
B63060F69BB4E1547DA1D762E740D19393977055 G Doom 64 (Europe) N64 Glide_fillcolor_fix=true;Glide_filtering=0
6B0D65E62626A92AA59EE4BFF3F02715F6247692 G Doom 64 (Japan) N64 Glide_fillcolor_fix=true;Glide_filtering=0
6FB0CE9C75BBE54B6E1EDE337652B0221E5F2AAD G Doom 64 (USA) (Rev A) N64 Glide_fillcolor_fix=true;Glide_filtering=0