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
|
2024-02-19 17:57:05 +00:00 |
|
Rubidium
|
72a44b0df6
|
Codechange: use references for handling received TCP packets
|
2024-02-05 16:30:49 +01:00 |
|
Jonathan G Rennison
|
d75c489466
|
Add various missing includes
|
2023-07-03 23:44:54 +01:00 |
|
Jonathan G Rennison
|
324e90e5ac
|
Merge branch 'master' into jgrpp-beta
# Conflicts:
# src/lang/arabic_egypt.txt
# src/lang/english.txt
# src/lang/greek.txt
# src/network/core/tcp_connect.cpp
# src/network/network_client.cpp
# src/network/network_client.h
# src/pathfinder/npf/npf.cpp
# src/pathfinder/yapf/yapf_ship.cpp
# src/rail_gui.cpp
# src/settings_table.cpp
# src/settings_type.h
# src/station_cmd.cpp
# src/table/settings/gui_settings.ini
# src/town_cmd.cpp
# src/widgets/rail_widget.h
|
2021-11-02 19:23:24 +00:00 |
|
Patric Stout
|
b2f0491a90
|
Fix #9501: [Network] crash when more than one game-info query was pending (#9502)
|
2021-08-23 19:37:51 +02:00 |
|