Import combined Enhanced viewport: zoom out, overlays & tooltips (r53_27127) patch

https://www.tt-forums.net/viewtopic.php?f=33&t=53394
This commit is contained in:
patch-import
2015-08-02 19:37:42 +01:00
committed by Jonathan G Rennison
parent fd3388467f
commit 536a95dfd0
105 changed files with 3509 additions and 325 deletions

View File

@@ -357,6 +357,7 @@
<ClCompile Include="..\src\openttd.cpp" />
<ClCompile Include="..\src\order_backup.cpp" />
<ClCompile Include="..\src\pbs.cpp" />
<ClCompile Include="..\src\plans.cpp" />
<ClCompile Include="..\src\progress.cpp" />
<ClCompile Include="..\src\rail.cpp" />
<ClCompile Include="..\src\rev.cpp" />
@@ -557,6 +558,9 @@
<ClInclude Include="..\src\order_func.h" />
<ClInclude Include="..\src\order_type.h" />
<ClInclude Include="..\src\pbs.h" />
<ClInclude Include="..\src\plans_base.h" />
<ClInclude Include="..\src\plans_func.h" />
<ClInclude Include="..\src\plans_type.h" />
<ClInclude Include="..\src\progress.h" />
<ClInclude Include="..\src\querystring_gui.h" />
<ClInclude Include="..\src\rail.h" />
@@ -587,6 +591,7 @@
<ClInclude Include="..\src\signs_type.h" />
<ClInclude Include="..\src\slope_func.h" />
<ClInclude Include="..\src\slope_type.h" />
<ClInclude Include="..\src\smallmap_colours.h" />
<ClInclude Include="..\src\smallmap_gui.h" />
<ClInclude Include="..\src\sortlist_type.h" />
<ClInclude Include="..\src\sound_func.h" />
@@ -723,6 +728,7 @@
<ClCompile Include="..\src\object_gui.cpp" />
<ClCompile Include="..\src\order_gui.cpp" />
<ClCompile Include="..\src\osk_gui.cpp" />
<ClCompile Include="..\src\plans_gui.cpp" />
<ClCompile Include="..\src\rail_gui.cpp" />
<ClCompile Include="..\src\road_gui.cpp" />
<ClCompile Include="..\src\roadveh_gui.cpp" />
@@ -784,6 +790,7 @@
<ClInclude Include="..\src\widgets\object_widget.h" />
<ClInclude Include="..\src\widgets\order_widget.h" />
<ClInclude Include="..\src\widgets\osk_widget.h" />
<ClInclude Include="..\src\widgets\plans_widget.h" />
<ClInclude Include="..\src\widgets\rail_widget.h" />
<ClInclude Include="..\src\widgets\road_widget.h" />
<ClInclude Include="..\src\widgets\settings_widget.h" />
@@ -812,6 +819,7 @@
<ClCompile Include="..\src\misc_cmd.cpp" />
<ClCompile Include="..\src\object_cmd.cpp" />
<ClCompile Include="..\src\order_cmd.cpp" />
<ClCompile Include="..\src\plans_cmd.cpp" />
<ClCompile Include="..\src\rail_cmd.cpp" />
<ClCompile Include="..\src\road_cmd.cpp" />
<ClCompile Include="..\src\roadveh_cmd.cpp" />
@@ -856,6 +864,7 @@
<ClInclude Include="..\src\saveload\oldloader.h" />
<ClCompile Include="..\src\saveload\oldloader_sl.cpp" />
<ClCompile Include="..\src\saveload\order_sl.cpp" />
<ClCompile Include="..\src\saveload\plans_sl.cpp" />
<ClCompile Include="..\src\saveload\saveload.cpp" />
<ClInclude Include="..\src\saveload\saveload.h" />
<ClInclude Include="..\src\saveload\saveload_filter.h" />
@@ -880,6 +889,7 @@
<ClInclude Include="..\src\table\cargo_const.h" />
<ClInclude Include="..\src\table\clear_land.h" />
<ClInclude Include="..\src\table\control_codes.h" />
<ClInclude Include="..\src\table\darklight_colours.h" />
<ClInclude Include="..\src\table\elrail_data.h" />
<ClInclude Include="..\src\table\engines.h" />
<ClInclude Include="..\src\table\genland.h" />

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>
@@ -900,6 +903,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>
@@ -990,6 +1002,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>
@@ -1398,6 +1413,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>
@@ -1581,6 +1599,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>
@@ -1665,6 +1686,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>
@@ -1797,6 +1821,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>
@@ -1869,6 +1896,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>

