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 6d4474b84e Merge tag '13.0-beta2' into jgrpp
# Conflicts:
#	src/cheat_gui.cpp
#	src/company_gui.cpp
#	src/console_gui.cpp
#	src/depot_gui.cpp
#	src/error_gui.cpp
#	src/gfx.cpp
#	src/graph_gui.cpp
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/lang/korean.txt
#	src/lang/polish.txt
#	src/misc_gui.cpp
#	src/network/network_content_gui.h
#	src/newgrf_debug_gui.cpp
#	src/order_gui.cpp
#	src/rail_gui.cpp
#	src/road_gui.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/station_gui.cpp
#	src/subsidy_gui.cpp
#	src/table/settings/gui_settings.ini
#	src/timetable_gui.cpp
#	src/town_gui.cpp
#	src/train_cmd.cpp
#	src/vehicle_gui.cpp
#	src/viewport.cpp
#	src/water_cmd.cpp
#	src/widgets/dropdown.cpp
#	src/window_gui.h
2 years ago
..
settings Merge tag '13.0-beta2' into jgrpp 2 years ago
CMakeLists.txt Codechange: Let the compile generate the master command table out of templated command traits. 2 years ago
airport_defaults.h
airport_movement.h
airporttile_ids.h
airporttiles.h
animcursors.h
autorail.h
bridge_land.h
build_industry.h Industry: Determine which tiles in industry layouts are not animated 2 years ago
cargo_const.h
clear_land.h
control_codes.h Merge branch 'master' into jgrpp 2 years ago
darklight_colours.h
elrail_data.h
engines.h
genland.h Reduce duplication in desert or rainforeset data search arrays 2 years ago
heightmap_colours.h
industry_land.h
landscape_sprite.h
newgrf_debug_data.h Debug: Avoid compiler warnings in debug window cargo class printing 2 years ago
object_land.h Add NewGRF object properties to set viewport map mode/smallmap tile type 2 years ago
opengl_shader.h Cleanup: Remove svn-style `$Id$` comments. (#10122) 2 years ago
palette_convert.h
palettes.h
pricebase.h
railtypes.h
road_land.h Feature: Multi-track level crossings (#9931) 2 years ago
roadtypes.h
roadveh_movement.h
settings.h.postamble
settings.h.preamble Add support for enum client settings 2 years ago
sprites.h Merge branch 'master' into jgrpp 2 years ago
station_land.h Add replacement sprites for road waypoint buildings 2 years ago
strgen_tables.h Merge branch 'master' into jgrpp 2 years ago
string_colours.h
town_land.h Avoid unnecessary viewport redraws for unused tile loop house triggers 2 years ago
townname.h Merge branch 'master' into jgrpp 2 years ago
track_land.h
train_cmd.h Codechange: Let the compile generate the master command table out of templated command traits. 2 years ago
tree_land.h Fix duplication of tree sprite table 2 years ago
unicode.h Change: Rename some freetype things to fontcache. 2 years ago
water_land.h