Jonathan G Rennison 15f4e62936 Merge branch 'master' into jgrpp ...

# Conflicts:
#	src/network/network.cpp
#	src/pathfinder/yapf/yapf.h
#	src/pathfinder/yapf/yapf_ship.cpp
#	src/saveload/afterload.cpp
#	src/ship_cmd.cpp
#	src/station_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp

2024-07-06 18:24:53 +01:00

..

core

Test: Check that game packet ID to string mappings are correct/complete

2024-07-03 17:52:20 +01:00

CMakeLists.txt

Merge branch 'master' into jgrpp

2024-05-27 16:17:10 +01:00

network_admin.cpp

Merge branch 'master' into jgrpp

2024-05-27 16:17:10 +01:00

network_admin.h

Fix #10983: [AdminPort] Correct order of messages

2024-02-19 23:11:00 +00:00

network_base.h

Split date types into calendar and economy dates

2024-02-13 21:34:09 +00:00

network_chat_gui.cpp

Add: Basic autocompletion on tab for console commands (#12163)

2024-03-13 21:43:08 +01:00

network_client.cpp

Merge branch 'master' into jgrpp

2024-05-28 20:33:35 +01:00

network_client.h

Merge branch 'master' into jgrpp

2024-05-27 16:17:10 +01:00

network_command.cpp

Merge branch 'master' into jgrpp

2024-05-07 17:21:50 +01:00

network_content_gui.cpp

Merge branch 'master' into jgrpp

2024-05-31 22:57:16 +01:00

network_content_gui.h

Merge branch 'master' into jgrpp

2024-05-31 22:57:16 +01:00

network_content.cpp

Merge branch 'master' into jgrpp

2024-06-10 22:38:23 +01:00

network_content.h

Merge branch 'master' into jgrpp

2024-02-19 23:11:00 +00:00

network_coordinator.cpp

Merge branch 'master' into jgrpp

2024-05-27 16:17:10 +01:00

network_coordinator.h

Merge tag '14.0-beta3' into jgrpp

2024-02-19 17:57:05 +00:00

network_crypto_internal.h

Add various missing includes

2024-05-31 23:09:19 +01:00

network_crypto.cpp

Merge branch 'master' into jgrpp

2024-05-28 20:33:35 +01:00

network_crypto.h

Fix fb9d4af: use different nonces for key exchange and stream encryption

2024-03-31 15:14:16 +02:00

network_func.h

Merge branch 'master' into jgrpp

2024-07-06 18:24:53 +01:00

network_gamelist.cpp

Codechange: make the MD5 hash/digest/checksum variables a std::array

2023-05-19 11:24:44 +02:00

network_gamelist.h

Codechange: workaround CMake/Xcode duplicate file name issue (#11186)

2023-09-02 19:46:52 +02:00

network_gui.cpp

Merge branch 'master' into jgrpp

2024-05-31 22:57:16 +01:00

network_gui.h

Merge branch 'master' into jgrpp

2024-05-27 16:17:10 +01:00

network_internal.h

Merge branch 'master' into jgrpp

2024-07-06 18:24:53 +01:00

network_query.cpp

Merge branch 'master' into jgrpp

2024-05-27 16:17:10 +01:00

network_query.h

Merge tag '14.0-beta3' into jgrpp

2024-02-19 17:57:05 +00:00

network_server.cpp

Fix PACKET_SERVER_MAP_DONE prepending with packet encryption

2024-07-03 02:32:57 +01:00

network_server.h

Merge branch 'master' into jgrpp

2024-05-27 16:17:10 +01:00

network_stun.cpp

Merge branch 'master' into jgrpp

2024-05-27 16:17:10 +01:00

network_stun.h

Merge branch 'master' into jgrpp

2024-02-09 18:50:49 +00:00

network_survey.cpp

Merge branch 'master' into jgrpp

2024-03-16 18:06:09 +00:00

network_survey.h

Merge branch 'master' into jgrpp

2024-01-05 22:11:28 +00:00

network_sync.h

Include dates and tick counters in state checksum

2024-02-20 18:26:18 +00:00

network_turn.cpp

Merge branch 'master' into jgrpp

2024-05-27 16:17:10 +01:00

network_turn.h

Merge tag '14.0-beta3' into jgrpp

2024-02-19 17:57:05 +00:00

network_type.h

Merge branch 'master' into jgrpp

2024-05-31 22:57:16 +01:00

network_udp.cpp

Merge branch 'master' into jgrpp

2024-05-27 16:17:10 +01:00

network_udp.h

Remove: old server listing via Master Server

2021-07-10 20:17:07 +02:00

network.cpp

Merge branch 'master' into jgrpp

2024-07-06 18:24:53 +01:00

network.h

Add helper functions for network settings admin state

2024-02-27 18:11:13 +00:00