Merge branch 'master' into release

.gitignore

@@ -42,4 +42,14 @@ source/*.xml
 [Oo]utput/
 
 #Debian Control File- Autogenerated
-installers/debian/DEBIAN/control
+installers/debian/DEBIAN/control
+
+#Debian build stuff
+debian/openbve/*
+debian/*.log
+debian/*.substvars
+debian/*.debhelper
+debian/debhelper-build-stamp
+
+# NuGet Packages
+**/[Pp]ackages/*

.travis.yml

@@ -5,7 +5,7 @@ matrix:
 #Nightly builds for upload. Use lowest possible Mono version for compatibility purposes
     - os: linux
       dist: trusty
-      mono: 3.2.8
+      mono: 5.20.1
       script: make publish
     - os: osx
       mono: latest
@@ -24,7 +24,7 @@ matrix:
       script: make all-release
     - os: linux
       dist: trusty
-      mono: 3.2.8
+      mono: 5.20.1
       script: make all-release
 ##Use .sln file##
     - os: linux
@@ -41,7 +41,7 @@ matrix:
       solution: OpenBVE.sln
     - os: linux
       dist: trusty
-      mono: 3.2.8
+      mono: 5.20.1
       solution: OpenBVE.sln
 
 after_success:

Contributing.md

@@ -11,7 +11,7 @@ This file is a work in progress, and is intended to serve as a general set of gu
 
 #### Code Licencing
 
-The basic licence for openBVE Public Domain.
+The basic licence for openBVE is Public Domain.
 Please only contribute code which is licenced under either Public Domain, or loose permissive licences (e.g. BSD-2 and compatible)
 
 ### Backwards Compatibility
@@ -34,3 +34,4 @@ Please only contribute code which is licenced under either Public Domain, or loo
 - Maurizo M. Gavioli
 - Connor Fitzgerald
 - Marc Riera
+- s520

DebianControl.sh

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

Readme.md

@@ -29,7 +29,7 @@ These are described fully [here](http://openbve-project.net/packages/).
 
 ### Notes
 
-This build has been tested to compile correctly using VS2013 and MonoDevelop, but should also compile with SharpDevelop.
+This build has been tested to compile correctly using VS2013 onwards and MonoDevelop, but should also compile with SharpDevelop.
 
 Joystick hat support does not function correctly in the current release build of OpenTK (1.1.4). Please compile OpenTK yourself from the most recent source if you wish to use this feature.
 
@@ -42,7 +42,7 @@ Please see the [Contributors File](Contributing.md) for a list of contributors,
 
 **Project Website**:
 
-http://www.openbve-project.net
+https://openbve-project.net
 
 Project Source Code on GitHub: https://github.com/leezer3/OpenBVE
 
@@ -59,6 +59,7 @@ http://bveworldwide.forumotion.com/f14-the-sim-in-time-general-discussion
 ### License
 
 Michelle intended for this program to be placed in the public domain. This means that you can make any modifications to it you like and share your modifications with others.
+Please also see the following issue for further discussion on the topic: https://github.com/leezer3/OpenBVE/issues/305
 
 **Third-Pary Libraries**
 

UploadScript.sh

@@ -8,6 +8,22 @@ declare -r max=4
 declare i=0
 
 function wrap() {
+  echo "Checking whether this build should be uploaded..."
+  mono_version=$(mono --version | awk '/version/ { print $5 }')
+  if [ "$TRAVIS_OS_NAME" = "linux" ] ;
+    then
+	echo "Linux worker"
+	split_version=(`echo $mono_version | tr '.' ' '`)
+	if [ ${split_version[0]} != "5" ] || [ ${split_version[1]} != "20" ] ;
+		then
+		echo "Wrong Mono version- Not uploading this build"
+		exit
+	else
+		echo "Mono version OK- Uploading build"
+	fi
+	else
+	echo "Mac worker- Uploading this build"
+  fi
   local cmd=$1 ; shift
   retry $cmd "$@"
   local success=$?

appveyor.yml

@@ -1,9 +1,8 @@
 version: '1.5.3.2-{build}'
 
 image: 
+  - Visual Studio 2019
   - Visual Studio 2017
-  - Visual Studio 2015
-  - Visual Studio 2013
 
 skip_commits:
   message: /\[ci skip\]/
@@ -23,6 +22,7 @@ install:
 
 before_build:
   - cmd: cd C:\projects\OpenBVE
+  - cmd: nuget restore OpenBVE.sln
 
 build:
   project: C:\projects\OpenBVE\OpenBVE.sln

assets/Compatibility/UchiboBase.xml

@@ -308,5 +308,10 @@
 		<Path>Sound\crossing.wav</Path>
 		<Message></Message>
 	</Sound>
+	<Sound>
+		<Name>uchibo\crossing.wav</Name>
+		<Path>Sound\crossing.wav</Path>
+		<Message></Message>
+	</Sound>
   </Compatibility>
 </openBVE>

assets/Languages/_Editing Languages.md

@@ -0,0 +1,8 @@
+## Editing Language Files
+As of openBVE v1.7.0 the language data files are stored in XLF (XML Localization Interchange File Format) format.
+<https://en.wikipedia.org/wiki/XLIFF>
+
+This is intended to allow for easier editing, as well as support for translations in the viewers etc.
+
+Whilst XLF files may still be edited manually, we suggest using an XLF GUI editor such as POEdit:
+<https://en.wikipedia.org/wiki/XLIFF>