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 24b744f7c8 Merge branch 'master' into jgrpp ... # Conflicts: # bin/ai/CMakeLists.txt # bin/game/CMakeLists.txt # src/saveload/saveload.h		2 years ago
..
3rdparty	Merge branch 'master' into jgrpp	2 years ago
ai	Merge branch 'master' into jgrpp	2 years ago
blitter	…
core	Merge branch 'master' into jgrpp	2 years ago
fontcache	Merge branch 'master' into jgrpp	2 years ago
game	Merge branch 'master' into jgrpp	2 years ago
lang	Add per-town override to disable town growth	2 years ago
linkgraph	Fix crash on hovering link graph link where both ends have same position	2 years ago
misc	…
music	…
network	…
os	Merge branch 'master' into jgrpp	2 years ago
pathfinder	…
saveload	Merge branch 'master' into jgrpp	2 years ago
script	Merge branch 'master' into jgrpp	2 years ago
settingsgen	…
sound	…
spriteloader	…
strgen	…
table	Debug: Add engine variant ID and extra flags to debug info	2 years ago
video	…
widgets	Merge branch 'master' into jgrpp	2 years ago
CMakeLists.txt	…
aircraft.h	…
aircraft_cmd.cpp	…
aircraft_gui.cpp	…
airport.cpp	…
airport.h	…
airport_gui.cpp	…
animated_tile.cpp	…
animated_tile.h	…
animated_tile_func.h	…
articulated_vehicles.cpp	…
articulated_vehicles.h	…
autoreplace.cpp	…
autoreplace_base.h	…
autoreplace_cmd.cpp	…
autoreplace_func.h	…
autoreplace_gui.cpp	Merge branch 'master' into jgrpp	2 years ago
autoreplace_gui.h	…
autoreplace_type.h	…
autoslope.h	…
base_consist.cpp	…
base_consist.h	…
base_media_base.h	…
base_media_func.h	…
base_station_base.h	Road stops: Use a struct for road stop tile data	2 years ago
bitmap_type.h	…
bmp.cpp	…
bmp.h	…
bootstrap_gui.cpp	…
bridge.h	…
bridge_gui.cpp	…
bridge_map.cpp	…
bridge_map.h	…
bridge_signal_map.h	…
build_vehicle_gui.cpp	Merge branch 'master' into jgrpp	2 years ago
cargo_type.h	…
cargoaction.cpp	…
cargoaction.h	…
cargomonitor.cpp	…
cargomonitor.h	…
cargopacket.cpp	…
cargopacket.h	…
cargotype.cpp	…
cargotype.h	…
cheat.cpp	…
cheat_func.h	…
cheat_gui.cpp	…
cheat_type.h	…
clear_cmd.cpp	…
clear_func.h	…
clear_map.h	…
cmd_helper.h	…
command.cpp	…
command_aux.h	…
command_func.h	…
command_type.h	Feature: Ctrl-click to bulk edit timetable speeds/waiting times (#10265)	2 years ago
company_base.h	…
company_cmd.cpp	…
company_func.h	…
company_gui.cpp	…
company_gui.h	…
company_manager_face.h	…
company_type.h	…
console.cpp	…
console_cmds.cpp	Merge branch 'master' into jgrpp	2 years ago
console_func.h	…
console_gui.cpp	…
console_gui.h	…
console_internal.h	…
console_type.h	…
cpu.cpp	…
cpu.h	…
crashlog.cpp	…
crashlog.h	…
crashlog_bfd.h	…
currency.cpp	…
currency.h	…
date.cpp	…
date_func.h	…
date_gui.cpp	…
date_gui.h	…
date_type.h	…
debug.cpp	…
debug.h	…
debug_desync.h	…
debug_settings.h	…
dedicated.cpp	…
departures.cpp	…
departures_func.h	…
departures_gui.cpp	…
departures_gui.h	…
departures_type.h	…
depot.cpp	…
depot_base.h	…
depot_cmd.cpp	…
depot_func.h	…
depot_gui.cpp	…
depot_map.h	…
depot_type.h	…
direction_func.h	…
direction_type.h	…
disaster_vehicle.cpp	…
disaster_vehicle.h	…
dock_gui.cpp	…
driver.cpp	…
driver.h	…
economy.cpp	Road stops: Fix wrong animation callback when cargo taken	2 years ago
economy_base.h	…
economy_func.h	…
economy_type.h	…
effectvehicle.cpp	…
effectvehicle_base.h	…
effectvehicle_func.h	…
elrail.cpp	Merge branch 'master' into jgrpp	2 years ago
elrail_func.h	…
engine.cpp	Merge branch 'master' into jgrpp	2 years ago
engine_base.h	Merge branch 'master' into jgrpp	2 years ago
engine_func.h	Merge branch 'master' into jgrpp	2 years ago
engine_gui.cpp	…
engine_gui.h	Merge branch 'master' into jgrpp	2 years ago
engine_type.h	Merge branch 'master' into jgrpp	2 years ago
error.h	…
error_gui.cpp	…
event_logs.cpp	…
event_logs.h	…
fileio.cpp	…
fileio_func.h	…
fileio_type.h	…
fios.cpp	…
fios.h	…
fios_gui.cpp	…
fontcache.cpp	Merge branch 'master' into jgrpp	2 years ago
fontcache.h	Merge branch 'master' into jgrpp	2 years ago
fontdetection.h	…
framerate_gui.cpp	…
framerate_type.h	…
gamelog.cpp	…
gamelog.h	…
gamelog_internal.h	…
genworld.cpp	…
genworld.h	…
genworld_gui.cpp	…
gfx.cpp	Merge branch 'master' into jgrpp	2 years ago
gfx_func.h	Merge branch 'master' into jgrpp	2 years ago
gfx_layout.cpp	Merge branch 'master' into jgrpp	2 years ago
gfx_layout.h	…
gfx_type.h	Merge branch 'master' into jgrpp	2 years ago
gfxinit.cpp	…
gfxinit.h	…
goal.cpp	…
goal_base.h	…
goal_gui.cpp	…
goal_type.h	…
graph_gui.cpp	…
graph_gui.h	…
ground_vehicle.cpp	…
ground_vehicle.hpp	…
group.h	…
group_cmd.cpp	…
group_gui.cpp	Merge branch 'master' into jgrpp	2 years ago
group_gui.h	…
group_type.h	…
gui.h	…
guitimer_func.h	…
heightmap.cpp	…
heightmap.h	…
highscore.cpp	…
highscore.h	…
highscore_gui.cpp	…
hotkeys.cpp	…
hotkeys.h	…
house.h	…
house_type.h	…
industry.h	…
industry_cmd.cpp	Merge branch 'master' into jgrpp	2 years ago
industry_gui.cpp	…
industry_map.h	…
industry_type.h	…
industrytype.h	…
infrastructure.cpp	…
infrastructure_func.h	Infra sharing: Disallow control over other company trains wholly in depots	2 years ago
ini.cpp	…
ini_load.cpp	…
ini_type.h	…
intro_gui.cpp	Fix #10198: Rearrange Intro GUI to make button rows narrower (#10203)	2 years ago
landscape.cpp	Add wrapper class for diagonal or orthogonal tile iteration	2 years ago
landscape.h	…
landscape_type.h	…
language.h	…
league_base.h	…
league_cmd.cpp	…
league_cmd.h	…
league_gui.cpp	…
league_gui.h	…
league_type.h	…
livery.h	…
main_gui.cpp	…
map.cpp	…
map_func.h	…
map_type.h	…
misc.cpp	…
misc_cmd.cpp	…
misc_gui.cpp	Merge branch 'master' into jgrpp	2 years ago
mixer.cpp	…
mixer.h	…
music.cpp	…
music_gui.cpp	…
newgrf.cpp	Add setting to disable NewGRF inflation flag	2 years ago
newgrf.h	Merge branch 'master' into jgrpp	2 years ago
newgrf_airport.cpp	…
newgrf_airport.h	…
newgrf_airporttiles.cpp	…
newgrf_airporttiles.h	…
newgrf_analysis.cpp	…
newgrf_analysis.h	…
newgrf_animation_base.h	…
newgrf_animation_type.h	…
newgrf_cache_check.h	…
newgrf_callbacks.h	…
newgrf_canal.cpp	…
newgrf_canal.h	…
newgrf_cargo.cpp	…
newgrf_cargo.h	…
newgrf_class.h	…
newgrf_class_func.h	…
newgrf_commons.cpp	…
newgrf_commons.h	…
newgrf_config.cpp	…
newgrf_config.h	…
newgrf_debug.h	…
newgrf_debug_gui.cpp	…
newgrf_engine.cpp	Merge branch 'master' into jgrpp	2 years ago
newgrf_engine.h	…
newgrf_extension.cpp	GRF: Add road stops variable for road info of nearby plain road tile	2 years ago
newgrf_extension.h	…
newgrf_generic.cpp	…
newgrf_generic.h	…
newgrf_gui.cpp	…
newgrf_house.cpp	…
newgrf_house.h	…
newgrf_industries.cpp	…
newgrf_industries.h	…
newgrf_industrytiles.cpp	…
newgrf_industrytiles.h	…
newgrf_industrytiles_analysis.h	…
newgrf_internal.h	…
newgrf_newlandscape.cpp	…
newgrf_newlandscape.h	…
newgrf_newsignals.cpp	…
newgrf_newsignals.h	…
newgrf_object.cpp	…
newgrf_object.h	…
newgrf_optimiser.cpp	VarAction2: Mark applicable road stops variables as expensive	2 years ago
newgrf_profiling.cpp	…
newgrf_profiling.h	…
newgrf_properties.h	…
newgrf_railtype.cpp	…
newgrf_railtype.h	…
newgrf_roadstop.cpp	Road stops: Use a struct for road stop tile data	2 years ago
newgrf_roadstop.h	…
newgrf_roadtype.cpp	…
newgrf_roadtype.h	…
newgrf_sound.cpp	…
newgrf_sound.h	…
newgrf_spritegroup.cpp	…
newgrf_spritegroup.h	…
newgrf_station.cpp	…
newgrf_station.h	…
newgrf_storage.cpp	…
newgrf_storage.h	…
newgrf_text.cpp	…
newgrf_text.h	…
newgrf_town.cpp	…
newgrf_town.h	…
newgrf_townname.cpp	…
newgrf_townname.h	…
news_func.h	…
news_gui.cpp	…
news_gui.h	…
news_type.h	…
object.h	…
object_base.h	…
object_cmd.cpp	Add wrapper class for diagonal or orthogonal tile iteration	2 years ago
object_gui.cpp	…
object_map.h	…
object_type.h	…
openttd.cpp	…
openttd.h	…
order_backup.cpp	…
order_backup.h	…
order_base.h	…
order_cmd.cpp	…
order_cmd.h	…
order_func.h	…
order_gui.cpp	…
order_type.h	…
osk_gui.cpp	…
pbs.cpp	…
pbs.h	…
plans.cpp	…
plans_base.h	…
plans_cmd.cpp	…
plans_func.h	…
plans_gui.cpp	…
plans_type.h	…
programmable_signals.cpp	…
programmable_signals.h	…
programmable_signals_gui.cpp	…
progress.cpp	…
progress.h	…
querystring_gui.h	…
rail.cpp	…
rail.h	…
rail_cmd.cpp	Add wrapper class for diagonal or orthogonal tile iteration	2 years ago
rail_gui.cpp	…
rail_gui.h	…
rail_gui_type.h	…
rail_map.h	…
rail_type.h	…
random_access_file.cpp	…
random_access_file_type.h	…
rev.cpp.in	…
rev.h	…
road.cpp	…
road.h	Merge branch 'master' into jgrpp	2 years ago
road_cmd.cpp	Merge branch 'master' into jgrpp	2 years ago
road_cmd.h	…
road_func.h	…
road_gui.cpp	…
road_gui.h	…
road_internal.h	…
road_map.cpp	…
road_map.h	…
road_type.h	…
roadstop.cpp	…
roadstop_base.h	…
roadveh.h	…
roadveh_cmd.cpp	…
roadveh_gui.cpp	…
safeguards.h	…
schdispatch.h	…
schdispatch_cmd.cpp	Scheduled dispatch: Allow wrapping at midnight when bulk inserting slots	2 years ago
schdispatch_gui.cpp	Scheduled dispatch: Allow wrapping at midnight when bulk inserting slots	2 years ago
scope.h	…
scope_info.cpp	…
scope_info.h	…
screenshot.cpp	…
screenshot.h	…
screenshot_gui.cpp	…
screenshot_gui.h	…
settings.cpp	…
settings_func.h	…
settings_gui.cpp	Remove now unused vehicle.flip_direction_all_trains setting	2 years ago
settings_gui.h	…
settings_internal.h	…
settings_type.h	Add setting to disable NewGRF inflation flag	2 years ago
ship.h	…
ship_cmd.cpp	…
ship_gui.cpp	…
signal.cpp	…
signal_func.h	…
signal_type.h	…
signs.cpp	…
signs_base.h	…
signs_cmd.cpp	…
signs_func.h	…
signs_gui.cpp	…
signs_type.h	…
slope_func.h	…
slope_type.h	…
smallmap_colours.h	…
smallmap_gui.cpp	…
smallmap_gui.h	…
sortlist_type.h	…
sound.cpp	…
sound_func.h	…
sound_type.h	…
sprite.cpp	…
sprite.h	…
spritecache.cpp	…
spritecache.h	…
station.cpp	Road stops: Use a struct for road stop tile data	2 years ago
station_base.h	…
station_cmd.cpp	Merge branch 'master' into jgrpp	2 years ago
station_func.h	…
station_gui.cpp	…
station_gui.h	…
station_kdtree.h	…
station_map.h	…
station_type.h	…
statusbar_gui.cpp	…
statusbar_gui.h	…
stdafx.h	…
story.cpp	…
story_base.h	…
story_gui.cpp	…
story_type.h	…
string.cpp	…
string_base.h	…
string_func.h	…
string_func_extra.h	…
string_type.h	…
stringfilter.cpp	…
stringfilter_type.h	…
strings.cpp	…
strings_func.h	…
strings_type.h	…
subsidy.cpp	…
subsidy_base.h	…
subsidy_func.h	…
subsidy_gui.cpp	…
subsidy_type.h	…
tar_type.h	…
tbtr_template_gui_create.cpp	…
tbtr_template_gui_create.h	…
tbtr_template_gui_main.cpp	…
tbtr_template_gui_main.h	…
tbtr_template_vehicle.cpp	Implement new shortened train flipping for template trains	2 years ago
tbtr_template_vehicle.h	Implement new shortened train flipping for template trains	2 years ago
tbtr_template_vehicle_func.cpp	…
tbtr_template_vehicle_func.h	…
terraform_cmd.cpp	Add wrapper class for diagonal or orthogonal tile iteration	2 years ago
terraform_gui.cpp	Add wrapper class for diagonal or orthogonal tile iteration	2 years ago
terraform_gui.h	…
textbuf.cpp	…
textbuf_gui.h	…
textbuf_type.h	…
texteff.cpp	…
texteff.hpp	…
textfile_gui.cpp	Change: Display text files in black (#10291)	2 years ago
textfile_gui.h	…
textfile_type.h	…
tgp.cpp	…
tgp.h	…
thread.h	…
tile_cmd.h	…
tile_map.cpp	…
tile_map.h	…
tile_type.h	…
tilearea.cpp	…
tilearea_type.h	Add wrapper class for diagonal or orthogonal tile iteration	2 years ago
tilehighlight_func.h	…
tilehighlight_type.h	…
tilematrix_type.hpp	…
timetable.h	…
timetable_cmd.cpp	Feature: Ctrl-click to bulk edit timetable speeds/waiting times (#10265)	2 years ago
timetable_gui.cpp	Merge branch 'master' into jgrpp	2 years ago
toolbar_gui.cpp	…
toolbar_gui.h	…
town.h	Add per-town override to disable town growth	2 years ago
town_cmd.cpp	Add per-town override to disable town growth	2 years ago
town_gui.cpp	Add per-town override to disable town growth	2 years ago
town_gui.h	…
town_kdtree.h	…
town_map.h	…
town_type.h	…
townname.cpp	…
townname_func.h	…
townname_type.h	…
tracerestrict.cpp	…
tracerestrict.h	…
tracerestrict_gui.cpp	…
track_func.h	…
track_type.h	…
train.h	Merge branch 'master' into jgrpp	2 years ago
train_cmd.cpp	Merge branch 'master' into jgrpp	2 years ago
train_gui.cpp	…
train_speed_adaptation.h	…
transparency.h	…
transparency_gui.cpp	…
transparency_gui.h	…
transport_type.h	…
tree_cmd.cpp	Allow planting trees on diagonal areas	2 years ago
tree_gui.cpp	Allow planting trees on diagonal areas	2 years ago
tree_map.h	…
tunnel_base.h	…
tunnel_map.cpp	…
tunnel_map.h	…
tunnelbridge.h	…
tunnelbridge_cmd.cpp	…
tunnelbridge_map.h	…
unit_conversion.h	…
vehicle.cpp	…
vehicle_base.h	…
vehicle_cmd.cpp	Infra sharing: Allow using mass start/stop buttons in other company depots	2 years ago
vehicle_func.h	…
vehicle_gui.cpp	Merge branch 'master' into jgrpp	2 years ago
vehicle_gui.h	…
vehicle_gui_base.h	…
vehicle_type.h	…
vehiclelist.cpp	…
vehiclelist.h	…
viewport.cpp	Rename ChildScreenSpritePositionMode enum values	2 years ago
viewport_func.h	Rename ChildScreenSpritePositionMode enum values	2 years ago
viewport_gui.cpp	…
viewport_kdtree.h	…
viewport_sprite_sorter.h	…
viewport_sprite_sorter_sse4.cpp	…
viewport_type.h	Rename ChildScreenSpritePositionMode enum values	2 years ago
void_cmd.cpp	…
void_map.h	…
walltime_func.h	…
water.h	…
water_cmd.cpp	Add wrapper class for diagonal or orthogonal tile iteration	2 years ago
water_map.h	…
waypoint.cpp	…
waypoint_base.h	…
waypoint_cmd.cpp	…
waypoint_func.h	…
waypoint_gui.cpp	…
widget.cpp	…
widget_type.h	…
window.cpp	Merge branch 'master' into jgrpp	2 years ago
window_func.h	…
window_gui.h	Merge branch 'master' into jgrpp	2 years ago
window_type.h	…
worker_thread.cpp	…
worker_thread.h	…
zoning.h	…
zoning_cmd.cpp	Merge branch 'master' into jgrpp	2 years ago
zoning_gui.cpp	…
zoom_func.h	…
zoom_type.h	…