Merge branch 'master' into simple-adhesion-axle

Author: cesarBLG

Source/Contrib/TimetableEditor/about.lfm

@@ -38,7 +38,7 @@ object Form2: TForm2
     Width = 97
     Alignment = taCenter
     AutoSize = True
-    Caption = 'Version: 1.5.1'
+    Caption = 'Version: 1.6'
     Font.CharSet = ANSI_CHARSET
     Font.Height = -16
     Font.Name = 'Arial'

Source/Contrib/TimetableEditor/about.lrt

@@ -1,5 +1,5 @@
 TFORM2.CAPTION=about
 TFORM2.BUTTON1.CAPTION=close
 TFORM2.LABEL1.CAPTION=Timetable Editor
-TFORM2.STATICTEXT1.CAPTION=Version: 1.5.1
+TFORM2.STATICTEXT1.CAPTION=Version: 1.6
 TFORM2.LABEL2.CAPTION=Open Rails

Source/Contrib/TimetableEditor/languages/contrib.timetableeditor.de.po

@@ -197,7 +197,7 @@ msgid "Open Rails"
 msgstr ""
 
 #: tform2.statictext1.caption
-msgid "Version: 1.5"
+msgid "Version: 1.6"
 msgstr ""
 
 #: tform3.bitbtn2.caption

Source/Contrib/TimetableEditor/languages/contrib.timetableeditor.po

@@ -187,7 +187,7 @@ msgid "Open Rails"
 msgstr ""
 
 #: tform2.statictext1.caption
-msgid "Version: 1.5"
+msgid "Version: 1.6"
 msgstr ""
 
 #: tform3.bitbtn2.caption

Source/Contrib/TimetableEditor/languages/contrib.timetableeditor.ru.po

@@ -197,8 +197,8 @@ msgid "Open Rails"
 msgstr "Open Rails"
 
 #: tform2.statictext1.caption
-msgid "Version: 1.5"
-msgstr "Версия: 1.5"
+msgid "Version: 1.6"
+msgstr "Версия: 1.6"
 
 #: tform3.bitbtn2.caption
 msgctxt "TFORM3.BITBTN2.CAPTION"

Source/Documentation/Manual/cabs.rst

@@ -289,21 +289,33 @@ Example::
    single: ORTS_PLAYER_DIESEL_ENGINE_STATE
 
 ORTS_PLAYER_DIESEL_ENGINE_STATE: this control respectively selects frames 0, 
-1, 2, 3 for the player locomotive engine states Stopped, Starting, Running and 
-Stopping. It is a display-only control.
+1, 2, 3 for the player locomotive engine states Stopped, Stopping, Starting and Running. It is a display-only control.
 
 Example::
 
-                MultiState (
-                        Type ( ORTS_PLAYER_DIESEL_ENGINE_STATE TRI_STATE)
-                        Position ( 270 446 39 40 )
-                        Graphic ( cd_363_zberace.ace )
-                        NumFrames ( 4 4 1 )
-                        Style ( NONE )
-                        MouseControl ( 1 )
-                        Orientation ( 0 )
-                        DirIncrease ( 1 )
-                )
+		MultiStateDisplay (
+			Type ( ORTS_PLAYER_DIESEL_ENGINE_STATE MULTI_STATE_DISPLAY )
+			Position ( 140 306 6.5 6.2 )
+			Graphic ( "engine_state.ace" )
+			States ( 4 4 1
+				State (
+					Style ( 0 )
+					SwitchVal ( 0 )
+				)
+				State (
+					Style ( 0 )
+					SwitchVal ( 1 )
+				)
+				State (
+					Style ( 0 )
+					SwitchVal ( 2 )
+				)
+				State (
+					Style ( 0 )
+					SwitchVal ( 3 )
+				)
+			)
+		)
 
 
 .. index::

Source/Documentation/Manual/timetable.rst

@@ -1149,7 +1149,7 @@ junction somewhere beyond that station.
         This function will return 'true' if approaching train is to stop at the request stop in order to set down
         passengers, otherwise it returns 'false'.
         Using this function, the state of the signal can be set as required. The signal can be visualized as an
