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

Merge branch 'enhanced_viewport_overlay-sx' into jgrpp

Browse Source 
town_gui.cpp updated due to struct CommandContainer change.

Conflicts:
	src/command.cpp
	src/command_type.h
	src/gfxinit.cpp
	src/openttd.cpp
	src/pbs.cpp
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/saveload/saveload.cpp
	src/stdafx.h
	src/train_cmd.cpp
	src/viewport_type.h
	src/window_type.h
This commit is contained in:
Jonathan G Rennison
2015-08-05 21:54:11 +01:00
parent 20e2f363f1 44d3c84a11
commit 7ed93f9211
110 changed files with 3527 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
projects/openttd_vs80.vcproj
View File

@@ -702,6 +702,10 @@
RelativePath=".\..\src\pbs.cpp"
>
</File>
<File
RelativePath=".\..\src\plans.cpp"
>
</File>
<File
RelativePath=".\..\src\progress.cpp"
>
@@ -1526,6 +1530,18 @@
RelativePath=".\..\src\pbs.h"
>
</File>
<File
RelativePath=".\..\src\plans_base.h"
>
</File>
<File
RelativePath=".\..\src\plans_func.h"
>
</File>
<File
RelativePath=".\..\src\plans_type.h"
>
</File>
<File
RelativePath=".\..\src\progress.h"
>
@@ -1650,6 +1666,10 @@
RelativePath=".\..\src\slope_type.h"
>
</File>
<File
RelativePath=".\..\src\smallmap_colours.h"
>
</File>
<File
RelativePath=".\..\src\smallmap_gui.h"
>
@@ -2210,6 +2230,10 @@
RelativePath=".\..\src\osk_gui.cpp"
>
</File>
<File
RelativePath=".\..\src\plans_gui.cpp"
>
</File>
<File
RelativePath=".\..\src\rail_gui.cpp"
>
@@ -2462,6 +2486,10 @@
RelativePath=".\..\src\widgets\osk_widget.h"
>
</File>
<File
RelativePath=".\..\src\widgets\plans_widget.h"
>
</File>
<File
RelativePath=".\..\src\widgets\rail_widget.h"
>
@@ -2578,6 +2606,10 @@
RelativePath=".\..\src\order_cmd.cpp"
>
</File>
<File
RelativePath=".\..\src\plans_cmd.cpp"
>
</File>
<File
RelativePath=".\..\src\rail_cmd.cpp"
>
@@ -2762,6 +2794,10 @@
RelativePath=".\..\src\saveload\order_sl.cpp"
>
</File>
<File
RelativePath=".\..\src\saveload\plans_sl.cpp"
>
</File>
<File
RelativePath=".\..\src\saveload\saveload.cpp"
>
@@ -2874,6 +2910,10 @@
RelativePath=".\..\src\table\control_codes.h"
>
</File>
<File
RelativePath=".\..\src\table\darklight_colours.h"
>
</File>
<File
RelativePath=".\..\src\table\elrail_data.h"
>