Merge branch 'master' into release

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,26 @@
+### Description
+
+Please describe the issue you are experiencing.
+
+### Reproduction
+
+If the issue occurs in multiple routes/ trains, please provide one or two samples.
+In order to reproduce the issue and debug it, it's helpful to have the following:
+
+## Route
+
+Please provide a link to where the route may be downloaded.
+
+## Train
+
+Please provide a link to the train may be downloaded.
+
+## Logs
+
+Logs may be accessed through the 'Report Problem' button on the bottom left of the screen.
+Please provide a log, and a crash-log if the game actually crashes.
+
+### Related information 
+
+* Operating system
+* Method of control (Keyboard, joystick, RailDriver)

assets/Compatibility/PreTrain/train.dat

@@ -5,4 +5,8 @@
 1
 0
 1
-1
+1
+#HANDLE
+0
+8
+8

assets/In-game/Large/interface.cfg

@@ -0,0 +1,303 @@
+; --------
+; messages
+; --------
+
+[element]
+subject = messages
+position = 8, 18
+alignment = -1, -1
+textcolor = 0, 0, 0, 255
+textsize = 4 ;0
+textshadow = 1 ;0
+transition = 3 ;2
+transitionvector = 0, -40
+value = 0, 20
+
+
+; -----
+; score
+; -----
+
+[element]
+subject = scoremessages
+position = 0, 80
+alignment = 0, -1
+textcolor = 0, 0, 0, 255
+textposition = 2, -1
+textalignment = -1, 0
+textsize = 4
+textshadow = 1
+transition = 3
+transitionvector = 0, -96
+value = 0, 20
+
+[element]
+subject = score
+position = 0, -1
+alignment = 0, -1
+centermiddle = indicator_top_back.png, indicator_top_overlay.png
+backcolor = 0, 0, 0, 144
+overlaycolor = 255, 255, 255, 64
+textcolor = 255, 255, 255, 192
+textposition = 0, -1
+textalignment = 0, 0
+textsize = 3
+textshadow = 1
+
+
+; -------
+; handles
+; -------
+
+[element]
+subject = reverser
+position = -8, 1
+alignment = -1, 1
+centermiddle = handle_back.png, handle_overlay.png
+backcolor = 0, 0, 0, 144
+overlaycolor = 255, 255, 255, 64
+textcolor = 255, 255, 255, 192
+textposition = 24, 2
+textalignment = -1, 0
+textsize = 2
+textshadow = 0
+
+[element]
+subject = power
+position = 74, 1
+alignment = -1, 1
+centermiddle = handle_back.png, handle_overlay.png
+backcolor = 0, 0, 0, 144
+overlaycolor = 255, 255, 255, 64
+textcolor = 255, 255, 255, 192
+textposition = 23, 2
+textalignment = -1, 0
+textsize = 2
+textshadow = 0
+
+[element]
+subject = brake
+position = 156, 1
+alignment = -1, 1
+centermiddle = handle_back.png, handle_overlay.png
+backcolor = 0, 0, 0, 144
+overlaycolor = 255, 255, 255, 64
+textcolor = 255, 255, 255, 192
+textposition = 23, 2
+textalignment = -1, 0
+textsize = 2
+textshadow = 0
+
+[element]
+subject = locobrake
+position = 238, 1
+alignment = -1, 1
+centermiddle = handle_back.png, handle_overlay.png
+backcolor = 0, 0, 0, 144
+overlaycolor = 255, 255, 255, 64
+textcolor = 255, 255, 255, 192
+textposition = 23, 2
+textalignment = -1, 0
+textsize = 2
+textshadow = 0
+
+[element]
+subject = single
+position = 74, 1
+alignment = -1, 1
+centermiddle = handle_back.png, handle_overlay.png
+backcolor = 0, 0, 0, 144
+overlaycolor = 255, 255, 255, 64
+textcolor = 255, 255, 255, 192
+textposition = 23, 2
+textalignment = -1, 0
+textsize = 2
+textshadow = 0
+
+
+; ---------------
+; door indicators
+; ---------------
+
+[element]
+subject = doorsleft
+position = -32, 0
+alignment = 0, 1
+centermiddle = doors_left_back.png, doors_left_overlay.png
+backcolor = 0, 0, 0, 144
+overlaycolor = 255, 255, 255, 64
+textcolor = 255, 255, 255, 192
+textposition = -18, -1
+textalignment = 1, 0
+textsize = 2
+textshadow = 0
+transition = 1
+transitionvector = 0, 31
+
+[element]
+subject = doorsright
+position = 32, 0
+alignment = 0, 1
+centermiddle = doors_right_back.png, doors_right_overlay.png
+backcolor = 0, 0, 0, 144
+overlaycolor = 255, 255, 255, 64
+textcolor = 255, 255, 255, 192
+textposition = 17, -1
+textalignment = -1, 0
+textsize = 2
+textshadow = 0
+transition = 1
+transitionvector = 0, 31
+
+; ---------------
+; stop indicators
+; ---------------
+
+[element]
+subject = stopleft
+position = 4, -64
+alignment = -1, 0
+centermiddle = ..\Default\stop_back.png, NULL
+backcolor = 255, 255, 255, 255
+transition = 1
+transitionvector = -40, 0
+
+[element]
+subject = stoplefttick
+position = 4, -64
+alignment = -1, 0
+centermiddle = ..\Default\stop_tick.png, NULL
+backcolor = 255, 255, 255, 255
+transition = 1
+transitionvector = -40, 0
+value = 128 ; vertical radius
+
+[element]
+subject = stopright
+position = -4, -64
+alignment = 1, 0
+centermiddle = ..\Default\stop_back.png, NULL
+backcolor = 255, 255, 255, 255
+transition = 1
+transitionvector = 40, 0
+
+[element]
+subject = stoprighttick
+position = -4, -64
+alignment = 1, 0
+centermiddle = ..\Default\stop_tick.png, NULL
+backcolor = 255, 255, 255, 255
+transition = 1
+transitionvector = 40, 0
+value = 128 ; vertical radius
+
+[element]
+subject = stopnone
+position = 4, -64
+alignment = -1, 0
+centermiddle = ..\Default\stop_back_none.png, NULL
+backcolor = 255, 255, 255, 255
+transition = 1
+transitionvector = -40, 0
+
+[element]
+subject = stopnonetick
+position = 4, -64
+alignment = -1, 0
+centermiddle = ..\Default\stop_tick.png, NULL
+backcolor = 255, 255, 255, 255
+transition = 1
+transitionvector = -40, 0
+value = 128 ; vertical radius
+
+[element]
+subject = stopnone
+position = -4, -64
+alignment = 1, 0
+centermiddle = ..\Default\stop_back_none.png, NULL
+backcolor = 255, 255, 255, 255
+transition = 1
+transitionvector = 40, 0
+
+[element]
+subject = stopnonetick
+position = -4, -64
+alignment = 1, 0
+centermiddle = ..\Default\stop_tick.png, NULL
+backcolor = 255, 255, 255, 255
+transition = 1
+transitionvector = 40, 0
+value = 128 ; vertical radius
+
+
+; ----------------
+; other indicators
+; ----------------
+
+[element]
+subject = ai
+position = 8, -26
+alignment = -1, 1
+textcolor = 255, 255, 255, 255
+textsize = 3
+textshadow = 1
+transition = 2
+
+[element]
+subject = clock
+position = 8, -42
+alignment = -1, 1
+textcolor = 255, 255, 255, 255
+textsize = 3
+textshadow = 1
+transition = 2
+
+[element]
+subject = speed
+position = 8, -58
+alignment = -1, 1
+textcolor = 255, 255, 255, 255
+textsize = 3
+textshadow = 1
+transition = 2
+
+[element]
+subject = gradient
+position = 8, -74
+alignment = -1, 1
+textcolor = 255, 255, 255, 255
+textsize = 3
+textshadow = 1
+transition = 2
+
+[element]
+subject = fps
+position = 8, -90
+alignment = -1, 1
+textcolor = 255, 255, 255, 255
+textsize = 3
+textshadow = 1
+transition = 2
+
+; -------------
+; ats/atc lamps
+; -------------
+
+[element]
+subject = ats
+position = 0, 1
+alignment = 1, 1
+topleft = ..\Default\ats_top_left_back.png, ..\Default\ats_top_left_overlay.png
+topmiddle = ..\Default\ats_top_middle_back.png, ..\Default\ats_top_middle_overlay.png
+centerleft = ..\Default\ats_center_left_back.png, ..\Default\ats_center_left_overlay.png
+centermiddle = ..\Default\ats_center_middle_back.png, ..\Default\ats_center_middle_overlay.png
+bottomleft = ..\Default\ats_center_left_back.png, ..\Default\ats_center_left_overlay.png
+bottommiddle = ..\Default\ats_center_middle_back.png, ..\Default\ats_center_middle_overlay.png
+backcolor = 0, 0, 0, 144
+overlaycolor = 255, 255, 255, 64
+textcolor = 255, 255, 255, 192
+textposition = -8, -1
+textalignment = 1, 0
+textsize = 0
+textshadow = 0
+value = 0, 15