-        actual signal, but also, for instance, a passenger figure can be animated to be visual on the plaƞorm
+        actual signal, but also, for instance, a passenger figure can be animated to be visual on the platform
         if the train is to stop, and otherwise not be visual.
 
         Apart from this function, the signal must set two variables :
@@ -1201,7 +1201,7 @@ junction somewhere beyond that station.
                     A 'spoiler' indication which shows if the stop is required to set down or pick up, can be shown if the
                     Next Station Window is displayed (normally using key F10), by pressing keys ALT+F10.
 
-                    When ALT+F10 is pressed, and the next station is a request stop, a line is displayed at the boƩom of
+                    When ALT+F10 is pressed, and the next station is a request stop, a line is displayed at the bottom of
                     the window showing if stop is required or not.
 
                     NOTE : this spoiler function is not yet available and will be included later.

Source/Installer/Installer.iss

@@ -20,7 +20,7 @@
 
 #define DotNETName "Microsoft .NET Framework 4.7.2"
 
-#define MyAppURL "http://openrails.org" ; Not yet HTTPS
+#define MyAppURL "https://openrails.org"
 #define MyAppSourceURL "http://openrails.org/download/source/"
 #define MyAppSupportURL "https://launchpad.net/or"
 
@@ -31,7 +31,7 @@
 #define MyAppDocPath "..\..\Program\Documentation"
 
 #define NetRedistPath "..\..\.NET Framework 4.7.2 web installer"
