Merge branch 'master' into release

Building.md

@@ -50,6 +50,13 @@ echo -e '#!/bin/sh\nexec /usr/bin/mono /usr/local/lib/nuget.exe "$@"' | sudo tee
 sudo chmod 755 /usr/local/bin/nuget
 ```
 
+#### Required Additional System Libraries
+
+- libusb-1.0
+- fonts-noto-cjk [Optional- Gives a better Unicode glyph set in menus etc.]
+- libsdl2 [Optional- Required if SDL2 backend is to be used]
+
+
 ### Mac
 
 - Mono 5.20.1 or later, x86 only

DebianControl.sh

@@ -36,7 +36,7 @@ Maintainer: leezer3 <leezer3@gmail.com>
 Architecture: all
 Version: $Version
 Provides: bve-engine
-Depends: debhelper (>= 9), mono-runtime (>= 5.20.1), libmono-corlib4.5-cil (>= 5.20.1), libmono-system-drawing4.0-cil (>= 1.0), libmono-system-windows-forms4.0-cil (>= 1.0), libmono-system4.0-cil (>= 5.20.1), libmono-system-xml-linq4.0-cil (>= 5.20.1), libmono-i18n4.0-all, libmono-microsoft-csharp4.0-cil (>= 5.20.1), libopenal1, libusb-1.0-0
+Depends: debhelper (>= 9), mono-runtime (>= 5.20.1), libmono-corlib4.5-cil (>= 5.20.1), libmono-system-drawing4.0-cil (>= 1.0), libmono-system-windows-forms4.0-cil (>= 1.0), libmono-system4.0-cil (>= 5.20.1), libmono-system-xml-linq4.0-cil (>= 5.20.1), libmono-i18n4.0-all, libmono-microsoft-csharp4.0-cil (>= 5.20.1), libopenal1, libusb-1.0-0, fonts-noto-core, fonts-noto-cjk
 Recommends: bve-route, bve-train
 Homepage: http://openbve-project.net
 Description: realistic 3D train/railway simulator (main program)

WindowsInstaller.ps1

@@ -31,6 +31,31 @@ WizardSmallImageFile=installer_logo.bmp
 
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"
+Name: "brazilianportuguese"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"
+Name: "catalan"; MessagesFile: "compiler:Languages\Catalan.isl"
+Name: "corsican"; MessagesFile: "compiler:Languages\Corsican.isl"
+Name: "czech"; MessagesFile: "compiler:Languages\Czech.isl"
+Name: "danish"; MessagesFile: "compiler:Languages\Danish.isl"
+Name: "dutch"; MessagesFile: "compiler:Languages\Dutch.isl"
+Name: "finnish"; MessagesFile: "compiler:Languages\Finnish.isl"
+Name: "french"; MessagesFile: "compiler:Languages\French.isl"
+Name: "german"; MessagesFile: "compiler:Languages\German.isl"
+Name: "greek"; MessagesFile: "compiler:Languages\Greek.isl"
+Name: "hebrew"; MessagesFile: "compiler:Languages\Hebrew.isl"
+Name: "hungarian"; MessagesFile: "compiler:Languages\Hungarian.isl"
+Name: "italian"; MessagesFile: "compiler:Languages\Italian.isl"
+Name: "japanese"; MessagesFile: "compiler:Languages\Japanese.isl"
+Name: "norwegian"; MessagesFile: "compiler:Languages\Norwegian.isl"
+Name: "polish"; MessagesFile: "compiler:Languages\Polish.isl"
+Name: "portuguese"; MessagesFile: "compiler:Languages\Portuguese.isl"
+Name: "russian"; MessagesFile: "compiler:Languages\Russian.isl"
+Name: "scottishgaelic"; MessagesFile: "compiler:Languages\ScottishGaelic.isl"
+Name: "serbiancyrillic"; MessagesFile: "compiler:Languages\SerbianCyrillic.isl"
+Name: "serbianlatin"; MessagesFile: "compiler:Languages\SerbianLatin.isl"
+Name: "slovenian"; MessagesFile: "compiler:Languages\Slovenian.isl"
+Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl"
+Name: "turkish"; MessagesFile: "compiler:Languages\Turkish.isl"
+Name: "ukrainian"; MessagesFile: "compiler:Languages\Ukrainian.isl"
 
 [Tasks]
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: checkablealone
@@ -106,6 +131,7 @@ begin
     DataDirPage.Values[0] := GetPreviousData('DataDir0', ExpandConstant('{userappdata}\{#MyAppName}\LegacyContent\Railway'));
     DataDirPage.Values[1] := GetPreviousData('DataDir1', ExpandConstant('{userappdata}\{#MyAppName}\LegacyContent\Train'));
     DataDirPage.Values[2] := GetPreviousData('DataDir2', ExpandConstant('{userappdata}\{#MyAppName}\LegacyContent\Other'));
+    ResultCode_Net4 := 0;
 end;
 
 procedure RegisterPreviousData(PreviousDataKey: Integer);
@@ -174,9 +200,11 @@ FileLines: TArrayOfString;
   //Determine whether the component is installed. 
     if RegQueryDWordValue(GetHKLM(),'Software\Microsoft\NET Framework Setup\NDP\v4\Full', 'Release',Installed) then begin
       if Installed >= 394254 then begin
+        Log('.Net Framework 4 not detected- Launching web installer.');
         use_Net4:=1;
       end else begin
         use_Net4:=0;
+        Log('.Net Framework 4 is already installed, skipping.');
       end;
     end;
     begin
@@ -188,44 +216,69 @@ FileLines: TArrayOfString;
         begin
         IntToStr(ResultCode_Net4)
         // handle success if necessary; ResultCode contains the exit code
+        Log('.Net Install completed sucessfully');
         end
       else begin
         // handle failure if necessary; ResultCode contains the error code;
+        Log('.Net Install failed with error code ' + IntToStr(ResultCode_Net4));
       end;
+      
     end;
-      //OpenBVE filesystem.cfg
-      if (UsagePage.SelectedValueIndex = 0) then
+      if (UsagePage = nil) or (DataDirPage = nil) then
+      // Speculative, issue with something on re-install?: https://github.com/leezer3/OpenBVE/issues/806
       begin
-        CreateDir(ExpandConstant('{userappdata}\{#MyAppName}'));
-        ForceDirectories(ExpandConstant('{{userappdata}\{#MyAppName}\Settings'));
-        FileCopy(ExpandConstant('{app}\filesystem_appdata.cfg'), ExpandConstant('{userappdata}\{#MyAppName}\Settings\filesystem.cfg'), True);
-        DeleteFile(ExpandConstant('{app}\filesystem_programfolder.cfg'));
-        DataDirPage.Values[0] := ExpandConstant('{userappdata}\{#MyAppName}\LegacyContent\Railway');
-        DataDirPage.Values[1] := ExpandConstant('{userappdata}\{#MyAppName}\LegacyContent\Train');
-      end;
-      if (UsagePage.SelectedValueIndex = 1) then
-      begin
-        ForceDirectories(ExpandConstant('{app}\UserData\Settings'));
-        FileCopy(ExpandConstant('{app}\filesystem_programfolder.cfg'), ExpandConstant('{app}\UserData\Settings\filesystem.cfg'), True);
-        DeleteFile(ExpandConstant('{app}\filesystem_appdata.cfg'));
-        DataDirPage.Values[0] := ExpandConstant('{app}\UserData');
-
-      end;
-      if (UsagePage.SelectedValueIndex = 2) then
-      begin
-        ForceDirectories(ExpandConstant('{app}\UserData\Settings'));
-        //Load filesystem.cfg
-        LoadStringsFromFile(ExpandConstant('{app}\UserData\Settings\filesystem.cfg'), FileLines);
-        FileLines[2]:='InitialRoute = '+DataDirPage.Values[0];
-        FileLines[3]:='InitialTrain = '+DataDirPage.Values[1];
-        FileLines[4]:='RoutePackageInstall = '+DataDirPage.Values[0];
-        FileLines[5]:='TrainPackageInstall = '+DataDirPage.Values[1];
-        //Save filesystem.cfg
-        SaveStringsToUTF8File(ExpandConstant('{app}\UserData\Settings\filesystem.cfg'),FileLines,false);
-      end;
-        ForceDirectories(DataDirPage.Values[0]);
-        ForceDirectories(DataDirPage.Values[1])
-
+        Log('Either DataDirPage or UsagePage was null. This should not happen....');
+      end
+      else begin
+        //OpenBVE filesystem.cfg
+        if (UsagePage.SelectedValueIndex = 0) then
+        begin
+          Log('Using the AppData folder to store all settings, routes and trains');
+          try
+            CreateDir(ExpandConstant('{userappdata}\{#MyAppName}'));
+            ForceDirectories(ExpandConstant('{{userappdata}\{#MyAppName}\Settings'));
+            FileCopy(ExpandConstant('{app}\filesystem_appdata.cfg'), ExpandConstant('{userappdata}\{#MyAppName}\Settings\filesystem.cfg'), True);
+            DeleteFile(ExpandConstant('{app}\filesystem_programfolder.cfg'));
+            DataDirPage.Values[0] := ExpandConstant('{userappdata}\{#MyAppName}\LegacyContent\Railway');
+            DataDirPage.Values[1] := ExpandConstant('{userappdata}\{#MyAppName}\LegacyContent\Train');
+          except
+            Log('Unexpected error occured whilst creating initial settings');
+          end;
+        end;
+        if (UsagePage.SelectedValueIndex = 1) then
+        begin
+          Log('Using the UserData folder to store all settings, routes and trains'); 
+          try
+            ForceDirectories(ExpandConstant('{app}\UserData\Settings'));
+            FileCopy(ExpandConstant('{app}\filesystem_programfolder.cfg'), ExpandConstant('{app}\UserData\Settings\filesystem.cfg'), True);
+            DeleteFile(ExpandConstant('{app}\filesystem_appdata.cfg'));
+            DataDirPage.Values[0] := ExpandConstant('{app}\UserData');
+          except
+            Log('Unexpected error occured whilst creating initial settings');
+          end;
+        end;
+        if (UsagePage.SelectedValueIndex = 2) then
+        begin
+          Log('Using Custom Folders to store all settings, routes and trains');
+          try
+            ForceDirectories(ExpandConstant('{app}\UserData\Settings'));
+            //Load filesystem.cfg
+            LoadStringsFromFile(ExpandConstant('{app}\UserData\Settings\filesystem.cfg'), FileLines);
+            FileLines[2]:='InitialRoute = '+DataDirPage.Values[0];
+            FileLines[3]:='InitialTrain = '+DataDirPage.Values[1];
+            FileLines[4]:='RoutePackageInstall = '+DataDirPage.Values[0];
+            FileLines[5]:='TrainPackageInstall = '+DataDirPage.Values[1];
+            //Save filesystem.cfg
+            SaveStringsToUTF8File(ExpandConstant('{app}\UserData\Settings\filesystem.cfg'),FileLines,false);
+          except
+            Log('Unexpected error occured whilst creating initial settings');
+          end;
+        end;
+          Log('Creating RouteInstall directory ' + DataDirPage.Values[0]);
+          ForceDirectories(DataDirPage.Values[0]);
+          Log('Creating TrainInstall directory ' + DataDirPage.Values[1]);
+          ForceDirectories(DataDirPage.Values[1])
+        end;
     end;
 end;
 

assets/Compatibility/RoutePatches/HongKong.xml

@@ -10,6 +10,22 @@
 		<Hash>F3ECCC2ABA65EFFB3D1B62B351DAD0FB1E28262EC70384246A92679DB765AAF0</Hash>
 		<FileName>飼聾s.csv</FileName>
 		<ReducedColorTransparency>true</ReducedColorTransparency>
-	</Patch>	
+	</Patch>
+	<!--- KCR East Rail Extension -->
+	<Patch>
+		<Hash>75F63E0A0ABDC53003A80749275755D3F64FD7AA0D7FE64E3867A2B6EBD27C26</Hash>
+		<FileName>kcrc east extension(atc ver.)1.rw</FileName>
+		<SignalSet>KCR.xml</SignalSet>
+	</Patch>
+	<Patch>
+		<Hash>2DD5C20EDC0371F5034EDB540642C0C3E203CC69A88FA27788A74F7A9B8D0930</Hash>
+		<FileName>kcrc east extension(atc ver.)2.rw</FileName>
+		<SignalSet>KCR.xml</SignalSet>
+	</Patch>
+	<Patch>
+		<Hash>5128525449B435F808D6C8459735F857BE673194A4595886CA0C1E09D590D1D7</Hash>
+		<FileName>kcrc east extension(manual ver.1).rw</FileName>
+		<SignalSet>KCR.xml</SignalSet>
+	</Patch>
   </RoutePatches>
 </openBVE>

assets/Compatibility/Signals/KCR.xml

@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openBVE xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">Japanese\
+	<CompatibilitySignals>
+		<SignalSetName>KCR</SignalSetName>
+		<!-- NOTE: Must contain exactly 9 signals in order 
+			SignalSetName must be unique-->
+		<Signal>
+			<!-- 2 aspect orange, red -->
+			<Aspect Number="0">Japanese\signal_2_0.csv</Aspect>
+			<Aspect Number="2">KCR\signal_2b_4.csv</Aspect>
+		</Signal>
+		<Signal>
+			<!-- 2 aspect green, red -->
+			<Aspect Number="0">Japanese\signal_2_0.csv</Aspect>
+			<Aspect Number="2">Japanese\signal_2b_4.csv</Aspect>
+		</Signal>
+		<Signal>
+			<!-- 3 aspect green, orange, red -->
+			<Aspect Number="0">Japanese\signal_3_0.csv</Aspect>
+			<Aspect Number="2">Japanese\signal_3_2.csv</Aspect>
+			<Aspect Number="4">KCR\signal_3_4.csv</Aspect>
+		</Signal>
+		<Signal>
+			<!-- 4 aspect green, orange, double orange, red -->
+			<Aspect Number="0">Japanese\signal_4_0.csv</Aspect>
+			<Aspect Number="1">Japanese\signal_4a_1.csv</Aspect>
+			<Aspect Number="2">KCR\signal_4a_2.csv</Aspect>
+			<Aspect Number="4">Japanese\signal_4a_4.csv</Aspect>
+		</Signal>
+		<Signal>
+			<!-- 4 aspect green, orange green, orange, red -->
+			<Aspect Number="0">Japanese\signal_4_0.csv</Aspect>
+			<Aspect Number="2">KCR\signal_4b_2.csv</Aspect>
+			<Aspect Number="3">KCR\signal_4b_3.csv</Aspect>
+			<Aspect Number="4">KCR\signal_4b_4.csv</Aspect>
+		</Signal>
+		<Signal>
+			<!-- 5 aspect green, orange green, orange, double orange, red -->
+			<Aspect Number="0">Japanese\signal_5_0.csv</Aspect>
+			<Aspect Number="1">Japanese\signal_5a_1.csv</Aspect>
+			<Aspect Number="2">Japanese\signal_5_2.csv</Aspect>
+			<Aspect Number="3">Japanese\signal_5_3.csv</Aspect>
+			<Aspect Number="4">Japanese\signal_5_4.csv</Aspect>
+		</Signal>
+		<Signal>
+			<!-- 5 aspect double green, green, orange green, orange, red -->
+			<Aspect Number="0">Japanese\signal_5_0.csv</Aspect>
+			<Aspect Number="2">Japanese\signal_5_2.csv</Aspect>
+			<Aspect Number="3">Japanese\signal_5_3.csv</Aspect>
+			<Aspect Number="4">Japanese\signal_5_4.csv</Aspect>
+			<Aspect Number="5">Japanese\signal_5b_5.csv</Aspect>
+		</Signal>
+		<Signal>
+			<!-- 6 aspect double green, green, orange green, orange, double orange, red -->
+			<Aspect Number="0">Japanese\signal_6_0.csv</Aspect>
+			<Aspect Number="1">Japanese\signal_6_1.csv</Aspect>
+			<Aspect Number="2">Japanese\signal_6_2.csv</Aspect>
+			<Aspect Number="3">Japanese\signal_6_3.csv</Aspect>
+			<Aspect Number="4">Japanese\signal_6_4.csv</Aspect>
+			<Aspect Number="5">Japanese\signal_6_5.csv</Aspect>
+		</Signal>
+		<Signal>
+			<!-- Banner repeater -->
+			<Aspect Number="0">Japanese\repeatingsignal_0.csv</Aspect>
+			<Aspect Number="3">Japanese\repeatingsignal_3.csv</Aspect>
+			<Aspect Number="4">Japanese\repeatingsignal_4.csv</Aspect>
+		</Signal>
+		<SpeedLimits>
+			<!-- Default speed limits for each aspect number in km/h
+				NOTE: Will likely be overriden by Route.Signal-->
+			<Aspect Number="0">0</Aspect>
+			<Aspect Number="1">25</Aspect>
+			<Aspect Number="2">55</Aspect>
+			<Aspect Number="3">75</Aspect>
+			<Aspect Number="4">Unlimited</Aspect>
+			<Aspect Number="5">Unlimited</Aspect>
+		</SpeedLimits>
+	</CompatibilitySignals>
+</openBVE>

assets/Compatibility/Signals/KCR/signal_2b_4.csv

@@ -0,0 +1,55 @@
+CreateMeshBuilder
+AddVertex,-0.3,-0.85,-0.4
+AddVertex,-0.3,0.0,-0.4
+AddVertex,0.3,0.0,-0.4
+AddVertex,0.3,-0.85,-0.4
+AddFace,0,1,2,3
+SetTextureCoordinates,0,0.0,1.0
+SetTextureCoordinates,1,0.0,0.0
+SetTextureCoordinates,2,1.0,0.0
+SetTextureCoordinates,3,1.0,1.0
+LoadTexture,..\graphics\signal_2.png
+
+
+
+CreateMeshBuilder
+AddVertex,-0.18,-0.495,-0.405
+AddVertex,-0.18,-0.135,-0.405
+AddVertex,0.18,-0.135,-0.405
+AddVertex,0.18,-0.495,-0.405
+AddFace,0,1,2,3
+SetTextureCoordinates,0,0.0,1.0
+SetTextureCoordinates,1,0.0,0.0
+SetTextureCoordinates,2,1.0,0.0
+SetTextureCoordinates,3,1.0,1.0
+LoadTexture,..\graphics\light_purple.png
+SetEmissiveColor,255,255,255
+SetBlendMode,Additive
+
+CreateMeshBuilder
+AddVertex,-0.5,-0.815,-0.6
+AddVertex,-0.5,0.185,-0.6
+AddVertex,0.5,0.185,-0.6
+AddVertex,0.5,-0.815,-0.6
+AddFace,0,1,2,3
+SetTextureCoordinates,0,0.0,1.0
+SetTextureCoordinates,1,0.0,0.0
+SetTextureCoordinates,2,1.0,0.0
+SetTextureCoordinates,3,1.0,1.0
+LoadTexture,..\graphics\glow_purple.png
+SetEmissiveColor,255,255,255
+SetBlendMode,Additive,75,DivideExponent2
+
+CreateMeshBuilder
+AddVertex,-1.25,-1.565,-0.8
+AddVertex,-1.25,0.935,-0.8
+AddVertex,1.25,0.935,-0.8
+AddVertex,1.25,-1.565,-0.8
+AddFace,0,1,2,3
+SetTextureCoordinates,0,1.0,1.0
+SetTextureCoordinates,1,0.0,1.0
+SetTextureCoordinates,2,0.0,0.0
+SetTextureCoordinates,3,1.0,0.0
+LoadTexture,..\graphics\glow_purple.png
+SetEmissiveColor,255,255,255
+SetBlendMode,Additive,300,DivideExponent2

assets/Compatibility/Signals/KCR/signal_3_4.csv

@@ -0,0 +1,53 @@
+CreateMeshBuilder
+AddVertex,-0.3,-1.1,-0.4
+AddVertex,-0.3,0.0,-0.4
+AddVertex,0.3,0.0,-0.4
+AddVertex,0.3,-1.1,-0.4
+AddFace,0,1,2,3
+SetTextureCoordinates,0,0.0,1.0
+SetTextureCoordinates,1,0.0,0.0
+SetTextureCoordinates,2,1.0,0.0
+SetTextureCoordinates,3,1.0,1.0
+LoadTexture,..\graphics\signal_3.png
+
+CreateMeshBuilder
+AddVertex,-0.18,-0.495,-0.405
+AddVertex,-0.18,-0.135,-0.405
+AddVertex,0.18,-0.135,-0.405
+AddVertex,0.18,-0.495,-0.405
+AddFace,0,1,2,3
+SetTextureCoordinates,0,0.0,1.0
+SetTextureCoordinates,1,0.0,0.0
+SetTextureCoordinates,2,1.0,0.0
+SetTextureCoordinates,3,1.0,1.0
+LoadTexture,..\graphics\light_purple.png
+SetEmissiveColor,255,255,255
+SetBlendMode,Additive
+
+CreateMeshBuilder
+AddVertex,-0.5,-0.815,-0.6
+AddVertex,-0.5,0.185,-0.6
+AddVertex,0.5,0.185,-0.6
+AddVertex,0.5,-0.815,-0.6
+AddFace,0,1,2,3
+SetTextureCoordinates,0,0.0,1.0
+SetTextureCoordinates,1,0.0,0.0
+SetTextureCoordinates,2,1.0,0.0
+SetTextureCoordinates,3,1.0,1.0
+LoadTexture,..\graphics\glow_purple.png
+SetEmissiveColor,255,255,255
+SetBlendMode,Additive,75,DivideExponent2
+
+CreateMeshBuilder
+AddVertex,-1.25,-1.565,-0.8
+AddVertex,-1.25,0.935,-0.8
+AddVertex,1.25,0.935,-0.8
+AddVertex,1.25,-1.565,-0.8
+AddFace,0,1,2,3
+SetTextureCoordinates,0,1.0,1.0
+SetTextureCoordinates,1,0.0,1.0
+SetTextureCoordinates,2,0.0,0.0
+SetTextureCoordinates,3,1.0,0.0
+LoadTexture,..\graphics\glow_purple.png
+SetEmissiveColor,255,255,255
+SetBlendMode,Additive,300,DivideExponent2