Jonathan G Rennison 5404be172c Merge branch 'master' into jgrpp ...

# Conflicts:
#	src/core/bitmath_func.cpp
#	src/core/bitmath_func.hpp
#	src/core/geometry_type.hpp
#	src/game/game_text.hpp
#	src/graph_gui.cpp
#	src/pathfinder/npf/npf.cpp
#	src/script/api/script_text.cpp
#	src/spritecache.cpp
#	src/track_func.h

2024-01-25 22:36:01 +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

2023-12-23 13:26:55 +00:00

game_gui.cpp

Merge branch 'master' into jgrpp

2024-01-21 23:03:08 +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

Avoid std::set in script version checks

2023-08-19 18:15:34 +01:00

game_info.hpp

Codechange: use std::string for script library category

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

game_instance.cpp

Adding of _t to (u)int types, and WChar to char32_t

2024-01-07 17:20:41 +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 branch 'master' into jgrpp

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

game_text.hpp

Merge branch 'master' into jgrpp

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

game.hpp

Codechange: use fmt::format_to to format the help message

2023-05-20 16:50:03 +02:00