ece0a43146
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/newgrf_station.cpp
2 years ago
64453cb134
Fix: Incorrect player name in online players window ( #10013 )
2 years ago
dc5e073379
Merge branch 'master' into jgrpp
2 years ago
3937953f72
Fix #9363 : Rebuild client list on reinit event ( #9929 )
2 years ago
ca23e8abcf
Add step console command to advance n ticks
...
Cherry-picked from https://github.com/citymania-org/cmclient
Commit: 5ce2d21223a96934a83b8da43434c7a81f001ef0
2 years ago
7c78b22c48
Show failure reason in message box when network savegame load fails
...
See: #412
2 years ago
ff064e06b8
Fix race between network client disconnect and network window deletion
2 years ago
e49d0b3f29
Add console command to set NewGRF optimiser flags
2 years ago
40708c5b47
Fix #380 : CcAddNewSchDispatchSchedule missing from network callback table
2 years ago
34af4844d1
Merge branch 'master' into jgrpp
2 years ago
148695c571
Fix #9736 : Duplicate multiplayer window opens upon canceling password entry ( #9842 )
2 years ago
c73f578e8c
Codechange: replace magic numbers and C-style arrays with C++-style array for share owners
2 years ago
3892a1e201
Log client ID/name in server desync logs
2 years ago
e993afcd99
Store encrypted company password hashes in server saves
...
Restore when loading back into the server if server has required secret
2 years ago
26eca815d3
Add separate network salt string for company passwords
2 years ago
dda4167edc
Change debug level of network received packet logging
2 years ago
b11bd185e3
Fix #9756 : Network command unpack proc was not generated in all cases.
...
The case where the callback proc takes all command results but not any of
the command parameters was not handled properly.
2 years ago
e67124e174
Change: [Admin] Bump admin port protocol due to command changes.
...
docs/admin_network.md promised that information in an admin packet
is never removed. It does allow the possibility of using a new packet type
for changed data in combination with a bump of the admin port version.
As the recent command handling changes modified the contents of
ADMIN_PACKET_SERVER_CMD_LOGGING, do exactly that.
2 years ago
afc3d71fd0
Codechange: Don't generate CommandPacket unpack functions for invalid cmd/callback combinations.
...
If the arguments of the callback proc don't match with the command parameters,
we can't do the proper command execution anyway. As such, don't even generate
an unpack function in the first place, saving a bit of unnecessary code bloat.
Validate on receive that the cmd/callback combination is supported, rejecting
clients that try to send invalid values.
2 years ago
3e85e833a7
Codechange: Add support for additional command result values.
2 years ago
8503854655
Codechange: Pass unpacked command arguments to command callbacks (except Script).
2 years ago
d85348b1d1
Codechange: Template the command callback function type to allow unpacked arguments.
2 years ago
13528bfcd0
Codechange: Un-bitstuff all remaining commands.
2 years ago
4f3ea3907e
Codechange: Un-bitstuff commands taking a ClientID (i.e. CMD_CLIENT_ID).
2 years ago
ccefa76a46
Codechange: Template DoCommandPInternal.
2 years ago
0f64ee5ce1
Codechange: Template DoCommandP to automagically reflect the parameters of the command proc.
...
When finished, this will allow each command handler to take individually
different parameters, obliviating the need for bit-packing.
2 years ago
a05fd7aa50
Change: [Network] Transfer command data as serialized byte stream without fixed structure.
...
The data will be transmitted as the length followed by the serialized data. This allows the command
data to be different for every command type in the future.
2 years ago
123c7f99c3
Codechange: Move command callback declarations to the cmd header files.
2 years ago
a38bbefe1b
Codechange: Untangle command code, flags and error string for DoCommand*.
2 years ago
549caca39c
Codechange: Move command arguments to the back of the networked command function calls.
2 years ago
0b45103eed
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/network/core/tcp_connect.cpp
3 years ago
ad89601c49
Codechange: do not use all upper case enumerators in a scoped enum
3 years ago
ea4f6bb8b2
Fix #9730 : [Network] connections can use an invalid socket due to a race condition
...
A race condition happens when an IPv6 connection takes more than
250ms to report an error, but does return before the IPv4 connection
is established.
In result, an invalid socket might be used for that connection.
3 years ago
9c36c12c85
Codechange: ensure OnConnect() always gets called with a valid socket ( #9729 )
...
This should already be the case, but now assert()s will tell us
if this isn't.
3 years ago
0cdaa8ef55
Remove use of std::from_chars and <charconv>
...
Replace it with another implementation to avoid compilation issues
on some platforms
3 years ago
3d4261a33a
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/order_cmd.cpp
# src/table/settings/news_display_settings.ini
3 years ago
8c558d74a5
Fix 55a11710: Curly braces need to be double-escaped for (std::)fmt.
3 years ago
80e3397f85
Fix 3a1a915: Every 16th client never reconnects after server restart
3 years ago
9e946d4c5d
Merge branch 'master' into jgrpp-beta
...
# Conflicts:
# src/command.cpp
# src/console_cmds.cpp
# src/group_gui.cpp
# src/lang/catalan.txt
# src/lang/czech.txt
# src/lang/danish.txt
# src/lang/greek.txt
# src/lang/hungarian.txt
# src/lang/irish.txt
# src/lang/japanese.txt
# src/lang/luxembourgish.txt
# src/lang/norwegian_bokmal.txt
# src/lang/romanian.txt
# src/lang/russian.txt
# src/lang/serbian.txt
# src/lang/simplified_chinese.txt
# src/lang/slovak.txt
# src/lang/spanish_MX.txt
# src/lang/swedish.txt
# src/lang/tamil.txt
# src/lang/traditional_chinese.txt
# src/lang/turkish.txt
# src/lang/ukrainian.txt
# src/lang/vietnamese.txt
# src/network/network.cpp
# src/network/network_client.cpp
# src/network/network_func.h
# src/network/network_internal.h
# src/network/network_server.cpp
# src/network/network_server.h
# src/saveload/afterload.cpp
# src/saveload/newgrf_sl.cpp
# src/saveload/saveload.h
# src/script/script_instance.cpp
# src/toolbar_gui.cpp
# src/toolbar_gui.h
# src/vehicle_gui.cpp
# src/widgets/rail_widget.h
# src/widgets/vehicle_widget.h
# src/window.cpp
3 years ago
6611ed5a53
Encode oversize map dimensions in non-extended game info serialisation
...
Use non power of 2 values for sizes >= 64k
3 years ago
eaf5908a0b
Add a constant for SERVER_GAME_INFO_EXTENDED max version
...
Set max version correctly in QueryNetworkGameSocketHandler::SendGameInfo
3 years ago
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
3 years ago
9e1bb3eea7
Merge tag '12.0-beta2' into jgrpp-beta
...
# Conflicts:
# docs/landscape_grid.html
# src/lang/simplified_chinese.txt
# src/network/network_server.cpp
# src/station_cmd.cpp
3 years ago
faf32200cf
Merge tag '12.0-beta1' into jgrpp-beta
...
# Conflicts:
# CMakeLists.txt
# bin/ai/CMakeLists.txt
# bin/game/CMakeLists.txt
# src/build_vehicle_gui.cpp
# src/console_cmds.cpp
# src/core/overflowsafe_type.hpp
# src/fios.cpp
# src/lang/english.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/lang/polish.txt
# src/network/core/game_info.cpp
# src/network/core/game_info.h
# src/network/core/tcp_game.cpp
# src/network/core/tcp_game.h
# src/network/network.cpp
# src/network/network_client.cpp
# src/network/network_client.h
# src/network/network_coordinator.cpp
# src/network/network_gui.cpp
# src/network/network_server.cpp
# src/network/network_server.h
# src/newgrf_engine.cpp
# src/openttd.cpp
# src/rev.cpp.in
# src/settings_type.h
# src/train.h
# src/train_cmd.cpp
3 years ago
f764fcfb1f
Merge branch 'master' into jgrpp-beta
...
# Conflicts:
# src/console_cmds.cpp
# src/debug.cpp
# src/lang/vietnamese.txt
# src/network/core/address.cpp
# src/network/core/address.h
# src/network/core/config.h
# src/network/core/os_abstraction.cpp
# src/network/core/os_abstraction.h
# src/network/core/tcp_listen.h
# src/network/core/udp.cpp
# src/network/core/udp.h
# src/network/network.cpp
# src/network/network_client.cpp
# src/network/network_gamelist.cpp
# src/network/network_server.cpp
# src/network/network_udp.cpp
# src/newgrf.cpp
# src/openttd.cpp
# src/saveload/saveload.h
# src/settings.cpp
# src/settings_table.cpp
# src/settings_type.h
# src/table/settings/network_settings.ini
3 years ago
62afd94b47
Merge branch 'master' into jgrpp-beta
...
# Conflicts:
# src/company_cmd.cpp
# src/economy.cpp
# src/lang/swedish.txt
# src/network/network_command.cpp
# src/news_gui.cpp
# src/saveload/saveload.h
# src/script/api/script_list.cpp
# src/video/cocoa/cocoa_v.mm
# src/video/sdl2_v.cpp
3 years ago
61cc60099a
Merge branch 'jgrpp' into jgrpp-beta
...
# Conflicts:
# src/network/core/packet.cpp
# src/network/core/udp.cpp
3 years ago
4a57625183
Avoid cast warnings in network packet handling
...
See: #307
3 years ago
0842621653
Remove unused _network_udp_mutex
...
See: #307
3 years ago
24c6dfe872
Merge branch 'master' into jgrpp-beta
3 years ago
Jonathan G Rennison
dP
Joel-Milligan
Aaron Katzin
Rubidium
Michael Lutz
Patric Stout