Jonathan G Rennison 3436e0a781 Merge branch 'master' into jgrpp ...

# Conflicts:
#	src/error.h
#	src/error_gui.cpp
#	src/linkgraph/linkgraph_gui.cpp
#	src/misc_gui.cpp
#	src/newgrf_gui.cpp
#	src/news_gui.cpp
#	src/rail_cmd.cpp
#	src/saveload/gamelog_sl.cpp
#	src/script/api/script_text.cpp
#	src/script/script_instance.cpp
#	src/statusbar_gui.cpp
#	src/strings.cpp
#	src/strings_func.h
#	src/strings_internal.h
#	src/table/settings/gui_settings.ini
#	src/table/settings/linkgraph_settings.ini
#	src/textbuf_gui.h

2023-11-09 01:55:23 +00:00

..

core

Rename close window functions to match upstream

2023-09-15 21:17:25 +01:00

CMakeLists.txt

Network: Extend post-desync frame sync history

2023-08-28 19:58:17 +01:00

network_admin.cpp

Merge branch 'master' into jgrpp

2023-09-15 20:44:22 +01:00

network_admin.h

Merge branch 'master' into jgrpp-beta

2021-11-03 00:45:12 +00:00

network_base.h

Network: Include frame in client join info

2023-08-28 19:58:17 +01:00

network_chat_gui.cpp

Change window close/deallocation to match upstream

2023-09-17 13:10:21 +01:00

network_client.cpp

Merge branch 'master' into jgrpp

2023-11-09 01:55:23 +00:00

network_client.h

Network: Change protocol for game/rcon/settings password auth

2023-06-15 21:33:41 +01:00

network_command.cpp

Scheduled dispatch: Allow moving dispatch schedules in schedule list

2023-09-23 12:05:05 +01:00

network_content_gui.cpp

Change window close/deallocation to match upstream

2023-09-17 13:10:21 +01:00

network_content_gui.h

Change window close/deallocation to match upstream

2023-09-17 13:10:21 +01:00

network_content.cpp

Rename close window functions to match upstream

2023-09-15 21:17:25 +01:00

network_content.h

Add various missing includes

2023-07-03 23:44:54 +01:00

network_coordinator.cpp

Rename close window functions to match upstream

2023-09-15 21:17:25 +01:00

network_coordinator.h

Codechange: Move includes for common STL headers to stdafx.

2023-05-17 10:14:41 +01:00

network_func.h

Fix NetworkAddChatMessage when MAX_CHAT_MESSAGES is 0

2023-06-16 01:21:38 +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

Add: [Network] Keep the refresh button in lowered state while refreshing (#9600)

2021-10-03 11:02:28 +02:00

network_gui.cpp

Change window close/deallocation to match upstream

2023-09-17 13:10:21 +01:00

network_gui.h

Merge branch 'master' into jgrpp

2023-07-01 02:42:51 +01:00

network_internal.h

Network: Extend post-desync frame sync history

2023-08-28 19:58:17 +01:00

network_query.cpp

Merge branch 'master' into jgrpp-beta

2021-11-03 00:45:12 +00:00

network_query.h

Add various missing includes

2023-07-03 23:44:54 +01:00

network_server.cpp

Merge branch 'master' into jgrpp

2023-09-15 20:44:22 +01:00

network_server.h

Network: Extend post-desync frame sync history

2023-08-28 19:58:17 +01:00

network_stun.cpp

Fix: use-after-free after ClientNetworkCoordinatorSocketHandler::CloseAllConnections() (#9534)

2021-09-05 18:17:39 +02:00

network_stun.h

Fix: use-after-free after ClientNetworkCoordinatorSocketHandler::CloseAllConnections() (#9534)

2021-09-05 18:17:39 +02:00

network_survey.cpp

Merge branch 'master' into jgrpp

2023-09-02 20:48:58 +01:00

network_survey.h

Disable survey unless survey key is defined

2023-07-08 09:47:46 +01:00

network_sync.h

Network: Extend post-desync frame sync history

2023-08-28 19:58:17 +01:00

network_turn.cpp

Codechange: ensure OnConnect() always gets called with a valid socket (#9729)

2021-12-04 18:32:06 +01:00

network_turn.h

Fix: use-after-free after ClientNetworkCoordinatorSocketHandler::CloseAllConnections() (#9534)

2021-09-05 18:17:39 +02:00

network_type.h

Merge branch 'master' into jgrpp-beta

2021-11-03 00:45:12 +00:00

network_udp.cpp

Merge branch 'master' into jgrpp

2023-07-01 02:42:51 +01:00

network_udp.h

Remove: old server listing via Master Server

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

network.cpp

Rename close window functions to match upstream

2023-09-15 21:17:25 +01:00

network.h

Merge branch 'master' into jgrpp

2019-11-12 18:43:10 +00:00