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

30
projects/openttd_vs100.vcxproj.filters
View File

@@ -300,6 +300,9 @@
<ClCompile Include="..\src\pbs.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\plans.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\progress.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -906,6 +909,15 @@
<ClInclude Include="..\src\pbs.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\plans_base.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\plans_func.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\plans_type.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\progress.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -999,6 +1011,9 @@
<ClInclude Include="..\src\slope_type.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\smallmap_colours.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\smallmap_gui.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -1410,6 +1425,9 @@
<ClCompile Include="..\src\osk_gui.cpp">
<Filter>GUI Source Code</Filter>
</ClCompile>
<ClCompile Include="..\src\plans_gui.cpp">
<Filter>GUI Source Code</Filter>
</ClCompile>
<ClCompile Include="..\src\rail_gui.cpp">
<Filter>GUI Source Code</Filter>
</ClCompile>
@@ -1596,6 +1614,9 @@
<ClInclude Include="..\src\widgets\osk_widget.h">
<Filter>Widgets</Filter>
</ClInclude>
<ClInclude Include="..\src\widgets\plans_widget.h">
<Filter>Widgets</Filter>
</ClInclude>
<ClInclude Include="..\src\widgets\rail_widget.h">
<Filter>Widgets</Filter>
</ClInclude>
@@ -1680,6 +1701,9 @@
<ClCompile Include="..\src\order_cmd.cpp">
<Filter>Command handlers</Filter>
</ClCompile>
<ClCompile Include="..\src\plans_cmd.cpp">
<Filter>Command handlers</Filter>
</ClCompile>
<ClCompile Include="..\src\rail_cmd.cpp">
<Filter>Command handlers</Filter>
</ClCompile>
@@ -1815,6 +1839,9 @@
<ClCompile Include="..\src\saveload\order_sl.cpp">
<Filter>Save/Load handlers</Filter>
</ClCompile>
<ClCompile Include="..\src\saveload\plans_sl.cpp">
<Filter>Save/Load handlers</Filter>
</ClCompile>
<ClCompile Include="..\src\saveload\saveload.cpp">
<Filter>Save/Load handlers</Filter>
</ClCompile>
@@ -1896,6 +1923,9 @@
<ClInclude Include="..\src\table\control_codes.h">
<Filter>Tables</Filter>
</ClInclude>
<ClInclude Include="..\src\table\darklight_colours.h">
<Filter>Tables</Filter>
</ClInclude>
<ClInclude Include="..\src\table\elrail_data.h">
<Filter>Tables</Filter>
</ClInclude>