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.
OpenTTD-patches/src/table
Jonathan G Rennison c5b3c18bb5 Merge branch 'master' into jgrpp
# Conflicts:
#	src/company_func.h
#	src/core/overflowsafe_type.hpp
#	src/engine.cpp
#	src/music/midifile.cpp
#	src/network/network_command.cpp
#	src/newgrf_debug_gui.cpp
#	src/newgrf_roadstop.h
#	src/newgrf_spritegroup.cpp
#	src/os/macosx/crashlog_osx.cpp
#	src/os/unix/crashlog_unix.cpp
#	src/pathfinder/yapf/yapf_common.hpp
#	src/road_gui.cpp
#	src/saveload/engine_sl.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/strings.cpp
#	src/table/settings/game_settings.ini
5 months ago
..
settings Merge branch 'master' into jgrpp 5 months ago
CMakeLists.txt Use compatibility table for loading non-table OPTS, PATS chunks 7 months ago
airport_defaults.h Codechange: Move date consts and functions to CalendarTime and TimerGameCalendar classes 9 months ago
airport_movement.h Codechange: automatic adding of _t to (u)int types, and WChar to char32_t 11 months ago
airporttile_ids.h
airporttiles.h
animcursors.h
autorail.h
bridge_land.h
build_industry.h Codechange: automatic adding of _t to (u)int types, and WChar to char32_t 11 months ago
cargo_const.h Codechange: cleanup CargoPacket in terms of variable/function names (#11278) 8 months ago
clear_land.h
control_codes.h Merge branch 'master' into jgrpp 9 months ago
darklight_colours.h
elrail_data.h Codechange: automatic adding of _t to (u)int types, and WChar to char32_t 11 months ago
engines.h Codechange: Move date consts and functions to CalendarTime and TimerGameCalendar classes 9 months ago
genland.h
heightmap_colours.h Codechange: automatic adding of _t to (u)int types, and WChar to char32_t 11 months ago
industry_land.h
landscape_sprite.h
newgrf_debug_data.h Debug: Add debug windows for routing restriction programs 5 months ago
object_land.h Strong typedef: Use strong typedefs for date, date tick, minutes types 6 months ago
opengl_shader.h
palette_convert.h
palettes.h
pricebase.h
railtypes.h Merge branch 'master' into jgrpp 6 months ago
road_land.h Codechange: automatic adding of _t to (u)int types, and WChar to char32_t 11 months ago
roadtypes.h Merge branch 'master' into jgrpp 6 months ago
roadveh_movement.h
settings.h.postamble
settings.h.preamble Split save/load settings into separate INI files 7 months ago
settings_compat.h Use compatibility table for loading non-table OPTS, PATS chunks 7 months ago
sprites.h Merge branch 'master' into jgrpp 9 months ago
station_land.h Codechange: automatic adding of _t to (u)int types, and WChar to char32_t 11 months ago
strgen_tables.h Merge branch 'master' into jgrpp 9 months ago
string_colours.h
town_land.h Codechange: Move date consts and functions to CalendarTime and TimerGameCalendar classes 9 months ago
townname.h
track_land.h Codechange: automatic adding of _t to (u)int types, and WChar to char32_t 11 months ago
train_cmd.h
tree_land.h Codechange: automatic adding of _t to (u)int types, and WChar to char32_t 11 months ago
unicode.h Codechange: automatic adding of _t to (u)int types, and WChar to char32_t 11 months ago
water_land.h Codechange: automatic adding of _t to (u)int types, and WChar to char32_t 11 months ago