Commit Graph

211 Commits (0b2b28959c3a959e77c896934c36fee8d9dfa95e)

Author SHA1 Message Date
Jonathan G Rennison 7949de2c05 Add a minimum visible height and no ground tile parameter to DrawTileProc.
Filter out tile parts which are entirely outside the drawing area.
4 years ago
Jonathan G Rennison cbdd9f84d8 Merge branch 'master' into jgrpp
# Conflicts:
#	src/console_gui.cpp
#	src/lang/korean.txt
#	src/video/sdl2_v.cpp
#	src/video/sdl2_v.h
#	src/window.cpp
#	src/window_gui.h
5 years ago
S. D. Cloudt 13cc8a0cee Cleanup: Removed SVN headers 5 years ago
Jonathan G Rennison 674732cd68 Merge: Codechange: Use null pointer literal instead of the NULL macro 5 years ago
Henry Wilson 7c8e7c6b6e Codechange: Use null pointer literal instead of the NULL macro 5 years ago
Jonathan G Rennison e3d167f9f0 Merge branch 'save_ext' into jgrpp
# Conflicts:
#	config.lib
#	src/misc_gui.cpp
#	src/network/network_gui.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/smallmap_gui.h
#	src/station_cmd.cpp
#	src/toolbar_gui.cpp
#	src/vehicle_gui.cpp
#	src/window.cpp
6 years ago
Andy ad5a9daed5 Change: Desert tiles are now half-desert if a neighboured tile is non-desert or sea/coast. (patch by frosch123) #4754 (#7015) 6 years ago
Jonathan G Rennison 9e1e074c2b Update existing assertions to log tile information where suitable 6 years ago
Jonathan G Rennison 13694c30cf Merge branch 'master' into jgrpp
# Conflicts:
#	src/clear_cmd.cpp
8 years ago
frosch 071518f571 (svn r27657) -Change: Replace another occurence of the ancient tilehash function with the newer one. This time to make rough land appear more random. 8 years ago
frosch db38de3b7e (svn r27657) -Change: Replace another occurence of the ancient tilehash function with the newer one. This time to make rough land appear more random. 8 years ago
Jonathan G Rennison e24839ed65 Merge branch 'master' into enhanced_viewport_overlay
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
9 years ago
patch-import 536a95dfd0 Import combined Enhanced viewport: zoom out, overlays & tooltips (r53_27127) patch
https://www.tt-forums.net/viewtopic.php?f=33&t=53394
9 years ago
frosch 4d310eafc5 (svn r27200) -Feature/Fix [FS#6260]: [NewGRF] Add Misc. GRF Feature Flag 6 to enable the second rocky tile set. 9 years ago
frosch c37ee53ecc (svn r27200) -Feature/Fix [FS#6260]: [NewGRF] Add Misc. GRF Feature Flag 6 to enable the second rocky tile set. 9 years ago
frosch 0a10fce8f1 (svn r27117) -Fix/Feature: Make use of both rocky tile sets from the base graphics. 10 years ago
frosch 862e16aa7e (svn r27117) -Fix/Feature: Make use of both rocky tile sets from the base graphics. 10 years ago
rubidium 2be4215f43 (svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values 10 years ago
rubidium 0463dbdc9e (svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values 10 years ago
zuu 27b153d16a (svn r25852) -Codechange: Merge GetFenceXX/SetFenceXX into one common GetFonce/SetFence for all directions that take an extra direction parameter (cirdan, LordAro) 11 years ago
zuu fb5dc7762b (svn r25852) -Codechange: Merge GetFenceXX/SetFenceXX into one common GetFonce/SetFence for all directions that take an extra direction parameter (cirdan, LordAro) 11 years ago
zuu 7e75a99cea (svn r25851) -Codechange: Avoid recalculations in DrawClearLandFence (cirdan, LordAro) 11 years ago
zuu a42f223b2b (svn r25851) -Codechange: Avoid recalculations in DrawClearLandFence (cirdan, LordAro) 11 years ago
zuu e124838db5 (svn r25849) -Codechange: Introduce IsTileFlat to not compute full slope information for situations when we only want to know if a tile is flat or not (cirdan, LordAro) 11 years ago
zuu dfb5663313 (svn r25849) -Codechange: Introduce IsTileFlat to not compute full slope information for situations when we only want to know if a tile is flat or not (cirdan, LordAro) 11 years ago
planetmaker f00d9976f9 (svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow) 12 years ago
planetmaker c24374f99c (svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow) 12 years ago
rubidium d5eeab43b7 (svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files 13 years ago
rubidium 6d6be50ae0 (svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files 13 years ago
yexo f884be58e5 (svn r23724) -Codechange: split of the check to see if ambient sounds are enabled to a header file allowing compilers to inline that check 13 years ago
yexo 5f79b4c5d1 (svn r23724) -Codechange: split of the check to see if ambient sounds are enabled to a header file allowing compilers to inline that check 13 years ago
yexo 0566a6cfda (svn r23168) -Feature [FS#1824]: always draw fences around field tiles 13 years ago
yexo 5c838ff1c3 (svn r23168) -Feature [FS#1824]: always draw fences around field tiles 13 years ago
yexo 36e61e08b3 (svn r23160) -Fix: wrong comments in a lot of TileTypeProcs definitions 13 years ago
yexo 6a272233b3 (svn r23160) -Fix: wrong comments in a lot of TileTypeProcs definitions 13 years ago
michi_cc 84a103e112 (svn r23114) -Feature: [NewGRF] Ambient sound effect callback. 13 years ago
michi_cc 707b0f48e6 (svn r23114) -Feature: [NewGRF] Ambient sound effect callback. 13 years ago
rubidium fb9fb416a1 (svn r23107) -Codechange: let GetSlopePixelZ and TerraformTile tile type functions use int z as well 13 years ago
rubidium 459c9523e8 (svn r23107) -Codechange: let GetSlopePixelZ and TerraformTile tile type functions use int z as well 13 years ago
rubidium 70faeeaba9 (svn r23106) -Codechange: pass int* to GetTileSlope and friends 13 years ago
rubidium 19eabdba2c (svn r23106) -Codechange: pass int* to GetTileSlope and friends 13 years ago
rubidium 1a54b7733c (svn r23102) -Codechange: remove the remaining pointless multiplications by TILE_HEIGHT 13 years ago
rubidium 798f5a8608 (svn r23102) -Codechange: remove the remaining pointless multiplications by TILE_HEIGHT 13 years ago
rubidium a70fdbcf2f (svn r23096) -Codechange: remove useless divisions and multiplications by TILE_HEIGHT for the snow line code 13 years ago
rubidium 69162621d8 (svn r23096) -Codechange: remove useless divisions and multiplications by TILE_HEIGHT for the snow line code 13 years ago
rubidium de980ef0f9 (svn r23091) -Codechange: rename some Get*Z functions to Get*PixelZ functions if they return the Z in pixels (like TilePixelHeight) 13 years ago
rubidium 7757a2ed40 (svn r23091) -Codechange: rename some Get*Z functions to Get*PixelZ functions if they return the Z in pixels (like TilePixelHeight) 13 years ago
rubidium 41223c8bc9 (svn r23084) -Codechange: get rid of a redundant variable 13 years ago
rubidium 47c5d30b5d (svn r23084) -Codechange: get rid of a redundant variable 13 years ago
rubidium 3cb12ed89c (svn r22019) -Codechange: s/functions.h/clear_func.h/ 14 years ago