Commit fa0c37d1 authored by Hideki Yamane's avatar Hideki Yamane 🐈

Merge tag '1.6.0.0' into debian/sid

parents 528a34f3 1daeec81

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

# top-most EditorConfig file
root = true
# Unix-style newlines with a newline ending every file
[*]
end_of_line = crlf
insert_final_newline = true
indent_style = tab
indent_size = 4
tab_width = 4
[*.cs]
csharp_preserve_single_line_blocks = false
[*.yml]
indent_style = space
indent_size = 2
* text eol=auto
*.fs text
*.cs text
*.csproj text
*.sln text
*.config text
*.txt text
*.xml text
*.csv text
*.controls text
*.dll binary
*.exe binary
*.so binary
*.dylib binary
*.snk binary
*.bmp binary
*.dds binary
*.ico binary
*.png binary
*.jpg binary
*.wav binary
*.ogg binary
*.zip binary
*.pdf binary
*.bin binary
*.dat binary
*.tgz binary
\ No newline at end of file
### 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)
......@@ -3,18 +3,43 @@
# User specific settings
*.userprefs
*.DotSettings.user
*.user
*.suo
.vs/
# Versioning data
AssemblyInfo.cs
# Build results
[Bb]in/
[Oo]bj/
[Dd]ebug/
[Rr]elease/
bin_debug/
bin_release/
obj/
linuxbuild.*
macbuild.*
/mac/
installers/debian.deb
#Debian Build directory
installers/debian/usr/lib/*
#Gedit temporary files
*~
# Misc. Visual Studio files
*.sdf
*.opendb
*.vspx
*.diagsession
# Autogenerated assembly file
source/OpenBVE/Properties/AssemblyInfo*.cs
*.resources
source/*.xml
#InnoSetup Output Folder
[Oo]utput/
#Debian Control File- Autogenerated
installers/debian/DEBIAN/control
\ No newline at end of file
language: csharp
solution: openBVE/OpenBve.sln
os:
- linux
- osx
mono:
- latest
matrix:
include:
#Nightly builds for upload. Use lowest possible Mono version for compatibility purposes
- os: linux
dist: trusty
mono: 3.2.8
script: make publish
- os: osx
mono: latest
before_install: if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; brew tap leezer3/sshpass; brew install leezer3/sshpass/sshpass; fi;
script: make publish
#Test builds
##Use makefile##
- os: linux
dist: xenial
mono: latest
script: make all-release
- os: osx
mono: latest
before_install: if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; brew tap leezer3/sshpass; brew install leezer3/sshpass/sshpass; fi;
script: make all-release
- os: linux
dist: trusty
mono: 3.2.8
script: make all-release
##Use .sln file##
- os: linux
dist: trusty
mono: latest
solution: OpenBVE.sln
- os: linux
dist: xenial
mono: latest
solution: OpenBVE.sln
- os: osx
mono: latest
before_install: if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; brew tap leezer3/sshpass; brew install leezer3/sshpass/sshpass; fi;
solution: OpenBVE.sln
- os: linux
dist: trusty
mono: 3.2.8
solution: OpenBVE.sln
script:
- LC_ALL=C xbuild /t:Build /p:Configuration=Release openBVE/OpenBve.sln
after_success:
#Export SSH password for whichever platform we are building on
- test $TRAVIS_PULL_REQUEST == "false" && (test $TRAVIS_BRANCH == "master" || test $TRAVIS_TAG) && export SSHPASS=$DEPLOY_PASS
#Linux Build
- test $TRAVIS_PULL_REQUEST == "false" && (test $TRAVIS_BRANCH == "master" || test $TRAVIS_TAG) && mkdir build
- test $TRAVIS_PULL_REQUEST == "false" && (test $TRAVIS_BRANCH == "master" || test $TRAVIS_TAG) && test "$TRAVIS_OS_NAME" == "linux" && mv openBVE/OpenBve/bin/Release/* build
- test $TRAVIS_PULL_REQUEST == "false" && (test $TRAVIS_BRANCH == "master" || test $TRAVIS_TAG) && test "$TRAVIS_OS_NAME" == "linux" && cd build
#Nightly build
- test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_BRANCH == "master" && test "$TRAVIS_OS_NAME" == "linux" && tar -zcvf "OpenBVE-$(date '+%F').tar.gz" *
- test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_BRANCH == "master" && sshpass -e scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null "OpenBVE-$(date '+%F').tar.gz" $DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_PATH
- test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_BRANCH == "master" && test "$TRAVIS_OS_NAME" == "linux" && mv "linuxbuild.zip" "OpenBVE-$(date '+%F').zip"
- test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_BRANCH == "master" && test "$TRAVIS_OS_NAME" == "linux" && ./UploadScript.sh sshpass -e scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null "OpenBVE-$(date '+%F').zip" $DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_PATH
#Release build
- test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_TAG && test "$TRAVIS_OS_NAME" == "linux" && tar -zcvf "openBVE-$TRAVIS_TAG.tar.gz" *
- test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_TAG && sshpass -e scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null "openBVE-$TRAVIS_TAG.tar.gz" $DEPLOY_USER@$DEPLOY_HOST:$RELEASE_PATH
#OSX Build
#Install sshpass (Possibly we need to create a local brew script, but not at the minute...)
- test $TRAVIS_PULL_REQUEST == "false" && (test $TRAVIS_BRANCH == "master" || test $TRAVIS_TAG) && test "$TRAVIS_OS_NAME" == "osx" && brew install hudochenkov/sshpass/sshpass
- test $TRAVIS_PULL_REQUEST == "false" && (test $TRAVIS_BRANCH == "master" || test $TRAVIS_TAG) && test "$TRAVIS_OS_NAME" == "osx" && mkdir Mac
- test $TRAVIS_PULL_REQUEST == "false" && (test $TRAVIS_BRANCH == "master" || test $TRAVIS_TAG) && test "$TRAVIS_OS_NAME" == "osx" && tar -C Mac -xvzf Dependencies/MacBundle.tgz
- test $TRAVIS_PULL_REQUEST == "false" && (test $TRAVIS_BRANCH == "master" || test $TRAVIS_TAG) && test "$TRAVIS_OS_NAME" == "osx" && mv openBVE/OpenBve/bin/Release/* Mac/OpenBVE.app/Contents/Resources/
- test $TRAVIS_PULL_REQUEST == "false" && (test $TRAVIS_BRANCH == "master" || test $TRAVIS_TAG) && test "$TRAVIS_OS_NAME" == "osx" && cd Mac
- test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_TAG && test "$TRAVIS_OS_NAME" == "linux" && mv "linuxbuild.zip" "openBVE-$TRAVIS_TAG.zip"
- test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_TAG && test "$TRAVIS_OS_NAME" == "linux" && ./UploadScript.sh sshpass -e scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null "openBVE-$TRAVIS_TAG.zip" $DEPLOY_USER@$DEPLOY_HOST:$RELEASE_PATH
#Create deb and push that too on releases
- test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_TAG && test "$TRAVIS_OS_NAME" == "linux" && make debian
- test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_TAG && test "$TRAVIS_OS_NAME" == "linux" && mv "installers/debian.deb" "openBVE-$TRAVIS_TAG.deb"
- test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_TAG && test "$TRAVIS_OS_NAME" == "linux" && ./UploadScript.sh sshpass -e scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null "openBVE-$TRAVIS_TAG.deb" $DEPLOY_USER@$DEPLOY_HOST:$RELEASE_PATH
##OSX Builds##
#Nightly build
- test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_BRANCH == "master" && test "$TRAVIS_OS_NAME" == "osx" && hdiutil create OpenBVE-$(date '+%F').dmg -volname "OpenBVE" -fs HFS+ -srcfolder "OpenBVE.app"
- test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_BRANCH == "master" && test "$TRAVIS_OS_NAME" == "osx" && sshpass -e scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null "OpenBVE-$(date '+%F').dmg" $DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_PATH
- test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_BRANCH == "master" && test "$TRAVIS_OS_NAME" == "osx" && mv "macbuild.dmg" "OpenBVE-$(date '+%F').dmg"
- test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_BRANCH == "master" && test "$TRAVIS_OS_NAME" == "osx" && ./UploadScript.sh sshpass -e scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null "OpenBVE-$(date '+%F').dmg" $DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_PATH
#Release build
- test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_TAG && test "$TRAVIS_OS_NAME" == "osx" && hdiutil create openBVE-$($TRAVIS_TAG).dmg -volname "openBVE" -fs HFS+ -srcfolder "OpenBVE.app"
- test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_TAG && test "$TRAVIS_OS_NAME" == "osx" && sshpass -e scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null "openBVE-$($TRAVIS_TAG).dmg" $DEPLOY_USER@$DEPLOY_HOST:$RELEASE_PATH
- test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_TAG && test "$TRAVIS_OS_NAME" == "osx" && mv "macbuild.dmg" "openBVE-$TRAVIS_TAG.dmg"
- test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_TAG && test "$TRAVIS_OS_NAME" == "osx" && ./UploadScript.sh sshpass -e scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null "openBVE-$TRAVIS_TAG.dmg" $DEPLOY_USER@$DEPLOY_HOST:$RELEASE_PATH
addons:
apt:
packages:
- sshpass
- p7zip-full
- fakeroot
env:
global:
- secure: "NquGr/vI8CyhAV5itzUxV5gXCtWFn3kqOnAeEz5Niw4fJfrBH5G/TBGyQpyzkpeY+Tox8z8m+a/UdSYutVxI9OYbAuFH8vo75pL3oydFtNOnuO45v4BFaz9KLGB0AEAvNzX7YTUM7qEE4QlX2/jzPXSoJqxC9RWMdENxwjzCvE0CLhBPQvqCSxB6nJ86rRM7xpLkT34t+C66XjdHSLKDcu94dC50o8MxnIchgWAfEV4+d9kv6XZV+rZvz75e8qYzCJKU6wl3GPMpL8JajG3TIkHAiNWPlcH8WbCqd62znZYtFUMvVkFDKOAjnq1sMqMYfFiu3x+AJPYF52Se2g5qDrkOCZhKL2MSofEugvSjlNekkfQzg/SqHJXlToZvvWQWvuZaTcjYwoiFg+O0eFgvN1bjX2Z7Y9Pb85o+DgKn0WFkBkCohbygFw1Iir1tT5+3bnt3uAZWPKH8k7r5+Tbm2KxJ3O0/ietbMW97S9EaU24Gwh6YbPRVskEgp3ym/2It0sgMfEb64GnhbvGG6lPk3uU6AEmmxHsBgxv+E2ZdRVOqEsWVeBs8IDmVwXeG8T1FCL+GtV5hTwmIMH+z+OTuAHEzKR81DohF+z3vXzYOLxzSCx9IBKkTfIiVKpuFl6+l17olIgaGwomN23b6p0Eky0ZRrWupjkoetIJF6A9Ux8M="
......@@ -47,4 +78,4 @@ env:
- secure: "A/0AimkzkRNbOW8OjymGx6gR5tbGDvSz3An1Wwco5nqSrDaZebG0viFtYcLX1RmZ9aqS4Hr8v9ksi1Chu1nE9Swp/VQeMgDRUTi4jEzytJpUvIpHJWFJ/Pn7XoXHanLHqDaj2A8oEZSx8doFvTIN8a9ousP/xJYp9a9xo33ulBkTVftalgyCvhYfz+a9BeDVlgL9/IBNfAT3fY+c+P8l/AjgWF6oN0rYAiDQHsxx8kQQxboZihAYTbkSonxbF5BgoLjKpAmPOkMT3oWat5GXKH/6yHfk+JIBaATSQqUik8VNqoyO7rIGz68Jodhs5PDHfENrZ17FIt0/lpjE6l/3oHwzs/RhgyD64x2bEf/KeVqJ7+R0kvgTVdg2pjpb4AHc8SGk1ARoDWvCdRPcM+Sii9iavJQtCuTDir24DNzknHxvnqlR8vUsYFBOhfcMTL1y/2tNJY9NiH39bkJsGLz8NqAipC+IoR7Jm4WhEgemAfnpicrOjZVAUL6sGwHIg99MSKAMpliXvqE/EAlY0aWYnx2W6HuFy3g2cCJ16JJABJFDK/H6a1V485naI9DT4/nHXJjuweN0ijm9jBpDMpIJ9E3uyDXBkjWGkxmIE9HPYdiJIdGqxQ5SzaN8XmRLRo6AQnsDX243TurWld7hXcyktVFXxsHUmAMpN0tR3EJcJQM="
- secure: "xhY40lPWCokuabAfN7t2gd4DTrNXpxvKiH6Xobo5XkAiDNseBw+MZ/ce4XZeAXnq9jHdeTXVMu1rtcdFlC5St2XCeltNpchS4Km8dv+7ErtTBAawgl+5rGwTTnIF5jUTPsbzfEcIgnL6ud7NWDEqYQm5oeEMpuS3z/gqSc/HKx3Fp5cIPte65Oo37oMuL0dwNh2XIwrogaSOHX+Jwh7B5ZkCMzAe/MOxg0b34A4noAtCHbtc2QmmDhOhdlk+OBx5iSIwqUvmW8YYUX+14mIFAqWQ6E7MOUY9gjDgedXnbfvPsw+gLeXyCoNunc980EMdrIF2KHaPa772TFi7MzOiPwXno2jxlK3INvGylYdymI4YwI97H53oasfT1RiOzG9j1zCqJZv3U1L5KdscX8LKPYXsOeP78okB5lXt2E2jiO7hVJMIhQtJrNiCmlok3/U65jD30WLBsZtIBzZ4RhpESYr2a5QayhFmbHmIeMbfhY6OkRiE/enCMYuCFlnV6twWA4J6gBUVilYj+qjR6Js2xRAtaY0ljnPhK0EE2RIjPOKks3CPlchP3ZbI9jFCaupBfLlT0uBfmMu0aD/q/AZ0wDf1Dp1OdRzGbBcvhDcijpmZ8GatLyZS64Iq27WqUC6XouI17SIj0XftnBkcKTbSXY9UbSXM2bPYuHLIGk61aXU="
notifications:
email: false
\ No newline at end of file
email: false
#include "stdafx.h"
// --- main ---
BOOL APIENTRY DllMain(HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) {
return TRUE;
}
// --- structures ---
struct ATS_VEHICLESPEC {
int BrakeNotches;
int PowerNotches;
int AtsNotch;
int B67Notch;
int Cars;
};
struct ATS_VEHICLESTATE {
double Location;
float Speed;
int Time;
float BcPressure;
float MrPressure;
float ErPressure;
float BpPressure;
float SapPressure;
float Current;
};
struct ATS_BEACONDATA {
int Type;
int Signal;
float Distance;
int Optional;
};
struct ATS_HANDLES {
int Brake;
int Power;
int Reverser;
int ConstantSpeed;