Merge branch 'master' into jgrpp

# Conflicts:
#	.gitignore
#	src/network/network_server.cpp
#	src/vehicle_gui.cpp
This commit is contained in:
Jonathan G Rennison
2020-07-12 12:26:17 +01:00
38 changed files with 66 additions and 120 deletions

50
.gitignore vendored
View File

@@ -1,50 +1,8 @@
bin/*
!bin/ai
bin/ai/*
!bin/ai/compat*.nut
!bin/ai/regression
!bin/data
bin/baseset/*
!bin/baseset/openttd.grf
!bin/baseset/opntitle.dat
!bin/baseset/orig_extra.grf
!bin/baseset/orig_*.obg
!bin/baseset/orig_*.obs
!bin/baseset/no_sound.obs
!bin/baseset/no_music.obm
!bin/baseset/orig_*.obm
!bin/game
bin/game/*
!bin/game/compat*.nut
!bin/scripts
bin/scripts/*
!bin/scripts/*.example
!bin/scripts/readme.txt
bundle/*
bundles/*
/.vs
/build*/
CMakeSettings.json
docs/aidocs/*
docs/gamedocs/*
docs/source/*
media/openttd.desktop
media/openttd.desktop.install
projects/.vs
projects/Debug
projects/Release
projects/*.ncb
projects/*.suo
projects/*.sdf
projects/*.opensdf
projects/*.vcproj.*.user
projects/*.vcxproj.user
projects/*.VC.db
projects/*.VC.opendb
/Makefile*
!/Makefile.msvc
/config.*
!/config.lib
!*.in
/out
*.tmp
build*/