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

Merge branch 'master' into enhanced_viewport_overlay

Browse Source 
Notes on conflict resolution:
* MarkTileDirtyByTile gained an extra param on both sides of the merge
  Move bridge level offset to be after zoom level param, as it's used less.
* Add zoom level params to MarkBridgeDirty functions
* Fix undefined behaviour in colour_index cycling in ViewportMapDraw

Conflicts:
	src/clear_cmd.cpp
	src/pbs.cpp
	src/rail_cmd.cpp
	src/toolbar_gui.cpp
	src/train_cmd.cpp
	src/vehicle.cpp
	src/viewport.cpp
	src/viewport_func.h
This commit is contained in:
Jonathan G Rennison
2015-08-05 21:25:13 +01:00
parent 536a95dfd0 163c30570b
commit e24839ed65
220 changed files with 5428 additions and 4324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
projects/openttd_vs100.vcxproj.filters
View File

@@ -1953,6 +1953,9 @@
<ClInclude Include="..\src\table\strgen_tables.h">
<Filter>Tables</Filter>
</ClInclude>
<ClInclude Include="..\src\table\string_colours.h">
<Filter>Tables</Filter>
</ClInclude>
<ClInclude Include="..\src\..\objs\langs\table\strings.h">
<Filter>Tables</Filter>
</ClInclude>