Jonathan G Rennison 7467051331 Merge branch 'master' into jgrpp ... # Conflicts: # .gitignore # src/network/network_server.cpp # src/vehicle_gui.cpp		2020-07-12 12:29:28 +01:00
..
core	Merge branch 'master' into jgrpp	2020-06-30 21:43:04 +01:00
CMakeLists.txt	Add: introduce CMake for project management	2020-06-05 19:36:05 +02:00
network_admin.cpp
network_admin.h
network_base.h
network_chat_gui.cpp
network_client.cpp	Cheats: Enable setting magic bulldozer, tunnels and jet crashes in multiplayer	2020-04-14 20:41:37 +01:00
network_client.h
network_command.cpp
network_content_gui.cpp	Fix #8024: make online content gui more responsive while loading	2020-06-01 10:59:11 +02:00
network_content_gui.h
network_content.cpp
network_content.h
network_func.h	Merge branch 'master' into jgrpp	2020-02-09 15:43:47 +00:00
network_gamelist.cpp	Codechange: Replace custom linked list for GRF texts with STL vectors and strings.	2020-05-21 20:02:34 +02:00
network_gamelist.h
network_gui.cpp	Merge branch 'master' into jgrpp	2020-06-30 21:43:04 +01:00
network_gui.h
network_internal.h
network_server.cpp	Merge branch 'master' into jgrpp	2020-07-12 12:29:28 +01:00
network_server.h	Network: Use unique_ptr for packets, use deque for packet queues	2020-05-07 20:53:50 +01:00
network_type.h	Merge branch 'master' into jgrpp	2020-04-06 20:58:54 +01:00
network_udp.cpp	Fix: Thread unsafe use of NetworkAddress::GetAddressAsString	2020-06-21 11:47:56 +01:00
network_udp.h
network.cpp	Network: Remove static buffer form of NetworkAddress::GetAddressAsString	2020-05-07 20:53:50 +01:00
network.h