dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'template_train_replacement' into template_train_replacement-sx

Browse Source 
# Conflicts:
#	projects/openttd_vs100.vcxproj
#	projects/openttd_vs100.vcxproj.filters
#	projects/openttd_vs140.vcxproj
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs80.vcproj
#	projects/openttd_vs90.vcproj
#	source.list
This commit is contained in:
Jonathan G Rennison
2016-02-14 17:40:39 +00:00
parent a1d6c3ad64 de7f1c1168
commit 671c12999e
46 changed files with 4903 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source.list
View File

@@ -1,4 +1,15 @@
# Source Files
tbtr_template_gui_main.cpp
tbtr_template_gui_create.cpp
tbtr_template_gui_create_virtualtrain.cpp
tbtr_template_vehicle.cpp
tbtr_template_vehicle_func.cpp
tbtr_template_gui_main.h
tbtr_template_gui_create.h
tbtr_template_gui_create_virtualtrain.h
tbtr_template_vehicle.h
tbtr_template_vehicle_func.h
airport.cpp
animated_tile.cpp
articulated_vehicles.cpp
@@ -635,6 +646,8 @@ saveload/vehicle_sl.cpp
saveload/waypoint_sl.cpp
saveload/extended_ver_sl.h
saveload/extended_ver_sl.cpp
saveload/tbtr_template_replacement_sl.cpp
saveload/tbtr_template_veh_sl.cpp
# Tables
table/airport_defaults.h