Skip to content

Commit

Permalink
Automatic merge of T1.5-rc1-61-g82a9ca1ff and 13 pull requests
Browse files Browse the repository at this point in the history
- Pull request #570 at 824f96f: Experimental glTF 2.0 support with PBR lighting
- Pull request #630 at 704731a: Sky Color Fix (Addresses Trello Roadmap Card #367 for More accurate sunrise and sunset)
- Pull request #652 at 918fdb1: Add button functions to Raildriver
- Pull request #677 at c1c417f: Correct double heading bug
- Pull request #688 at 7b6b608: adds Help Icons to Video tab
- Pull request #692 at 20de7da: Italian translation for OR 1.5
- Pull request #693 at 453ac3d: French locales
- Pull request #699 at 6baf43d: Bug fix for https://bugs.launchpad.net/or/+bug/1987453. Web: HUD/Force Information, some labels not visible.
- Pull request #706 at 265d33d: TCS Extensions
- Pull request #712 at 68cd8ab: Search for NORMAL signals if no argument is provided
- Pull request #713 at 39fb6c2: https://blueprints.launchpad.net/or/+spec/cruise-control 
- Pull request #714 at d289d28: Feature/1.5 merge fix 1
- Pull request #715 at 447143b: Bug fix for //bugs.launchpad.net/or/+bug/1990930 Default snow terrtex not appearing
  • Loading branch information
openrails-bot committed Sep 27, 2022
15 parents f10206e + 82a9ca1 + 824f96f + 704731a + 918fdb1 + c1c417f + 7b6b608 + 20de7da + 453ac3d + 6baf43d + 265d33d + 68cd8ab + 39fb6c2 + d289d28 + 447143b commit 22fe973
Show file tree
Hide file tree
Showing 14 changed files with 1,679 additions and 1,543 deletions.
Binary file modified Source/Documentation/Installation Guide En.docx
Binary file not shown.
42 changes: 23 additions & 19 deletions Source/Installer/Using the installer scripts.txt
@@ -1,25 +1,29 @@
Using the installer scripts.txt
Last updated: 2014-05-02 by Chris Jakeman
Last updated: 2022-08-21 by Chris Jakeman

1. Download and install Inno Setup from http://www.jrsoftware.org/isdl.php
Initial trials (Apr 2014) used v5.5.4. Open Rails v1.4 uses 6.1.2

2. Download Microsoft .NET Framework 4.7.2 web installer for Windows from
1. If you wish to update the version name from "1.5", then edit the line
#define MyAppVersion "1.5"
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

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

3. Download Microsoft .NET Framework 4.7.2 web installer 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
where <A> is any folder.

2. Make a chain of folders inside folder <A>: <A>\Temp\Installer\
4. Make a chain of folders inside folder <A>: <A>\Temp\Installer\
From Source\Installer, copy OpenRails.iss and Version.iss into <A>\Temp\Installer

3. If you wish to update the version name from "1.4", then edit the line
#define MyAppVersion "1.4"
in the file
<A>\Temp\Installer\Version.iss

4. Repeat the following as often as required:
A. Download OR zip file from http://openrails.org/files/OpenRails-Testing.zip
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

B. Unzip into folder
<A>\Open Rails\Program\
Expand All @@ -28,19 +32,19 @@ Initial trials (Apr 2014) used v5.5.4. Open Rails v1.4 uses 6.1.2
<A>\Open Rails\Program\Updater.ini
as James Ross advises because the updater cannot update an installed version yet.

D. Download source from http://openrails.org/files/OpenRails-Testing-Source.zip and extract
folder 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 (openrails-1.5-rc1.zip) and extract the folder Source\Documentation.

E. Copy contents into folder
<A>\Open Rails\Program\Documentation\

F. Use Inno Setup > Project > Compile to compile the installer script
F. Use Inno Setup > Build > Compile to compile the installer script
<A>\Temp\Installer\Installer.iss
and generate the Open Rails Installer

G. The installer file will be found in <A>\Temp\Installer\Output\OpenRailsSetup.exe
G. The generated file will be found in <A>\Temp\Installer\Output\OpenRailsSetup.exe

5. Test the installer by building Virtual Machines with a fresh copy of Windows.
Open Rails v1.4 is compatible with Windows from 7 (SP1) to 10 (1809) and, hopefully, beyond.
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.

