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 75dd135e8d Merge tag '14.0-beta3' into jgrpp ... # Conflicts: # regression/regression/result.txt # src/industrytype.h # src/network/core/config.h # src/network/core/network_game_info.cpp # src/network/core/network_game_info.h # src/network/core/packet.cpp # src/network/core/packet.h # src/network/core/tcp.cpp # src/network/core/tcp.h # src/network/core/tcp_admin.cpp # src/network/core/tcp_content.cpp # src/network/core/tcp_coordinator.cpp # src/network/core/tcp_game.cpp # src/network/core/tcp_game.h # src/network/core/tcp_turn.cpp # src/network/core/udp.cpp # src/network/core/udp.h # src/network/network_admin.cpp # src/network/network_client.cpp # src/network/network_client.h # src/network/network_command.cpp # src/network/network_content.cpp # src/network/network_internal.h # src/network/network_query.cpp # src/network/network_query.h # src/network/network_server.cpp # src/network/network_server.h # src/network/network_turn.cpp # src/network/network_udp.cpp # src/rail_gui.cpp # src/road_gui.cpp		3 months ago
..
api	Merge tag '14.0-beta3' into jgrpp	3 months ago
CMakeLists.txt	…
script_config.cpp	Merge branch 'master' into jgrpp	3 months ago
script_config.hpp	Merge tag '14.0-beta1' into jgrpp	3 months ago
script_fatalerror.hpp	…
script_gui.cpp	Merge branch 'master' into jgrpp	3 months ago
script_gui.h	Change: Allow opening multiple script debug windows by holding Ctrl.	5 months ago
script_info.cpp	Merge tag '14.0-beta1' into jgrpp	3 months ago
script_info.hpp	Merge branch 'master' into jgrpp	11 months ago
script_info_dummy.cpp	Use core/format.hpp for fmt includes	10 months ago
script_instance.cpp	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
script_instance.hpp	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
script_scanner.cpp	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
script_scanner.hpp	…
script_storage.hpp	Add: AI/GS Time Mode to choose between economy (default) and calendar time (#11603)	3 months ago
script_suspend.hpp	…
squirrel.cpp	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
squirrel.hpp	Merge branch 'master' into jgrpp	11 months ago
squirrel_class.hpp	…
squirrel_helper.hpp	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
squirrel_helper_type.hpp	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
squirrel_std.cpp	Merge branch 'master' into jgrpp	11 months ago
squirrel_std.hpp	…