Jonathan G Rennison 781aaa4fe5 Merge branch 'master' into jgrpp-beta ...

# Conflicts:
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/table/company_settings.ini
#	src/table/currency_settings.ini
#	src/table/gameopt_settings.ini
#	src/table/misc_settings.ini
#	src/table/settings.h.preamble
#	src/table/settings.ini
#	src/table/win32_settings.ini
#	src/table/window_settings.ini

2021-10-17 01:44:45 +01: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

Codechange: add constant for number of original cargoes.

2021-05-13 23:28:43 +02:00

clear_land.h

…

CMakeLists.txt

CMake: Fix host strgen/settingsgen importing

2021-03-04 18:50:29 +00:00

company_settings.ini

Merge branch 'master' into jgrpp-beta

2021-10-17 01:44:45 +01:00

control_codes.h

Add {PLUS_NUM} string code which includes leading + for positive values

2021-06-14 22:55:26 +01:00

currency_settings.ini

Merge branch 'master' into jgrpp-beta

2021-10-17 01:44:45 +01: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-beta

2021-10-17 01:44:45 +01: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-beta

2021-10-17 01:44:45 +01:00

newgrf_debug_data.h

Include docking tiles in station debug window

2021-10-02 22:43:55 +01:00

object_land.h

…

opengl_shader.h

Fix #8734: [OpenGL] Apply palette remap to cursor sprites. (#8742)

2021-02-24 22:10:25 +01:00

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

Add implementation of multi-aspect signalling and GRF support

2021-08-28 12:54:18 +01:00

road_land.h

Fix: front/back sprites of action5 tram catenary were swapped.

2021-03-11 00:21:09 +01:00

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-beta

2021-10-17 01:44:45 +01:00

settings.ini

Merge branch 'master' into jgrpp-beta

2021-10-17 01:44:45 +01:00

sprites.h

Add new signal type: no-entry signal

2021-09-04 11:39:54 +01:00

station_land.h

Fix #9186: Fix incorrect bounding box height causing station sprite glitch. (#9187)

2021-05-21 18:29:45 +01:00

strgen_tables.h

Add {PLUS_NUM} string code which includes leading + for positive values

2021-06-14 22:55:26 +01: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-beta

2021-09-22 21:50:02 +01: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-beta

2021-10-17 01:44:45 +01:00

window_settings.ini

Merge branch 'master' into jgrpp-beta

2021-10-17 01:44:45 +01:00