Jonathan G Rennison dfecdf3afb Merge branch 'master' into jgrpp ... # Conflicts: # src/dock_gui.cpp # src/rail_gui.cpp # src/road_gui.cpp # src/terraform_gui.cpp # src/vehicle.cpp # src/video/allegro_v.cpp # src/video/cocoa/cocoa_v.mm # src/video/dedicated_v.cpp # src/video/sdl2_v.cpp # src/video/sdl_v.cpp # src/video/win32_v.cpp		2021-02-21 11:54:24 +00:00
..
airport_defaults.h	Codechange: Replace assert_compile macro with static_assert	2020-12-27 10:55:42 +00:00
airport_movement.h
airporttile_ids.h
airporttiles.h	Codechange: Replace assert_compile macro with static_assert	2020-12-27 10:55:42 +00:00
animcursors.h
autorail.h
bridge_land.h
build_industry.h	Codechange: rename sound ids to make more sense. (#8701)	2021-02-20 19:01:04 +01:00
cargo_const.h	Cleanup: Rework the CargoSpec macro for improved readability.	2020-12-21 23:12:58 +01:00
clear_land.h
CMakeLists.txt	Merge branch 'master' into jgrpp	2020-12-07 17:56:44 +00:00
company_settings.ini	Merge branch 'master' into jgrpp	2021-02-19 15:38:34 +00:00
control_codes.h	Tracerestrict: Add time/date conditional	2020-11-27 18:43:32 +00:00
currency_settings.ini	Merge branch 'master' into jgrpp	2021-02-19 15:38:34 +00:00
darklight_colours.h
elrail_data.h
engines.h	Codechange: rename sound ids to make more sense. (#8701)	2021-02-20 19:01:04 +01:00
gameopt_settings.ini	Merge branch 'master' into jgrpp	2021-02-19 15:38:34 +00:00
genland.h	Fix: Desert/rainforest data coordinate 'y' is off by 1 when their 'x' coordinate is negative	2021-02-13 19:18:41 +01:00
heightmap_colours.h
industry_land.h
landscape_sprite.h
misc_settings.ini	Merge branch 'master' into jgrpp	2021-02-19 15:38:34 +00:00
newgrf_debug_data.h	Debug: Add house population and mail generation to debug window	2021-02-16 21:35:17 +00:00
object_land.h
palette_convert.h
palettes.h
pricebase.h	Codechange: Replace assert_compile macro with static_assert	2020-12-27 10:55:42 +00:00
railtypes.h	Fix PBS rail type handling with incorrect GRF rail type compatibility	2020-10-15 20:37:57 +01:00
road_land.h
roadtypes.h	GRF: Add extra road/tram type flag: not available to AI/GS	2020-10-16 22:12:10 +01:00
roadveh_movement.h
settings.h.postamble
settings.h.preamble	Merge branch 'master' into jgrpp	2021-02-19 15:38:34 +00:00
settings.ini	Merge branch 'master' into jgrpp	2021-02-19 15:38:34 +00:00
sprites.h	Merge tag '1.11.0-beta1' into jgrpp	2021-02-01 18:58:36 +00:00
station_land.h	Codechange: Replace assert_compile macro with static_assert	2020-12-27 10:55:42 +00:00
strgen_tables.h	Tracerestrict: Add time/date conditional	2020-11-27 18:43:32 +00:00
string_colours.h
town_land.h	Codechange: Replace assert_compile macro with static_assert	2020-12-27 10:55:42 +00:00
townname.h	Merge branch 'master' into jgrpp	2021-01-29 17:45:15 +00:00
track_land.h
train_cmd.h	Codechange: Replace assert_compile macro with static_assert	2020-12-27 10:55:42 +00:00
tree_land.h
unicode.h
water_land.h
win32_settings.ini	Merge branch 'master' into jgrpp	2021-02-21 11:54:24 +00:00
window_settings.ini	Merge branch 'master' into jgrpp	2021-02-19 15:38:34 +00:00