Arrange for the VM to have Internet access and a shared folder.
Copy OpenRailsSetup.exe to the shared folder.
Expand Down
2 changes: 1 addition & 1 deletion Source/Installer/Version.iss
@@ -1 +1 @@
#define MyAppVersion "1.4"
#define MyAppVersion "1.5"
12 changes: 6 additions & 6 deletions Source/Locales/Contrib/ru.po
@@ -1,8 +1,8 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
"POT-Creation-Date: 2021-08-21 11:05:56+0300\n"
"PO-Revision-Date: 2022-01-06 12:38+0300\n"
"POT-Creation-Date: 2022-07-09 11:25:40+0300\n"
"PO-Revision-Date: 2022-07-09 11:31+0300\n"
"Last-Translator: \n"
"Language-Team: \n"
"Language: ru\n"
Expand Down Expand Up @@ -110,7 +110,7 @@ msgstr "Задержка :"

#: ../../Contrib/ActivityEditor/ActivityEditor/ActionProperties/HornProperties.Designer.cs:72
msgid "Required Trigger Distance :"
msgstr ""
msgstr "Дистанция срабатывания:"

#: ../../Contrib/ActivityEditor/ActivityEditor/ActionProperties/HornProperties.Designer.cs:93
msgid "HornProperties"
Expand Down Expand Up @@ -370,7 +370,7 @@ msgstr "Метаданные полигона"
#: ../../Contrib/ActivityEditor/ActivityEditor/Engine/Viewer2D.cs:2004
#: ../../Contrib/ActivityEditor/ActivityEditor/Engine/Viewer2D.cs:2093
msgid "Display"
msgstr ""
msgstr "Отобразить"

#: ../../Contrib/ActivityEditor/ActivityEditor/Engine/Viewer2D.cs:2015
#: ../../Contrib/ActivityEditor/ActivityEditor/Engine/Viewer2D.cs:2117
Expand Down Expand Up @@ -888,7 +888,7 @@ msgstr "Загрузка базы звеньев (файл tsection.dat) ..."
msgid "Loading road track database .rdb ..."
msgstr "Загрузка базы дорог *.rdb ..."

#: ../../Contrib/TrackViewer/Drawing/DrawTrackDB.cs:269
#: ../../Contrib/TrackViewer/Drawing/DrawTrackDB.cs:270
msgid "Finding the angles to draw signals, endnodes, ..."
msgstr "Отрисовка сигналов, тупиков..."

Expand Down Expand Up @@ -1978,7 +1978,7 @@ msgstr "Широта точки под указателем мыши"

#: ../../Contrib/TrackViewer/UserInterface/StatusBarControl.xaml:54
msgid "Trackindex"
msgstr ""
msgstr "Каталог путей"

#: ../../Contrib/TrackViewer/UserInterface/StatusBarControl.xaml:60
#: ../../Contrib/TrackViewer/UserInterface/StatusBarControl.xaml:79
Expand Down
8 changes: 4 additions & 4 deletions Source/Locales/Menu/cs.po
Expand Up @@ -309,7 +309,7 @@ msgstr "Instalační profil:"

#: ../../Menu/MainForm.Designer.cs:366
msgid "Documents ▼"
msgstr ""
msgstr "Dokumenty"

#: ../../Menu/MainForm.Designer.cs:378
msgid "Mode:"
Expand Down Expand Up @@ -345,7 +345,7 @@ msgstr "Konec trasy:"

#: ../../Menu/MainForm.Designer.cs:558
msgid "Duration:"
msgstr "Dobra trvání:"
msgstr "Doba trvání:"

#: ../../Menu/MainForm.Designer.cs:569
msgid "Time:"
Expand All @@ -361,7 +361,7 @@ msgstr "Obtížnost:"

#: ../../Menu/MainForm.Designer.cs:665 ../../Menu/MainForm.Designer.cs:788
msgid "Season:"
msgstr "Roční doba:"
msgstr "Období:"

#: ../../Menu/MainForm.Designer.cs:697
msgid "Train:"
Expand Down Expand Up @@ -965,7 +965,7 @@ msgstr "Náhodné nastavení počasí"

#: ../../Menu/Options.Designer.cs:1691
msgid "Activity randomization"
msgstr "Infromace o aktivitě "
msgstr "Informace o aktivitě "

#: ../../Menu/Options.Designer.cs:1724
msgid "Correct questionable braking parameters"
Expand Down

0 comments on commit 22fe973

Please sign in to comment.