Jonathan G Rennison 82803b98e0 Merge branch 'master' into jgrpp ...

# Conflicts:
#	src/game/game_gui.cpp
#	src/graph_gui.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/newgrf.cpp
#	src/order_gui.cpp
#	src/saveload/engine_sl.cpp
#	src/saveload/saveload.h
#	src/script/api/script_text.cpp
#	src/script/script_gui.cpp
#	src/settings_table.cpp
#	src/strings.cpp
#	src/table/settings/economy_settings.ini
#	src/table/settings/locale_settings.ini
#	src/timetable_gui.cpp

2023-04-10 15:11:53 +01: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

Cleanup: Removed SVN headers

2019-11-10 17:59:20 +00:00

game_config.hpp

Cleanup: Removed SVN headers

2019-11-10 17:59:20 +00:00

game_core.cpp

Merge branch 'master' into jgrpp

2023-02-11 23:05:22 +00:00

game_gui.cpp

Merge branch 'master' into jgrpp

2023-04-10 15:11:53 +01: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

2023-01-02 01:23:36 +00:00

game_info.hpp

Cleanup: Removed SVN headers

2019-11-10 17:59:20 +00:00

game_instance.cpp

Fix: Don't send unused tile field over the network (#10507)

2023-02-24 22:50:11 +01:00

game_instance.hpp

Codechange: Pass unpacked command arguments to command callbacks (except Script).

2021-12-16 22:28:32 +01:00

game_scanner.cpp

Codechange: use C++11 constructs for for-each loops (#8432)

2020-12-25 19:38:18 +01:00

game_scanner.hpp

Cleanup: Removed SVN headers

2019-11-10 17:59:20 +00:00

game_text.cpp

Merge branch 'master' into jgrpp

2023-03-06 01:05:43 +00:00

game_text.hpp

Change: [Script] Improve ScriptText validation error messages

2023-03-05 22:24:08 +01:00

game.hpp

Codechange: move windows common to AI and GS out of ai_gui

2023-02-05 19:27:25 +01:00