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

Merge branch 'master' into jgrpp

Browse Source
This commit is contained in:
Jonathan G Rennison
2020-06-01 20:39:46 +01:00
parent 52e0d44c8a 1c0ba07c3c
commit 677940cfc6
27 changed files with 363 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
projects/openttd_vs140.vcxproj
View File

@@ -1152,6 +1152,7 @@
<ClInclude Include="..\src\script\api\script_news.hpp" />
<ClInclude Include="..\src\script\api\script_object.hpp" />
<ClInclude Include="..\src\script\api\script_order.hpp" />
<ClInclude Include="..\src\script\api\script_priorityqueue.hpp" />
<ClInclude Include="..\src\script\api\script_rail.hpp" />
<ClInclude Include="..\src\script\api\script_railtypelist.hpp" />
<ClInclude Include="..\src\script\api\script_road.hpp" />
@@ -1219,6 +1220,7 @@
<ClCompile Include="..\src\script\api\script_news.cpp" />
<ClCompile Include="..\src\script\api\script_object.cpp" />
<ClCompile Include="..\src\script\api\script_order.cpp" />
<ClCompile Include="..\src\script\api\script_priorityqueue.cpp" />
<ClCompile Include="..\src\script\api\script_rail.cpp" />
<ClCompile Include="..\src\script\api\script_railtypelist.cpp" />
<ClCompile Include="..\src\script\api\script_road.cpp" />

6
projects/openttd_vs140.vcxproj.filters
View File

@@ -2553,6 +2553,9 @@
<ClInclude Include="..\src\script\api\script_order.hpp">
<Filter>Script API</Filter>
</ClInclude>
<ClInclude Include="..\src\script\api\script_priorityqueue.hpp">
<Filter>Script API</Filter>
</ClInclude>
<ClInclude Include="..\src\script\api\script_rail.hpp">
<Filter>Script API</Filter>
</ClInclude>
@@ -2754,6 +2757,9 @@
<ClCompile Include="..\src\script\api\script_order.cpp">
<Filter>Script API Implementation</Filter>
</ClCompile>
<ClCompile Include="..\src\script\api\script_priorityqueue.cpp">
<Filter>Script API Implementation</Filter>
</ClCompile>
<ClCompile Include="..\src\script\api\script_rail.cpp">
<Filter>Script API Implementation</Filter>
</ClCompile>

2
projects/openttd_vs141.vcxproj
View File

@@ -1152,6 +1152,7 @@
<ClInclude Include="..\src\script\api\script_news.hpp" />
<ClInclude Include="..\src\script\api\script_object.hpp" />
<ClInclude Include="..\src\script\api\script_order.hpp" />
<ClInclude Include="..\src\script\api\script_priorityqueue.hpp" />
<ClInclude Include="..\src\script\api\script_rail.hpp" />
<ClInclude Include="..\src\script\api\script_railtypelist.hpp" />
<ClInclude Include="..\src\script\api\script_road.hpp" />
@@ -1219,6 +1220,7 @@
<ClCompile Include="..\src\script\api\script_news.cpp" />
<ClCompile Include="..\src\script\api\script_object.cpp" />
<ClCompile Include="..\src\script\api\script_order.cpp" />
<ClCompile Include="..\src\script\api\script_priorityqueue.cpp" />
<ClCompile Include="..\src\script\api\script_rail.cpp" />
<ClCompile Include="..\src\script\api\script_railtypelist.cpp" />
<ClCompile Include="..\src\script\api\script_road.cpp" />

6
projects/openttd_vs141.vcxproj.filters
View File

@@ -2553,6 +2553,9 @@
<ClInclude Include="..\src\script\api\script_order.hpp">
<Filter>Script API</Filter>
</ClInclude>
<ClInclude Include="..\src\script\api\script_priorityqueue.hpp">
<Filter>Script API</Filter>
</ClInclude>
<ClInclude Include="..\src\script\api\script_rail.hpp">
<Filter>Script API</Filter>
</ClInclude>
@@ -2754,6 +2757,9 @@
<ClCompile Include="..\src\script\api\script_order.cpp">
<Filter>Script API Implementation</Filter>
</ClCompile>
<ClCompile Include="..\src\script\api\script_priorityqueue.cpp">
<Filter>Script API Implementation</Filter>
</ClCompile>
<ClCompile Include="..\src\script\api\script_rail.cpp">
<Filter>Script API Implementation</Filter>
</ClCompile>

2
projects/openttd_vs142.vcxproj
View File

@@ -1152,6 +1152,7 @@
<ClInclude Include="..\src\script\api\script_news.hpp" />
<ClInclude Include="..\src\script\api\script_object.hpp" />
<ClInclude Include="..\src\script\api\script_order.hpp" />
<ClInclude Include="..\src\script\api\script_priorityqueue.hpp" />
<ClInclude Include="..\src\script\api\script_rail.hpp" />
<ClInclude Include="..\src\script\api\script_railtypelist.hpp" />
<ClInclude Include="..\src\script\api\script_road.hpp" />
@@ -1219,6 +1220,7 @@
<ClCompile Include="..\src\script\api\script_news.cpp" />
<ClCompile Include="..\src\script\api\script_object.cpp" />
<ClCompile Include="..\src\script\api\script_order.cpp" />
<ClCompile Include="..\src\script\api\script_priorityqueue.cpp" />
<ClCompile Include="..\src\script\api\script_rail.cpp" />
<ClCompile Include="..\src\script\api\script_railtypelist.cpp" />
<ClCompile Include="..\src\script\api\script_road.cpp" />

6
projects/openttd_vs142.vcxproj.filters
View File

@@ -2553,6 +2553,9 @@
<ClInclude Include="..\src\script\api\script_order.hpp">
<Filter>Script API</Filter>
</ClInclude>
<ClInclude Include="..\src\script\api\script_priorityqueue.hpp">
<Filter>Script API</Filter>
</ClInclude>
<ClInclude Include="..\src\script\api\script_rail.hpp">
<Filter>Script API</Filter>
</ClInclude>
@@ -2754,6 +2757,9 @@
<ClCompile Include="..\src\script\api\script_order.cpp">
<Filter>Script API Implementation</Filter>
</ClCompile>
<ClCompile Include="..\src\script\api\script_priorityqueue.cpp">
<Filter>Script API Implementation</Filter>
</ClCompile>
<ClCompile Include="..\src\script\api\script_rail.cpp">
<Filter>Script API Implementation</Filter>
</ClCompile>