openttd

Files

Jonathan G Rennison 2e06374f6f Merge branch 'master' into jgrpp

# Conflicts:
#	src/build_vehicle_gui.cpp
#	src/company_gui.cpp
#	src/gfx_func.h
#	src/group_gui.cpp
#	src/industry_gui.cpp
#	src/misc_gui.cpp
#	src/news_gui.cpp
#	src/settings_gui.cpp
#	src/ship_gui.cpp
#	src/smallmap_gui.cpp
#	src/station_gui.cpp
#	src/subsidy_gui.cpp
#	src/timetable_gui.cpp
#	src/toolbar_gui.cpp
#	src/town_gui.cpp
#	src/vehicle_gui.cpp
#	src/viewport.cpp
#	src/widget.cpp
#	src/widgets/dropdown.cpp
#	src/window.cpp

2023-12-17 01:16:48 +00:00

CMakeLists.txt

Feature: [UI] Split AI/Game Script configuration windows and add them to world gen window (#10058 )

2022-11-10 21:39:09 +01:00

game_config.cpp

Codechange: use std::string for script info/library finding

2023-05-14 22:54:10 +02:00

game_config.hpp

Codechange: use std::string for script info/library finding

2023-05-14 22:54:10 +02:00

game_core.cpp

Merge branch 'master' into jgrpp