Jonathan G Rennison 0e76f774eb Merge branch 'master' into jgrpp ...

# Conflicts:
#	src/landscape.cpp
#	src/landscape.h
#	src/misc_gui.cpp
#	src/newgrf_commons.cpp
#	src/order_cmd.cpp
#	src/pathfinder/yapf/yapf_base.hpp
#	src/station_cmd.cpp
#	src/tunnelbridge_cmd.cpp
#	src/vehicle.cpp
#	src/water_cmd.cpp
#	src/window.cpp

2024-03-09 21:44:36 +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

2024-03-09 21:44:36 +00:00

game_gui.cpp

Merge branch 'master' into jgrpp

2024-03-09 21:44:36 +00:00

game_gui.hpp

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_info.cpp

Merge branch 'master' into jgrpp

2024-02-26 18:19:34 +00:00

game_info.hpp

Codechange: use std::string for script library category

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

game_instance.cpp

Fix: [Script] Only show debug script window at the end of savegame loading (#12135)

2024-02-21 00:17:16 +00:00

game_instance.hpp

Merge branch 'master' into jgrpp

2023-07-01 02:42:51 +01:00

game_scanner.cpp

Merge branch 'master' into jgrpp

2023-11-25 13:30:06 +00:00

game_scanner.hpp

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

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

game_text.cpp

Merge tag '14.0-beta1' into jgrpp

2024-02-18 22:22:29 +00:00

game_text.hpp

Merge branch 'master' into jgrpp

2024-01-25 22:36:01 +00:00

game.hpp

Merge branch 'master' into jgrpp

2024-03-09 21:44:36 +00:00