Commit Graph

37 Commits (jgrpp)

Author SHA1 Message Date
Jonathan G Rennison 18a42664fc Merge branch 'master' into jgrpp
Remove 'byte' typedef
2 weeks ago
Patric Stout a3cfd23cf9
Codechange: rename byte to uint8_t (#12308) 2 months ago
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 5 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 d4f11eca42 Add NewGRF object properties to set viewport map mode/smallmap tile type 2 years ago
Jonathan G Rennison 2e7f8d2e1e Add inclined foundation option to object edge foundation mode
Bump feature version
2 years ago
Jonathan G Rennison 06fa1ae332 Add object shore/flooding support, adjust handling of foundations
Add info to debug window
2 years ago
Jonathan G Rennison 924ffb013f Add NewGRF object property/flag to use land as object ground sprite
This handles variable ground densities, snow/desert, etc.
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
Jonathan G Rennison 9e1e074c2b Update existing assertions to log tile information where suitable 6 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
frosch f794b9786f (svn r25844) -Change: Increase maximum number of object instances on the map from 64k to about 16M. 11 years ago
frosch 69a0c91d63 (svn r25844) -Change: Increase maximum number of object instances on the map from 64k to about 16M. 11 years ago
frosch d9d978d6d2 (svn r25833) -Codechange: Move ObjectType from map array into pool item. 11 years ago
frosch 35d7e8bca4 (svn r25833) -Codechange: Move ObjectType from map array into pool item. 11 years ago
frosch 478500abbc (svn r25832) -Codechange: Reduce variety of object type test functions. 11 years ago
frosch 2080a8c16f (svn r25832) -Codechange: Reduce variety of object type test functions. 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 a126dc7500 (svn r20639) -Add: random bits to object tiles 14 years ago
rubidium 536bb704b7 (svn r20639) -Add: random bits to object tiles 14 years ago
rubidium 360d6daf34 (svn r20632) -Cleanup: remove "a few" unneeded includes, and add them to some headers 14 years ago
rubidium 30f2afac9b (svn r20632) -Cleanup: remove "a few" unneeded includes, and add them to some headers 14 years ago
rubidium 5a7d6249af (svn r20622) -Codechange: unify [GS]et[Statation|Object|Industry|House]AnimationFrame 14 years ago
rubidium 4efa2efdbb (svn r20622) -Codechange: unify [GS]et[Statation|Object|Industry|House]AnimationFrame 14 years ago
rubidium 1d8b95b235 (svn r20621) -Codechange: move animation frames of houses, objects and industries to m7 (same as airports and stations) 14 years ago
rubidium 7f86dcca90 (svn r20621) -Codechange: move animation frames of houses, objects and industries to m7 (same as airports and stations) 14 years ago
rubidium f336f61104 (svn r20482) -Codechange: move some object related information off the map and unify the relation objects have to towns 14 years ago
rubidium 89b2b9370a (svn r20482) -Codechange: move some object related information off the map and unify the relation objects have to towns 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
rubidium 1f2276b785 (svn r20411) -Codechange: rename unmovables as quite a lot of them are actually movable; e.g. HQ and owned land are pretty movable. 14 years ago
rubidium 3da3d131c6 (svn r20411) -Codechange: rename unmovables as quite a lot of them are actually movable; e.g. HQ and owned land are pretty movable. 14 years ago