You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Jonathan G Rennison 62afd94b47 Merge branch 'master' into jgrpp-beta ... # Conflicts: # src/company_cmd.cpp # src/economy.cpp # src/lang/swedish.txt # src/network/network_command.cpp # src/news_gui.cpp # src/saveload/saveload.h # src/script/api/script_list.cpp # src/video/cocoa/cocoa_v.mm # src/video/sdl2_v.cpp		3 years ago
..
settings	Merge branch 'master' into jgrpp-beta	3 years ago
CMakeLists.txt	Merge branch 'master' into jgrpp-beta	3 years ago
airport_defaults.h	…
airport_movement.h	…
airporttile_ids.h	…
airporttiles.h	…
animcursors.h	…
autorail.h	…
bridge_land.h	…
build_industry.h	Codechange: rename sound ids to make more sense. (#8701)	3 years ago
cargo_const.h	Codechange: add constant for number of original cargoes.	3 years ago
clear_land.h	…
control_codes.h	Add {PLUS_NUM} string code which includes leading + for positive values	3 years ago
darklight_colours.h	…
elrail_data.h	…
engines.h	Codechange: rename sound ids to make more sense. (#8701)	3 years ago
genland.h	Fix: Desert/rainforest data coordinate 'y' is off by 1 when their 'x' coordinate is negative	3 years ago
heightmap_colours.h	…
industry_land.h	…
landscape_sprite.h	…
newgrf_debug_data.h	Debug: Show info of all aircraft parts in vehicle debug window	3 years ago
object_land.h	…
opengl_shader.h	Fix #8734: [OpenGL] Apply palette remap to cursor sprites. (#8742)	3 years ago
palette_convert.h	…
palettes.h	…
pricebase.h	…
railtypes.h	Add implementation of multi-aspect signalling and GRF support	3 years ago
road_land.h	Fix: front/back sprites of action5 tram catenary were swapped.	3 years ago
roadtypes.h	…
roadveh_movement.h	…
settings.h.postamble	…
settings.h.preamble	Merge branch 'master' into jgrpp-beta	3 years ago
sprites.h	Add new signal type: no-entry signal	3 years ago
station_land.h	Fix #9186: Fix incorrect bounding box height causing station sprite glitch. (#9187)	3 years ago
strgen_tables.h	Add {PLUS_NUM} string code which includes leading + for positive values	3 years ago
string_colours.h	…
town_land.h	…
townname.h	Merge branch 'master' into jgrpp-beta	3 years ago
track_land.h	…
train_cmd.h	…
tree_land.h	…
unicode.h	…
water_land.h	…