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 ae9b416684 Merge branch 'master' into jgrpp ... # Conflicts: # src/ai/ai_core.cpp # src/ai/ai_gui.cpp # src/ai/ai_instance.cpp # src/console_cmds.cpp # src/engine_type.h # src/game/game_gui.cpp # src/game/game_instance.cpp # src/goal.cpp # src/goal_cmd.h # src/lang/english.txt # src/lang/estonian.txt # src/network/network_client.cpp # src/newgrf.cpp # src/newgrf_generic.h # src/openttd.cpp # src/saveload/saveload.h # src/script/api/script_log.cpp # src/script/api/script_town.cpp # src/settings_table.cpp # src/station_cmd.cpp # src/station_cmd.h # src/station_map.h # src/strings.cpp # src/table/settings/difficulty_settings.ini # src/table/settings/gui_settings.ini # src/tbtr_template_gui_main.h # src/timetable_cmd.cpp # src/timetable_cmd.h # src/timetable_gui.cpp # src/town_gui.cpp # src/train_gui.cpp # src/water_cmd.cpp		1 year ago
..
CMakeLists.txt	Merge branch 'master' into jgrpp	1 year ago
ai_widget.h	Codechange: move windows common to AI and GS out of ai_gui	1 year ago
airport_widget.h	…
autoreplace_widget.h	…
bootstrap_widget.h	…
bridge_widget.h	…
build_vehicle_widget.h	Add setting for whether dual pane train purchase window uses combined buttons	2 years ago
cheat_widget.h	…
company_widget.h	…
console_widget.h	…
date_widget.h	…
departures_widget.h	…
depot_widget.h	…
dock_widget.h	…
dropdown.cpp	Merge branch 'master' into jgrpp	2 years ago
dropdown_func.h	…
dropdown_type.h	Merge branch 'master' into jgrpp	2 years ago
dropdown_widget.h	…
engine_widget.h	…
error_widget.h	…
fios_widget.h	…
framerate_widget.h	…
game_widget.h	Codechange: move windows common to AI and GS out of ai_gui	1 year ago
genworld_widget.h	Merge branch 'master' into jgrpp	2 years ago
goal_widget.h	…
graph_widget.h	Feature: [GS] Scriptable league tables (#10001)	2 years ago
group_widget.h	Feature: Add cargo filter support to vehicle list. (#8308)	2 years ago
highscore_widget.h	…
industry_widget.h	Debug: Add GRF inspect window support for cargoes	2 years ago
intro_widget.h	Feature: [UI] Split AI/Game Script configuration windows and add them to world gen window (#10058)	2 years ago
league_widget.h	Feature: [GS] Scriptable league tables (#10001)	2 years ago
link_graph_legend_widget.h	…
main_widget.h	…
misc_widget.h	…
music_widget.h	…
network_chat_widget.h	…
network_content_widget.h	Change: Standardize progress bar layout.	2 years ago
network_widget.h	Change: Standardize progress bar layout.	2 years ago
newgrf_debug_widget.h	Merge branch 'master' into jgrpp	2 years ago
newgrf_widget.h	…
news_widget.h	…
object_widget.h	…
order_widget.h	Order window: Add button to toggle order management button	2 years ago
osk_widget.h	…
plans_widget.h	…
rail_widget.h	…
road_widget.h	…
screenshot_widget.h	…
script_widget.h	Codechange: move windows common to AI and GS out of ai_gui	1 year ago
settings_widget.h	Feature: Variable GUI scale.	2 years ago
sign_widget.h	…
slider.cpp	Fix #10164: Incorrect slider handle position in RTL. (#10175)	2 years ago
slider_func.h	Change: Add optional text labels to slider widget.	2 years ago
smallmap_widget.h	…
station_widget.h	…
statusbar_widget.h	…
story_widget.h	…
subsidy_widget.h	…
terraform_widget.h	…
timetable_widget.h	…
toolbar_widget.h	…
town_widget.h	Merge branch 'master' into jgrpp	2 years ago
transparency_widget.h	…
tree_widget.h	…
vehicle_widget.h	Merge branch 'master' into jgrpp	2 years ago
viewport_widget.h	…
waypoint_widget.h	…