Commit Graph

58 Commits (jgrpp)

Author SHA1 Message Date
Jonathan G Rennison 55d78a23be Merge branch 'master' into jgrpp
# Conflicts:
#	src/3rdparty/squirrel/include/squirrel.h
#	src/blitter/32bpp_sse_func.hpp
#	src/bridge_map.h
#	src/clear_map.h
#	src/company_manager_face.h
#	src/console_func.h
#	src/core/bitmath_func.hpp
#	src/core/endian_func.hpp
#	src/core/random_func.hpp
#	src/depot_map.h
#	src/elrail_func.h
#	src/fontcache.h
#	src/industry_map.h
#	src/map_func.h
#	src/newgrf_spritegroup.h
#	src/object_map.h
#	src/rail.h
#	src/rail_map.h
#	src/road_func.h
#	src/road_map.h
#	src/saveload/saveload.h
#	src/saveload/saveload_error.hpp
#	src/settings_gui.cpp
#	src/sl/oldloader.h
#	src/sprite.h
#	src/spritecache.h
#	src/station_func.h
#	src/station_map.h
#	src/story_base.h
#	src/strings_func.h
#	src/tile_cmd.h
#	src/tile_map.h
#	src/tile_type.h
#	src/town.h
#	src/town_map.h
#	src/tree_map.h
#	src/tunnel_map.h
#	src/tunnelbridge_map.h
#	src/vehicle_func.h
#	src/viewport_func.h
#	src/void_map.h
#	src/water.h
#	src/water_map.h
#	src/widget_type.h
4 months ago
Rubidium 3a676a5af0 Codechange: replace static inline with static for non-class functions 4 months ago
Rubidium 580d0a6343 Codechange: make use of Tile in for all direct map accesses 1 year ago
Jonathan G Rennison 29a1e49c28 Change various asserts to not be included in release builds 2 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
J0an Josep a53f13cff6 Fix #6805: Clear some m8 bits when making some tiles. 6 years ago
Jonathan G Rennison 912ddc85d4 Merge remote-tracking branch 'J0anJosep/MapArrayGrid-m8' into jgrpp
# Conflicts:
#	docs/landscape_grid.html
6 years ago
J0an Josep 9cabab03b1 Fix #6805: Clear some m8 bits when making some tiles. 6 years ago
Jonathan G Rennison 9e1e074c2b Update existing assertions to log tile information where suitable 6 years ago
rubidium 988b387f14 (svn r27037) -Fix [FS#6150] (r26878): m6 was moved from Tile To TileExtended, but it wasn't properly removed from Tile (patch by Juanjo) 10 years ago
rubidium 8739a7b7d0 (svn r27037) -Fix [FS#6150] (r26878): m6 was moved from Tile To TileExtended, but it wasn't properly removed from Tile (patch by Juanjo) 10 years ago
rubidium f3b79480ed (svn r26878) -Change: move m6 to TileExtended to keep Tile 8 bytes and thus better alignable 10 years ago
rubidium 982f5a6aa2 (svn r26878) -Change: move m6 to TileExtended to keep Tile 8 bytes and thus better alignable 10 years ago
rubidium 173a234951 (svn r26876) -Codechange: move 'has bride above' data from m6 to type 10 years ago
rubidium 0ac2d3b324 (svn r26876) -Codechange: move 'has bride above' data from m6 to type 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
rubidium 3d605f6488 (svn r23595) -Codechange: add comma after last enum to get a more uniform coding style 13 years ago
rubidium df16ebd730 (svn r23595) -Codechange: add comma after last enum to get a more uniform coding style 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
rubidium d946841eff (svn r22413) -Document: even more stuff 13 years ago
rubidium ff143c6708 (svn r22413) -Document: even more stuff 13 years ago
frosch 9ecaa47953 (svn r21367) -Fix (r18719)[FS#4283]: Fields were not cleared under snow though they were intended to be. 14 years ago
frosch 6d962a3e35 (svn r21367) -Fix (r18719)[FS#4283]: Fields were not cleared under snow though they were intended to be. 14 years ago
rubidium 8975ef1f7b (svn r20446) -Codechange: unify the location of the water class 14 years ago
rubidium ab5b0ceff2 (svn r20446) -Codechange: unify the location of the water class 14 years ago
smatz 258b128a56 (svn r19614) -Codechange: "it's" => "its" where appropriate 14 years ago
smatz 0ef33548c2 (svn r19614) -Codechange: "it's" => "its" where appropriate 14 years ago
yexo f666760a72 (svn r18738) -Fix (r18719): when a tree died while there was snow the amount of snow on the tile changed 15 years ago
yexo 06842771a8 (svn r18738) -Fix (r18719): when a tree died while there was snow the amount of snow on the tile changed 15 years ago
yexo 2a6fc142de (svn r18719) -Feature: don't delete the rough/rocky status of a tile when it's covered by snow, this allows rocky tiles under snow if you have a variable snowline 15 years ago
yexo b378e82676 (svn r18719) -Feature: don't delete the rough/rocky status of a tile when it's covered by snow, this allows rocky tiles under snow if you have a variable snowline 15 years ago
rubidium 99d46e0ad7 (svn r17248) -Fix: add GPL license notice where appropriate 15 years ago
rubidium 7fbc33dae1 (svn r17248) -Fix: add GPL license notice where appropriate 15 years ago
smatz e57699d8c0 (svn r15643) -Fix [FS#2711]: be more strict with zeroing unused map array bits 15 years ago
smatz e124aa8fd6 (svn r15643) -Fix [FS#2711]: be more strict with zeroing unused map array bits 15 years ago
rubidium 71d4004a85 (svn r11776) -Codechange: more header splittings to reduce the dependencies. 17 years ago
rubidium 38115acf5a (svn r11776) -Codechange: more header splittings to reduce the dependencies. 17 years ago
rubidium 8ebdfb258f (svn r11674) -Codechange: refactor some functions out of macros.h into more logical locations. 17 years ago
rubidium 01e20c9140 (svn r11674) -Codechange: refactor some functions out of macros.h into more logical locations. 17 years ago
rubidium be923601bf (svn r11669) -Codechange: refactor tile.h -> tile_type.h and tile_map.h 17 years ago
rubidium 5b49e75453 (svn r11669) -Codechange: refactor tile.h -> tile_type.h and tile_map.h 17 years ago
rubidium 82a1d0f2e4 (svn r9554) -Documentation: add documentation to some map accessors. 17 years ago
rubidium a403f32e59 (svn r9554) -Documentation: add documentation to some map accessors. 17 years ago
rubidium 979ccd45ba (svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {}; 17 years ago
rubidium 24c4d5b06d (svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {}; 17 years ago
belugas 4160d85cd2 (svn r8859) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style. 17 years ago
belugas 6d199fcdb7 (svn r8859) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style. 17 years ago