Merge branch 'master' of https://github.com/project64/project64

Config/Glide64.rdb

@@ -3045,6 +3045,7 @@ fb_smart=1
 fix_tex_coord=128
 n64_z_scale=1
 swapmode=2
+fb_render=1
 
 [2F493DD0-2E64DFD9-C:45]
 Good Name=Resident Evil 2 (U) (V1.0)
@@ -3057,6 +3058,7 @@ fb_smart=1
 fix_tex_coord=128
 n64_z_scale=1
 swapmode=2
+fb_render=1
 
 [AA18B1A5-07DB6AEB-C:45]
 Good Name=Resident Evil 2 (U) (V1.1)
@@ -3068,6 +3070,7 @@ fb_smart=1
 fix_tex_coord=128
 n64_z_scale=1
 swapmode=2
+fb_render=1
 
 [02D8366A-6CABEF9C-C:50]
 Good Name=Road Rash 64 (E)

Config/Project64.rdb

@@ -845,9 +845,9 @@ Counter Factor=3
 [55D4C4CE-7753C78A-C:45]
 Good Name=Battlezone - Rise of the Black Dogs (U)
 Internal Name=BATTLEZONE
-Status=Broken (core)
+Status=Compatible
-Core Note=broken graphics; use older PJ64
 AiCountPerBytes=200
+Counter Factor=1
 
 [9C7318D2-24AE0DC1-C:4A]
 Good Name=Beetle Adventure Racing (J)
@@ -2967,13 +2967,12 @@ Status=Compatible
 Plugin Note=[video] errors:HUD; use Glide64
 Counter Factor=1
 
-
 [3A6F8C6B-2897BAEB-C:50]
 Good Name=Indiana Jones and the Infernal Machine (E) (Unreleased)
 Internal Name=Indiana Jones
-Status=Only intro/part OK
+Status=Issues (mixed)
-Core Note=unstable (see GameFAQ)
+Core Note=Recompiler Trading Post freeze.
-Plugin Note=[rsp] interpreter only [video] errors:various (see GameFAQ)
+Plugin Note=[rsp] interpreter only [sound] timing and crackle
 32bit=No
 RDRAM Size=8
 FuncFind=1
@@ -2982,32 +2981,38 @@ ViRefresh=1400
 RSP-JumpTableSize=3584
 SMM-Cache=1
 SMM-FUNC=0
-SMM-PI DMA=0
+SMM-PI DMA=1
-SMM-Protect=1
+SMM-Protect=0
 SMM-TLB=0
 Sync Audio=0
 Fixed Audio=1
-CPU Type=Interpreter
+CPU Type=Recompiler
+Linking=Off
+Fast SP=No
 
 [AF9DCC15-1A723D88-C:45]
 Good Name=Indiana Jones and the Infernal Machine (U)
 Internal Name=Indiana Jones
-Status=Only intro/part OK
+Status=Issues (mixed)
-Core Note=unstable (see GameFAQ)
+Core Note=Recompiler Trading Post freeze.
-Plugin Note=[rsp] interpreter only [video] errors:various (see GameFAQ)
+Plugin Note=[rsp] interpreter only [sound] timing and crackle
 32bit=No
+Counter Factor=1
+RDRAM Size=8
 FuncFind=1
 HLE GFX=No
 ViRefresh=1400
 RSP-JumpTableSize=3584
 SMM-Cache=1
 SMM-FUNC=0
-SMM-PI DMA=0
+SMM-PI DMA=1
-SMM-Protect=1
+SMM-Protect=0
 SMM-TLB=0
 Sync Audio=0
 Fixed Audio=1
-CPU Type=Interpreter
+CPU Type=Recompiler
+Linking=Off
+Fast SP=No
 
 [E436467A-82DE8F9B-C:45]
 Good Name=Indy Racing 2000 (U)

Project64.vs2013.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
+VisualStudioVersion = 12.0.31101.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3rd Party", "3rd Party", "{AA8F7F8E-5377-4911-859D-8A8817B0DB26}"
 EndProject
@@ -12,6 +12,9 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "Source\Common\Common.vcxproj", "{B4A4B994-9111-42B1-93C2-6F1CA8BC4421}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Project64", "Source\Project64\Project64.vcxproj", "{7E534C8E-1ACE-4A88-8807-39A11ED4DA18}"
+	ProjectSection(ProjectDependencies) = postProject
+		{FD617E80-9E40-4138-85DA-B94633972E6A} = {FD617E80-9E40-4138-85DA-B94633972E6A}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RSP", "Source\RSP\RSP.vcxproj", "{A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}"
 EndProject
@@ -125,12 +128,12 @@ Global
 		{3326E128-33AF-422C-BB7C-67CC6B915610} = {AA8F7F8E-5377-4911-859D-8A8817B0DB26}
 		{4BC6906B-213E-40D7-9FC7-1A93E228393D} = {AA8F7F8E-5377-4911-859D-8A8817B0DB26}
 		{731BD205-2826-4631-B7AF-117658E88DBC} = {AA8F7F8E-5377-4911-859D-8A8817B0DB26}
+		{A4D13408-A794-4199-8FC7-4A9A32505005} = {9FE699A5-41C3-4441-92AB-639B3D77DE26}
 		{93447136-FACD-4740-8F35-FC46FB4A9E82} = {1379F817-7E3D-4F58-9C22-7E364E46E842}
 		{427F1DCD-3BED-4010-9322-077A4C06D871} = {1379F817-7E3D-4F58-9C22-7E364E46E842}
 		{93CFEDF3-9A75-4484-B169-D9D8074F5AC2} = {1379F817-7E3D-4F58-9C22-7E364E46E842}
 		{05B9CB11-12D1-47CD-8E4A-88E12162119B} = {1379F817-7E3D-4F58-9C22-7E364E46E842}
 		{25A25249-C284-4C5A-8DC2-26FC3EB13703} = {1379F817-7E3D-4F58-9C22-7E364E46E842}
-		{A4D13408-A794-4199-8FC7-4A9A32505005} = {9FE699A5-41C3-4441-92AB-639B3D77DE26}
 		{462C2608-182F-452C-944F-AF201E19300B} = {9FE699A5-41C3-4441-92AB-639B3D77DE26}
 		{2DADDAA5-0F57-46ED-A974-747908DDC7F3} = {9FE699A5-41C3-4441-92AB-639B3D77DE26}
 	EndGlobalSection