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 828d2146eb Merge branch 'master' into jgrpp ... # Conflicts: # CMakeLists.txt # bin/ai/CMakeLists.txt # bin/game/CMakeLists.txt # src/ai/ai_info.cpp # src/company_base.h # src/economy.cpp # src/game/game_info.cpp # src/gfx_type.h # src/linkgraph/linkgraph_gui.cpp # src/palette.cpp # src/palette_func.h # src/saveload/saveload.h # src/saveload/vehicle_sl.cpp # src/ship_cmd.cpp # src/train_cmd.cpp # src/vehicle_base.h # src/window.cpp # src/window_func.h		3 months ago
..
core	Merge branch 'master' into jgrpp	3 months ago
CMakeLists.txt	Network: Extend post-desync frame sync history	9 months ago
network.cpp	Include dates and tick counters in state checksum	3 months ago
network.h	…
network_admin.cpp	Adjust handling of year display in wallclock mode and company inauguration years	3 months ago
network_admin.h	Fix #10983: [AdminPort] Correct order of messages	3 months ago
network_base.h	Split date types into calendar and economy dates	3 months ago
network_chat_gui.cpp	Merge tag '14.0-beta1' into jgrpp	3 months ago
network_client.cpp	Merge branch 'master' into jgrpp	3 months ago
network_client.h	Merge tag '14.0-beta3' into jgrpp	3 months ago
network_command.cpp	Fix cb588d8d: Ordering of command per tick limit and pause mode filtering (#12126)	3 months ago
network_content.cpp	Merge branch 'master' into jgrpp	3 months ago
network_content.h	Merge branch 'master' into jgrpp	3 months ago
network_content_gui.cpp	Merge branch 'master' into jgrpp	3 months ago
network_content_gui.h	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
network_coordinator.cpp	Merge tag '14.0-beta3' into jgrpp	3 months ago
network_coordinator.h	Merge tag '14.0-beta3' into jgrpp	3 months ago
network_func.h	Split date types into calendar and economy dates	3 months ago
network_gamelist.cpp	Codechange: make the MD5 hash/digest/checksum variables a std::array	1 year ago
network_gamelist.h	Codechange: workaround CMake/Xcode duplicate file name issue (#11186)	9 months ago
network_gui.cpp	Merge branch 'master' into jgrpp	3 months ago
network_gui.h	Split date types into calendar and economy dates	3 months ago
network_internal.h	Merge tag '14.0-beta3' into jgrpp	3 months ago
network_query.cpp	Merge tag '14.0-beta3' into jgrpp	3 months ago
network_query.h	Merge tag '14.0-beta3' into jgrpp	3 months ago
network_server.cpp	Add whether the vehicle is non-front to the vehicle pool pointer tag	3 months ago
network_server.h	Merge tag '14.0-beta3' into jgrpp	3 months ago
network_stun.cpp	Merge tag '14.0-beta3' into jgrpp	3 months ago
network_stun.h	Merge branch 'master' into jgrpp	3 months ago
network_survey.cpp	Merge branch 'master' into jgrpp	3 months ago
network_survey.h	Merge branch 'master' into jgrpp	5 months ago
network_sync.h	Include dates and tick counters in state checksum	3 months ago
network_turn.cpp	Merge tag '14.0-beta3' into jgrpp	3 months ago
network_turn.h	Merge tag '14.0-beta3' into jgrpp	3 months ago
network_type.h	Merge tag '14.0-beta3' into jgrpp	3 months ago
network_udp.cpp	Merge tag '14.0-beta3' into jgrpp	3 months ago
network_udp.h	…