Skip to content

Commit 235982f

Browse files
leezer3leezer3
committed
Merge branch 'master' into release
2 parents c7edbd0 + 7856631 commit 235982f

File tree

171 files changed

+7471
-6370
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

171 files changed

+7471
-6370
lines changed

‎DMGScript.sh

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#!/usr/bin/env bash
2+
3+
# Basic shell script to retry creating DMG as Azure is buggy
4+
# https://github.com/actions/runner-images/issues/7522
5+
6+
echo "Attempting to create Apple DMG"
7+
for i in {1..10}; do
8+
if /usr/bin/sudo /usr/bin/hdiutil create macbuild.dmg -volname "OpenBVE" -fs HFS+ -srcfolder "mac/OpenBVE.app"; then
9+
echo "Successfully created DMG on attempt $i"
10+
break
11+
elif [[ $i -eq 10 ]]; then
12+
echo "Failed to create DMG after $i attempts"
13+
exit 1
14+
else
15+
echo "Failed to create DMG on attempt $i, retrying"
16+
fi
17+
done

‎OpenBVE.sln

+16-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
1+
22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 17
44
VisualStudioVersion = 17.9.34728.123
@@ -179,6 +179,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Win32PluginProxy", "source\
179179
EndProject
180180
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Route.Bve5", "source\Plugins\Route.Bve5\Route.Bve5.csproj", "{C4BE7A1F-9CCD-4E78-8341-741ABDA8E026}"
181181
EndProject
182+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Formats.OpenBve", "source\Plugins\Formats.OpenBve\Formats.OpenBve.csproj", "{7ED7B285-FAE6-4B34-ACC5-87399F27C8BC}"
183+
EndProject
182184
Global
183185
GlobalSection(SolutionConfigurationPlatforms) = preSolution
184186
Debug|Any CPU = Debug|Any CPU
@@ -645,6 +647,18 @@ Global
645647
{C4BE7A1F-9CCD-4E78-8341-741ABDA8E026}.Release|Mixed Platforms.Build.0 = Release|Any CPU
646648
{C4BE7A1F-9CCD-4E78-8341-741ABDA8E026}.Release|x86.ActiveCfg = Release|Any CPU
647649
{C4BE7A1F-9CCD-4E78-8341-741ABDA8E026}.Release|x86.Build.0 = Release|Any CPU
650+
{7ED7B285-FAE6-4B34-ACC5-87399F27C8BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
651+
{7ED7B285-FAE6-4B34-ACC5-87399F27C8BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
652+
{7ED7B285-FAE6-4B34-ACC5-87399F27C8BC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
653+
{7ED7B285-FAE6-4B34-ACC5-87399F27C8BC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
654+
{7ED7B285-FAE6-4B34-ACC5-87399F27C8BC}.Debug|x86.ActiveCfg = Debug|Any CPU
655+
{7ED7B285-FAE6-4B34-ACC5-87399F27C8BC}.Debug|x86.Build.0 = Debug|Any CPU
656+
{7ED7B285-FAE6-4B34-ACC5-87399F27C8BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
657+
{7ED7B285-FAE6-4B34-ACC5-87399F27C8BC}.Release|Any CPU.Build.0 = Release|Any CPU
658+
{7ED7B285-FAE6-4B34-ACC5-87399F27C8BC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
659+
{7ED7B285-FAE6-4B34-ACC5-87399F27C8BC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
660+
{7ED7B285-FAE6-4B34-ACC5-87399F27C8BC}.Release|x86.ActiveCfg = Release|Any CPU
661+
{7ED7B285-FAE6-4B34-ACC5-87399F27C8BC}.Release|x86.Build.0 = Release|Any CPU
648662
EndGlobalSection
649663
GlobalSection(SolutionProperties) = preSolution
650664
HideSolutionNode = FALSE
@@ -681,6 +695,7 @@ Global
681695
{D3710390-CD0E-4E14-8E4F-80302D797D5E} = {F49789F2-97F3-45B3-BC85-F4E09C0D120D}
682696
{B9014791-7170-4DCD-B3F1-2B7518A85C83} = {F49789F2-97F3-45B3-BC85-F4E09C0D120D}
683697
{C4BE7A1F-9CCD-4E78-8341-741ABDA8E026} = {D75531B7-000E-432E-A168-51846256A9D1}
698+
{7ED7B285-FAE6-4B34-ACC5-87399F27C8BC} = {16553295-E70F-4596-AA78-848EEA576C4A}
684699
EndGlobalSection
685700
GlobalSection(ExtensibilityGlobals) = postSolution
686701
SolutionGuid = {50B52A67-69B1-4B19-A59C-FF058FD9EBDF}

‎assets/In-game/Large/interface.cfg

+4-4
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ transition = 2
245245

246246
[element]
247247
subject = clock
248-
position = 8, -42
248+
position = 8, -46
249249
alignment = -1, 1
250250
textcolor = 255, 255, 255, 255
251251
textsize = 3
@@ -254,7 +254,7 @@ transition = 2
254254

255255
[element]
256256
subject = speed
257-
position = 8, -58
257+
position = 8, -66
258258
alignment = -1, 1
259259
textcolor = 255, 255, 255, 255
260260
textsize = 3
@@ -263,7 +263,7 @@ transition = 2
263263

264264
[element]
265265
subject = gradient
266-
position = 8, -74
266+
position = 8, -86
267267
alignment = -1, 1
268268
textcolor = 255, 255, 255, 255
269269
textsize = 3
@@ -272,7 +272,7 @@ transition = 2
272272

273273
[element]
274274
subject = fps
275-
position = 8, -90
275+
position = 8, -106
276276
alignment = -1, 1
277277
textcolor = 255, 255, 255, 255
278278
textsize = 3

‎assets/Languages/en-US.xlf

+12
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,12 @@
324324
<trans-unit id="start_start">
325325
<source>Start</source>
326326
</trans-unit>
327+
<trans-unit id="view_log">
328+
<source>View the previous log</source>
329+
</trans-unit>
330+
<trans-unit id="log_error">
331+
<source>Unable to display the previous log.</source>
332+
</trans-unit>
327333
</group>
328334
<group id="review">
329335
<trans-unit id="title">
@@ -1594,6 +1600,12 @@
15941600
<trans-unit id="fixed_uncouple">
15951601
<source>This coupler is fixed, and cannot uncouple.</source>
15961602
</trans-unit>
1603+
<trans-unit id="couple_front">
1604+
<source>Coupled [number] of cars to the front of the train.</source>
1605+
</trans-unit>
1606+
<trans-unit id="couple_rear">
1607+
<source>Coupled [number] of cars to the rear of the train.</source>
1608+
</trans-unit>
15971609
</group>
15981610
<group id="score">
15991611
<trans-unit id="overspeed">

0 commit comments

Comments
 (0)