-#define NetRedist "NDP472-KB4054531-Web.exe"
+#define NetRedist "ndp472-kb4054531-web.exe" ; Has to be lower-case to match download
 
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application.
@@ -50,20 +50,26 @@ DefaultDirName  ={commonpf}\{#MyAppName}
 DefaultGroupName={#MyAppName}
 AllowNoIcons    =yes
 LicenseFile     ={#MyAppProgPath}\Copying.txt
-InfoBeforeFile   ={#MyAppProgPath}\Prerequisites.txt
+InfoBeforeFile  ={#MyAppProgPath}\Prerequisites.txt
 InfoAfterFile   ={#MyAppProgPath}\Readme.txt
 
-; Remove the following line to run in administrative install mode (install for all users.)
-; PrivilegesRequired=lowest ; Cannot create the directory C:\Program Files\Open Rails
+; Prompt for a destination folder
+DisableDirPage  =no
+; 32-bit is the default, installing in "Program Files (x86)" on 64-bit Windows. "x64compatible" uses Program Files on 64-bit Windows
+ArchitecturesInstallIn64BitMode =x64compatible
+
+; Default is admin install mode.
+; Comment in the following line to run in non-administrative install mode, but that cannot create the directory C:\Program Files\Open Rails
+; PrivilegesRequired=lowest
 
 Compression     =lzma
 SolidCompression=yes
-WizardStyle=modern
+WizardStyle     =modern
 Uninstallable   =yes
-UninstallDisplayIcon={app}\{#MyAppExeName}
-OutputBaseFilename=OpenRailsSetup
+UninstallDisplayIcon ={app}\{#MyAppExeName}
+OutputBaseFilename =OpenRailsSetup
 
-; Windows 7 SP1
+; Windows 7 SP1 Correct value, so ignore final warning message from Build > Compile
 MinVersion      =6.1sp1
 
 [Languages]
@@ -79,7 +85,7 @@ Name: "finnish"; MessagesFile: "compiler:Languages\Finnish.isl"
 Name: "french"; MessagesFile: "compiler:Languages\French.isl"
 Name: "german"; MessagesFile: "compiler:Languages\German.isl"
 Name: "hebrew"; MessagesFile: "compiler:Languages\Hebrew.isl"
-Name: "icelandic"; MessagesFile: "compiler:Languages\Icelandic.isl"
+;Name: "icelandic"; MessagesFile: "compiler:Languages\Icelandic.isl"
 Name: "italian"; MessagesFile: "compiler:Languages\Italian.isl"
 Name: "japanese"; MessagesFile: "compiler:Languages\Japanese.isl"
 Name: "norwegian"; MessagesFile: "compiler:Languages\Norwegian.isl"

Source/Installer/Using the installer scripts.txt

@@ -1,19 +1,24 @@
 Using the installer scripts.txt
-Last updated: 2022-08-21 by Chris Jakeman
+Last updated: 2025-06-21 by Chris Jakeman
 
-1. If you wish to update the version name from "1.5", then edit the line
-     #define MyAppVersion "1.5"
+Compiling the scripts and data files on your own PC and testing them there or on a virtual machine
+==================================================================================================
+
+1. If you wish to update the version name from "1.6", then edit the line
+     #define MyAppVersion "1.6"
 	 in the file 
    Source\Installer\Version.iss
      and update the Release number and date in:
    Source\RunActivity\Readme.txt
      and in
    Source\RunActivity\Prerequisites.txt
 
+   The text in these documents is shown by the Installer to the user, so check this is still up to date.
+   
 2. Download and install Inno Setup from http://www.jrsoftware.org/isdl.php
-Initial trials (Apr 2014) used v5.5.4. Open Rails v1.5 uses 6.1.2
+Initial trials (Apr 2014) used v5.5.4. Open Rails v1.6 uses 6.4.3
 
-3. Download Microsoft .NET Framework 4.7.2 web installer for Windows from:
+3. Download Microsoft .NET Framework 4.7.2 web installer package for Windows from:
     https://support.microsoft.com/en-us/topic/microsoft-net-framework-4-7-2-web-installer-for-windows-dda5cddc-b85e-545d-8d4a-d213349b7775
    and save in
   <A>\.NET Framework 4.7.2 web installer\ndp472-kb4054531-web.exe
@@ -23,28 +28,31 @@ Initial trials (Apr 2014) used v5.5.4. Open Rails v1.5 uses 6.1.2
    From Source\Installer, copy OpenRails.iss and Version.iss into <A>\Temp\Installer
 
 5. Repeat the following as often as required:
-  A. Download OR zip file from https://github.com/openrails/openrails/releases, choose the latest (i.e. pre-release) version, open the Assets concertina and pick OpenRails-Stable.zip
+  A. Download OR zip file from https://github.com/openrails/openrails/releases, choose the latest (i.e. pre-release) version, open the Assets concertina and pick Open Rails <version>.zip where <version> is something like "1.6-rc2"
 
   B. Unzip into folder 
-    <A>\Open Rails\Program\
+    <A>\Program\
 
   C. Remove 
-    <A>\Open Rails\Program\Updater.ini 
+    <A>\Program\Updater.ini 
   as James Ross advises because the updater cannot update an installed version yet.
 
-  D. Download source from https://github.com/openrails/openrails/releases, choose the latest (i.e. pre-release) version, open the Assets concertina and pick Source code (openrails-1.5-rc1.zip) and extract the folder Source\Documentation.
+  D. Download source from https://github.com/openrails/openrails/releases, choose the latest (i.e. pre-release) version, open the Assets concertina and pick Source code Open Rails <version> Source.zip where <version> is something like "1.6-rc2" and extract the folder Source\Documentation.
 
   E. Copy contents into folder
-    <A>\Open Rails\Program\Documentation\
+    <A>\Program\Documentation\
+	
+  F. If you made changes to Source\RunActivity\Readme.txt or Source\RunActivity\Prerequisites.txt in Step 1, then
+  copy them to <A>\Program\ to overwrite the downloaded files.
 
-  F. Use Inno Setup > Build > Compile to compile the installer script
+  G. Use Inno Setup Compiler > Build > Compile to compile the installer script
     <A>\Temp\Installer\Installer.iss
 	and generate the Open Rails Installer
 
-  G. The generated file will be found in <A>\Temp\Installer\Output\OpenRailsSetup.exe
+  H. The generated file will be found in <A>\Temp\Installer\Output\OpenRailsSetup.exe
 
 6. Test the installer by building Virtual Machines with a fresh copy of Windows.
-Open Rails v1.5 is compatible with Windows from 7 (SP1) to 11 and, hopefully, beyond.
+Open Rails v1.6 is compatible with Windows from 7 (SP1) to 11 and, hopefully, beyond.
 
 Arrange for the VM to have Internet access and a shared folder.
 Copy OpenRailsSetup.exe to the shared folder.

Source/Installer/Version.iss

@@ -1 +1 @@
-#define MyAppVersion "1.5"
+#define MyAppVersion "1.6"