View File

@@ -698,6 +698,10 @@
RelativePath=".\..\src\pbs.cpp"
>
</File>
<File
RelativePath=".\..\src\plans.cpp"
>
</File>
<File
RelativePath=".\..\src\progress.cpp"
>
@@ -1502,6 +1506,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"
>
@@ -1622,6 +1638,10 @@
RelativePath=".\..\src\slope_type.h"
>
</File>
<File
RelativePath=".\..\src\smallmap_colours.h"
>
</File>
<File
RelativePath=".\..\src\smallmap_gui.h"
>
@@ -2174,6 +2194,10 @@
RelativePath=".\..\src\osk_gui.cpp"
>
</File>
<File
RelativePath=".\..\src\plans_gui.cpp"
>
</File>
<File
RelativePath=".\..\src\rail_gui.cpp"
>
@@ -2422,6 +2446,10 @@
RelativePath=".\..\src\widgets\osk_widget.h"
>
</File>
<File
RelativePath=".\..\src\widgets\plans_widget.h"
>
</File>
<File
RelativePath=".\..\src\widgets\rail_widget.h"
>
@@ -2538,6 +2566,10 @@
RelativePath=".\..\src\order_cmd.cpp"
>
</File>
<File
RelativePath=".\..\src\plans_cmd.cpp"
>
</File>
<File
RelativePath=".\..\src\rail_cmd.cpp"
>
@@ -2718,6 +2750,10 @@
RelativePath=".\..\src\saveload\order_sl.cpp"
>
</File>
<File
RelativePath=".\..\src\saveload\plans_sl.cpp"
>
</File>
<File
RelativePath=".\..\src\saveload\saveload.cpp"
>
@@ -2818,6 +2854,10 @@
RelativePath=".\..\src\table\control_codes.h"
>
</File>
<File
RelativePath=".\..\src\table\darklight_colours.h"
>
</File>
<File
RelativePath=".\..\src\table\elrail_data.h"
>

View File

@@ -695,6 +695,10 @@
RelativePath=".\..\src\pbs.cpp"
>
</File>
<File
RelativePath=".\..\src\plans.cpp"
>
</File>
<File
RelativePath=".\..\src\progress.cpp"
>
@@ -1499,6 +1503,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"
>
@@ -1619,6 +1635,10 @@
RelativePath=".\..\src\slope_type.h"
>
</File>
<File
RelativePath=".\..\src\smallmap_colours.h"
>
</File>
<File
RelativePath=".\..\src\smallmap_gui.h"
>
@@ -2171,6 +2191,10 @@
RelativePath=".\..\src\osk_gui.cpp"
>
</File>
<File
RelativePath=".\..\src\plans_gui.cpp"
>
</File>
<File
RelativePath=".\..\src\rail_gui.cpp"
>
@@ -2419,6 +2443,10 @@
RelativePath=".\..\src\widgets\osk_widget.h"
>
</File>
<File
RelativePath=".\..\src\widgets\plans_widget.h"
>
</File>
<File
RelativePath=".\..\src\widgets\rail_widget.h"
>
@@ -2535,6 +2563,10 @@
RelativePath=".\..\src\order_cmd.cpp"
>
</File>
<File
RelativePath=".\..\src\plans_cmd.cpp"
>
</File>
<File
RelativePath=".\..\src\rail_cmd.cpp"
>
@@ -2715,6 +2747,10 @@
RelativePath=".\..\src\saveload\order_sl.cpp"
>
</File>
<File
RelativePath=".\..\src\saveload\plans_sl.cpp"
>
</File>
<File
RelativePath=".\..\src\saveload\saveload.cpp"
>
@@ -2815,6 +2851,10 @@
RelativePath=".\..\src\table\control_codes.h"
>
</File>
<File
RelativePath=".\..\src\table\darklight_colours.h"
>
</File>
<File
RelativePath=".\..\src\table\elrail_data.h"
>