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

Merge branch 'master' into jgrpp-nrt

Browse Source 
Merge trunk multiple docks implementation

# Conflicts:
#	docs/landscape_grid.html
#	src/order_cmd.cpp
#	src/pathfinder/npf/npf.cpp
#	src/pathfinder/yapf/yapf_ship.cpp
#	src/rail_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/oldloader_sl.cpp
#	src/saveload/station_sl.cpp
#	src/script/api/script_order.cpp
#	src/ship_cmd.cpp
#	src/station.cpp
#	src/station_base.h
#	src/station_cmd.cpp
#	src/tunnelbridge_cmd.cpp
This commit is contained in:
Jonathan G Rennison
2019-07-13 20:34:52 +01:00
parent a200fcf4e9 a52bbb72a8
commit d3e0c3787f
50 changed files with 783 additions and 543 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
projects/openttd_vs140.vcxproj.filters
View File

@@ -198,9 +198,6 @@
<ClCompile Include="..\src\disaster_vehicle.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\dock.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\driver.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -609,9 +606,6 @@
<ClInclude Include="..\src\music\dmusic.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\dock_base.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\driver.h">
<Filter>Header Files</Filter>
</ClInclude>