assets/Languages/ca-ES.cfg

@@ -1,5 +1,5 @@
 ; openBVE interface language configuration file
-; last updated: 2018-06-12
+; last updated: 2018-08-20
 ; by Marc Riera Irigoyen
 
 [program]
@@ -291,6 +291,11 @@ assignment_invalid = Sense assignar
 assignment_separator = ,\x20
 
 [raildriver]
+speedunits = Unitat de velocitat de la pantalla LED
+milesperhour = Milles per hora (mph)
+kilometersperhour = Quilòmetres per hora (km/h)
+setcalibration = Estableix el calibratge:
+launch = Comença
 notdetected = No s'ha detectat cap dispositiu RailDriver.
 config_error = S'ha produït un error en carregar el fitxer de calibratge de RailDriver.
 calibration_start = Seleccioneu "Següent" per començar el calibratge.
@@ -390,6 +395,12 @@ page_next = Pàgina següent...
 kiosk_mode = Mode quiosc
 kiosk_mode_enable = Activa el mode quiosc
 kiosk_mode_timer = Temps d'espera de control (segons)
+hud_size = Mida de la interfície
+hud_size_small = Petita
+hud_size_normal = Normal
+hud_size_large = Gran
+transparencyfix = Intenta corregir els errors de transparència en continguts antics.
+hacks_enable = Activa les modificacions per a continguts antics amb errors.
 
 [dialog]
 csvfiles = Fitxers CSV

assets/Languages/cs-CZ.cfg

@@ -287,6 +287,11 @@ assignment_invalid = Nepřiřazeno
 assignment_separator = ,\x20
 
 [raildriver]
+speedunits = LED Display speed units
+milesperhour = Miles per Hour (MPH)
+kilometersperhour = Kilometers per Hour (KPH)
+setcalibration = Set Calibration:
+launch = Launch
 notdetected = No RailDriver conrollers detected.
 config_error = Error loading RailDriver calibration file.
 calibration_start = Please press 'Next' to start calibration.
@@ -386,6 +391,12 @@ page_next = Next Page...
 kiosk_mode = Kiosk Mode
 kiosk_mode_enable = Enable Kiosk Mode
 kiosk_mode_timer = Control Timeout (s)
+hud_size = HUD Size
+hud_size_small = Small
+hud_size_normal = Normal
+hud_size_large = Large
+transparencyfix = Attempt to fix transparency issues in older content.
+hacks_enable = Enable hacks for buggy older content.
 
 [dialog]
 csvfiles = CSV soubory