diff --git a/.gitmodules b/.gitmodules index 45c42661..045cee1f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,9 +4,3 @@ [submodule "FusionLibrary"] path = FusionLibrary url = https://github.com/bttfv/FusionLibrary -[submodule "RogersSierra"] - path = RogersSierra - url = https://github.com/bttfv/RogersSierra -[submodule "BackToTheFutureV.HUD"] - path = BackToTheFutureV.HUD - url = https://github.com/bttfv/BackToTheFutureV.HUD diff --git a/BackToTheFutureV.HUD b/BackToTheFutureV.HUD deleted file mode 160000 index b1dd9808..00000000 --- a/BackToTheFutureV.HUD +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b1dd9808102f997c339a5c42fe4df516aa7c4abc diff --git a/BackToTheFutureV.sln b/BackToTheFutureV.sln index 05cf2ad0..900ff021 100644 --- a/BackToTheFutureV.sln +++ b/BackToTheFutureV.sln @@ -7,142 +7,40 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BackToTheFutureV", "BackToT EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KlangRageAudioLibrary", "KlangRageAudioLibrary\KlangRageAudioLibrary.csproj", "{E52DB215-0AA9-453A-B5F3-91F3FF35C1D9}" EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "RogersSierraRailway", "RogersSierra\RogersSierraRailway.vbproj", "{EF32B843-71F4-4AF6-93E3-BEC5F727C9A3}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FusionLibrary", "FusionLibrary\FusionLibrary.csproj", "{F5AAD1BD-63CA-4A12-97A8-F0D876AB4462}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BackToTheFutureV.HUD.Core", "BackToTheFutureV.HUD\BackToTheFutureV.HUD.Core\BackToTheFutureV.HUD.Core.csproj", "{B32480F2-767C-4426-AFA1-FF9511C612D9}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BackToTheFutureV.HUD.Desktop", "BackToTheFutureV.HUD\BackToTheFutureV.HUD.Desktop\BackToTheFutureV.HUD.Desktop.csproj", "{D074FECB-F620-4F0B-8F63-F20466D3D533}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BackToTheFutureV.HUD.Android", "BackToTheFutureV.HUD\BackToTheFutureV.HUD.Android\BackToTheFutureV.HUD.Android.csproj", "{07A654CD-A801-4CE2-9E42-73A2210D43B9}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug (Test)|Any CPU = Debug (Test)|Any CPU - Debug (Test)|x64 = Debug (Test)|x64 Debug|Any CPU = Debug|Any CPU Debug|x64 = Debug|x64 - Release (Test)|Any CPU = Release (Test)|Any CPU - Release (Test)|x64 = Release (Test)|x64 Release|Any CPU = Release|Any CPU Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {7BE2F39B-E0F1-4F7D-B674-BC595E4AF50D}.Debug (Test)|Any CPU.ActiveCfg = Debug (Test)|Any CPU - {7BE2F39B-E0F1-4F7D-B674-BC595E4AF50D}.Debug (Test)|Any CPU.Build.0 = Debug (Test)|Any CPU - {7BE2F39B-E0F1-4F7D-B674-BC595E4AF50D}.Debug (Test)|x64.ActiveCfg = Debug (Test)|x64 - {7BE2F39B-E0F1-4F7D-B674-BC595E4AF50D}.Debug (Test)|x64.Build.0 = Debug (Test)|x64 {7BE2F39B-E0F1-4F7D-B674-BC595E4AF50D}.Debug|Any CPU.ActiveCfg = Debug|x64 {7BE2F39B-E0F1-4F7D-B674-BC595E4AF50D}.Debug|Any CPU.Build.0 = Debug|x64 {7BE2F39B-E0F1-4F7D-B674-BC595E4AF50D}.Debug|x64.ActiveCfg = Debug|x64 {7BE2F39B-E0F1-4F7D-B674-BC595E4AF50D}.Debug|x64.Build.0 = Debug|x64 - {7BE2F39B-E0F1-4F7D-B674-BC595E4AF50D}.Release (Test)|Any CPU.ActiveCfg = Release (Test)|Any CPU - {7BE2F39B-E0F1-4F7D-B674-BC595E4AF50D}.Release (Test)|Any CPU.Build.0 = Release (Test)|Any CPU - {7BE2F39B-E0F1-4F7D-B674-BC595E4AF50D}.Release (Test)|x64.ActiveCfg = Release (Test)|x64 - {7BE2F39B-E0F1-4F7D-B674-BC595E4AF50D}.Release (Test)|x64.Build.0 = Release (Test)|x64 {7BE2F39B-E0F1-4F7D-B674-BC595E4AF50D}.Release|Any CPU.ActiveCfg = Release|Any CPU {7BE2F39B-E0F1-4F7D-B674-BC595E4AF50D}.Release|Any CPU.Build.0 = Release|Any CPU {7BE2F39B-E0F1-4F7D-B674-BC595E4AF50D}.Release|x64.ActiveCfg = Release|Any CPU {7BE2F39B-E0F1-4F7D-B674-BC595E4AF50D}.Release|x64.Build.0 = Release|Any CPU - {E52DB215-0AA9-453A-B5F3-91F3FF35C1D9}.Debug (Test)|Any CPU.ActiveCfg = Debug (Test)|Any CPU - {E52DB215-0AA9-453A-B5F3-91F3FF35C1D9}.Debug (Test)|Any CPU.Build.0 = Debug (Test)|Any CPU - {E52DB215-0AA9-453A-B5F3-91F3FF35C1D9}.Debug (Test)|x64.ActiveCfg = Debug (Test)|x64 - {E52DB215-0AA9-453A-B5F3-91F3FF35C1D9}.Debug (Test)|x64.Build.0 = Debug (Test)|x64 {E52DB215-0AA9-453A-B5F3-91F3FF35C1D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E52DB215-0AA9-453A-B5F3-91F3FF35C1D9}.Debug|Any CPU.Build.0 = Debug|Any CPU {E52DB215-0AA9-453A-B5F3-91F3FF35C1D9}.Debug|x64.ActiveCfg = Debug|x64 {E52DB215-0AA9-453A-B5F3-91F3FF35C1D9}.Debug|x64.Build.0 = Debug|x64 - {E52DB215-0AA9-453A-B5F3-91F3FF35C1D9}.Release (Test)|Any CPU.ActiveCfg = Release (Test)|Any CPU - {E52DB215-0AA9-453A-B5F3-91F3FF35C1D9}.Release (Test)|Any CPU.Build.0 = Release (Test)|Any CPU - {E52DB215-0AA9-453A-B5F3-91F3FF35C1D9}.Release (Test)|x64.ActiveCfg = Release (Test)|x64 - {E52DB215-0AA9-453A-B5F3-91F3FF35C1D9}.Release (Test)|x64.Build.0 = Release (Test)|x64 {E52DB215-0AA9-453A-B5F3-91F3FF35C1D9}.Release|Any CPU.ActiveCfg = Release|Any CPU {E52DB215-0AA9-453A-B5F3-91F3FF35C1D9}.Release|Any CPU.Build.0 = Release|Any CPU {E52DB215-0AA9-453A-B5F3-91F3FF35C1D9}.Release|x64.ActiveCfg = Release|x64 {E52DB215-0AA9-453A-B5F3-91F3FF35C1D9}.Release|x64.Build.0 = Release|x64 - {EF32B843-71F4-4AF6-93E3-BEC5F727C9A3}.Debug (Test)|Any CPU.ActiveCfg = Debug (Test)|Any CPU - {EF32B843-71F4-4AF6-93E3-BEC5F727C9A3}.Debug (Test)|Any CPU.Build.0 = Debug (Test)|Any CPU - {EF32B843-71F4-4AF6-93E3-BEC5F727C9A3}.Debug (Test)|x64.ActiveCfg = Debug (Test)|x64 - {EF32B843-71F4-4AF6-93E3-BEC5F727C9A3}.Debug (Test)|x64.Build.0 = Debug (Test)|x64 - {EF32B843-71F4-4AF6-93E3-BEC5F727C9A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EF32B843-71F4-4AF6-93E3-BEC5F727C9A3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EF32B843-71F4-4AF6-93E3-BEC5F727C9A3}.Debug|x64.ActiveCfg = Debug|x64 - {EF32B843-71F4-4AF6-93E3-BEC5F727C9A3}.Debug|x64.Build.0 = Debug|x64 - {EF32B843-71F4-4AF6-93E3-BEC5F727C9A3}.Release (Test)|Any CPU.ActiveCfg = Release (Test)|Any CPU - {EF32B843-71F4-4AF6-93E3-BEC5F727C9A3}.Release (Test)|Any CPU.Build.0 = Release (Test)|Any CPU - {EF32B843-71F4-4AF6-93E3-BEC5F727C9A3}.Release (Test)|x64.ActiveCfg = Release (Test)|x64 - {EF32B843-71F4-4AF6-93E3-BEC5F727C9A3}.Release (Test)|x64.Build.0 = Release (Test)|x64 - {EF32B843-71F4-4AF6-93E3-BEC5F727C9A3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EF32B843-71F4-4AF6-93E3-BEC5F727C9A3}.Release|Any CPU.Build.0 = Release|Any CPU - {EF32B843-71F4-4AF6-93E3-BEC5F727C9A3}.Release|x64.ActiveCfg = Release|x64 - {EF32B843-71F4-4AF6-93E3-BEC5F727C9A3}.Release|x64.Build.0 = Release|x64 - {F5AAD1BD-63CA-4A12-97A8-F0D876AB4462}.Debug (Test)|Any CPU.ActiveCfg = Debug (Test)|Any CPU - {F5AAD1BD-63CA-4A12-97A8-F0D876AB4462}.Debug (Test)|Any CPU.Build.0 = Debug (Test)|Any CPU - {F5AAD1BD-63CA-4A12-97A8-F0D876AB4462}.Debug (Test)|x64.ActiveCfg = Debug (Test)|Any CPU - {F5AAD1BD-63CA-4A12-97A8-F0D876AB4462}.Debug (Test)|x64.Build.0 = Debug (Test)|Any CPU {F5AAD1BD-63CA-4A12-97A8-F0D876AB4462}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F5AAD1BD-63CA-4A12-97A8-F0D876AB4462}.Debug|Any CPU.Build.0 = Debug|Any CPU {F5AAD1BD-63CA-4A12-97A8-F0D876AB4462}.Debug|x64.ActiveCfg = Debug|Any CPU {F5AAD1BD-63CA-4A12-97A8-F0D876AB4462}.Debug|x64.Build.0 = Debug|Any CPU - {F5AAD1BD-63CA-4A12-97A8-F0D876AB4462}.Release (Test)|Any CPU.ActiveCfg = Release (Test)|Any CPU - {F5AAD1BD-63CA-4A12-97A8-F0D876AB4462}.Release (Test)|Any CPU.Build.0 = Release (Test)|Any CPU - {F5AAD1BD-63CA-4A12-97A8-F0D876AB4462}.Release (Test)|x64.ActiveCfg = Release (Test)|Any CPU - {F5AAD1BD-63CA-4A12-97A8-F0D876AB4462}.Release (Test)|x64.Build.0 = Release (Test)|Any CPU {F5AAD1BD-63CA-4A12-97A8-F0D876AB4462}.Release|Any CPU.ActiveCfg = Release|Any CPU {F5AAD1BD-63CA-4A12-97A8-F0D876AB4462}.Release|Any CPU.Build.0 = Release|Any CPU {F5AAD1BD-63CA-4A12-97A8-F0D876AB4462}.Release|x64.ActiveCfg = Release|Any CPU {F5AAD1BD-63CA-4A12-97A8-F0D876AB4462}.Release|x64.Build.0 = Release|Any CPU - {B32480F2-767C-4426-AFA1-FF9511C612D9}.Debug (Test)|Any CPU.ActiveCfg = Debug (Test)|Any CPU - {B32480F2-767C-4426-AFA1-FF9511C612D9}.Debug (Test)|Any CPU.Build.0 = Debug (Test)|Any CPU - {B32480F2-767C-4426-AFA1-FF9511C612D9}.Debug (Test)|x64.ActiveCfg = Debug (Test)|Any CPU - {B32480F2-767C-4426-AFA1-FF9511C612D9}.Debug (Test)|x64.Build.0 = Debug (Test)|Any CPU - {B32480F2-767C-4426-AFA1-FF9511C612D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B32480F2-767C-4426-AFA1-FF9511C612D9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B32480F2-767C-4426-AFA1-FF9511C612D9}.Debug|x64.ActiveCfg = Debug|Any CPU - {B32480F2-767C-4426-AFA1-FF9511C612D9}.Debug|x64.Build.0 = Debug|Any CPU - {B32480F2-767C-4426-AFA1-FF9511C612D9}.Release (Test)|Any CPU.ActiveCfg = Release (Test)|Any CPU - {B32480F2-767C-4426-AFA1-FF9511C612D9}.Release (Test)|Any CPU.Build.0 = Release (Test)|Any CPU - {B32480F2-767C-4426-AFA1-FF9511C612D9}.Release (Test)|x64.ActiveCfg = Release (Test)|Any CPU - {B32480F2-767C-4426-AFA1-FF9511C612D9}.Release (Test)|x64.Build.0 = Release (Test)|Any CPU - {B32480F2-767C-4426-AFA1-FF9511C612D9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B32480F2-767C-4426-AFA1-FF9511C612D9}.Release|Any CPU.Build.0 = Release|Any CPU - {B32480F2-767C-4426-AFA1-FF9511C612D9}.Release|x64.ActiveCfg = Release|Any CPU - {B32480F2-767C-4426-AFA1-FF9511C612D9}.Release|x64.Build.0 = Release|Any CPU - {D074FECB-F620-4F0B-8F63-F20466D3D533}.Debug (Test)|Any CPU.ActiveCfg = Debug (Test)|Any CPU - {D074FECB-F620-4F0B-8F63-F20466D3D533}.Debug (Test)|x64.ActiveCfg = Debug (Test)|Any CPU - {D074FECB-F620-4F0B-8F63-F20466D3D533}.Debug (Test)|x64.Build.0 = Debug (Test)|Any CPU - {D074FECB-F620-4F0B-8F63-F20466D3D533}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D074FECB-F620-4F0B-8F63-F20466D3D533}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D074FECB-F620-4F0B-8F63-F20466D3D533}.Debug|x64.ActiveCfg = Debug|Any CPU - {D074FECB-F620-4F0B-8F63-F20466D3D533}.Debug|x64.Build.0 = Debug|Any CPU - {D074FECB-F620-4F0B-8F63-F20466D3D533}.Release (Test)|Any CPU.ActiveCfg = Release (Test)|Any CPU - {D074FECB-F620-4F0B-8F63-F20466D3D533}.Release (Test)|x64.ActiveCfg = Release (Test)|Any CPU - {D074FECB-F620-4F0B-8F63-F20466D3D533}.Release (Test)|x64.Build.0 = Release (Test)|Any CPU - {D074FECB-F620-4F0B-8F63-F20466D3D533}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D074FECB-F620-4F0B-8F63-F20466D3D533}.Release|Any CPU.Build.0 = Release|Any CPU - {D074FECB-F620-4F0B-8F63-F20466D3D533}.Release|x64.ActiveCfg = Release|Any CPU - {D074FECB-F620-4F0B-8F63-F20466D3D533}.Release|x64.Build.0 = Release|Any CPU - {07A654CD-A801-4CE2-9E42-73A2210D43B9}.Debug (Test)|Any CPU.ActiveCfg = Debug (Test)|Any CPU - {07A654CD-A801-4CE2-9E42-73A2210D43B9}.Debug (Test)|x64.ActiveCfg = Debug (Test)|Any CPU - {07A654CD-A801-4CE2-9E42-73A2210D43B9}.Debug (Test)|x64.Build.0 = Debug (Test)|Any CPU - {07A654CD-A801-4CE2-9E42-73A2210D43B9}.Debug (Test)|x64.Deploy.0 = Debug (Test)|Any CPU - {07A654CD-A801-4CE2-9E42-73A2210D43B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {07A654CD-A801-4CE2-9E42-73A2210D43B9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {07A654CD-A801-4CE2-9E42-73A2210D43B9}.Debug|Any CPU.Deploy.0 = Debug|Any CPU - {07A654CD-A801-4CE2-9E42-73A2210D43B9}.Debug|x64.ActiveCfg = Debug|Any CPU - {07A654CD-A801-4CE2-9E42-73A2210D43B9}.Debug|x64.Build.0 = Debug|Any CPU - {07A654CD-A801-4CE2-9E42-73A2210D43B9}.Debug|x64.Deploy.0 = Debug|Any CPU - {07A654CD-A801-4CE2-9E42-73A2210D43B9}.Release (Test)|Any CPU.ActiveCfg = Release (Test)|Any CPU - {07A654CD-A801-4CE2-9E42-73A2210D43B9}.Release (Test)|x64.ActiveCfg = Release (Test)|Any CPU - {07A654CD-A801-4CE2-9E42-73A2210D43B9}.Release (Test)|x64.Build.0 = Release (Test)|Any CPU - {07A654CD-A801-4CE2-9E42-73A2210D43B9}.Release (Test)|x64.Deploy.0 = Release (Test)|Any CPU - {07A654CD-A801-4CE2-9E42-73A2210D43B9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {07A654CD-A801-4CE2-9E42-73A2210D43B9}.Release|Any CPU.Build.0 = Release|Any CPU - {07A654CD-A801-4CE2-9E42-73A2210D43B9}.Release|Any CPU.Deploy.0 = Release|Any CPU - {07A654CD-A801-4CE2-9E42-73A2210D43B9}.Release|x64.ActiveCfg = Release|Any CPU - {07A654CD-A801-4CE2-9E42-73A2210D43B9}.Release|x64.Build.0 = Release|Any CPU - {07A654CD-A801-4CE2-9E42-73A2210D43B9}.Release|x64.Deploy.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/BackToTheFutureV/BackToTheFutureV.csproj b/BackToTheFutureV/BackToTheFutureV.csproj index 2c04fc72..d3c87bf0 100644 --- a/BackToTheFutureV/BackToTheFutureV.csproj +++ b/BackToTheFutureV/BackToTheFutureV.csproj @@ -105,19 +105,13 @@ MinimumRecommendedRules.ruleset + + $(GTAPath)\scripts\BackToTheFutureV.HUD.Core.dll + False ..\KlangRageAudioLibrary\irrKlang\irrKlang.NET4.dll - - ..\packages\LemonUI.SHVDN3.1.4.0\lib\net48\LemonUI.SHVDN3.dll - - - ..\packages\MonoGame.Framework.DesktopGL.3.8.0.1641\lib\net452\MonoGame.Framework.dll - - - ..\packages\ScriptHookVDotNet3.3.1.0\lib\net48\ScriptHookVDotNet3.dll - @@ -240,9 +234,6 @@ - - - {f5aad1bd-63ca-4a12-97a8-f0d876ab4462} @@ -251,13 +242,19 @@ {e52db215-0aa9-453a-b5f3-91f3ff35c1d9} KlangRageAudioLibrary - - - {b32480f2-767c-4426-afa1-ff9511c612d9} - TimeCircuits.Core - + + + + + 1.4.0 + + + 3.8.0.1641 + + + 3.1.0 + - IF NOT "%25GTAPath%25" == "" ( @@ -268,11 +265,4 @@ copy "$(TargetPath)" "%25GTAPath%25\scripts\$(TargetFileName)" copy "$(TargetDir)\$(TargetName).pdb" "%25GTAPath%25\scripts\$(TargetName).pdb" ) - - - - Questo progetto fa riferimento a uno o più pacchetti NuGet che non sono presenti in questo computer. Usare lo strumento di ripristino dei pacchetti NuGet per scaricarli. Per altre informazioni, vedere http://go.microsoft.com/fwlink/?LinkID=322105. Il file mancante è {0}. - - - \ No newline at end of file diff --git a/BackToTheFutureV/packages.config b/BackToTheFutureV/packages.config deleted file mode 100644 index f86d413b..00000000 --- a/BackToTheFutureV/packages.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/RogersSierra b/RogersSierra deleted file mode 160000 index cf0b3ed7..00000000 --- a/RogersSierra +++ /dev/null @@ -1 +0,0 @@ -Subproject commit cf0b3ed731db59286bdb78a77d82a11f63d4c000