dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
54,210 Commits 1 Branch 0 Tags
07b7cc5652ccd835b7b32f5f8f7812f68fe98ffc
Commit Graph

2894 Commits

Author SHA1 Message Date
glx22
1c0700e0c0 Fix #9624: compilation with RANDOM_DEBUG 2021-10-19 09:05:00 +01:00
Jonathan G Rennison
a9c2c7288a Fix compilation when ENABLE_NETWORK_SYNC_EVERY_FRAME is defined 
This is set by RANDOM_DEBUG

See also: https://github.com/OpenTTD/OpenTTD/issues/9624
 2021-10-19 00:50:05 +01:00
Jonathan G Rennison
544da99102 Merge branch 'master' into jgrpp-beta 
# Conflicts:
#	src/cargopacket.h
#	src/lang/korean.txt
#	src/linkgraph/linkgraph.h
#	src/linkgraph/linkgraphjob.h
#	src/linkgraph/linkgraphschedule.h
#	src/network/network_admin.h
#	src/network/network_func.h
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/order_base.h
#	src/rail_cmd.cpp
#	src/saveload/company_sl.cpp
#	src/saveload/depot_sl.cpp
#	src/saveload/economy_sl.cpp
#	src/saveload/linkgraph_sl.cpp
#	src/saveload/map_sl.cpp
#	src/saveload/newgrf_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/saveload/signs_sl.cpp
#	src/saveload/station_sl.cpp
#	src/saveload/subsidy_sl.cpp
#	src/saveload/town_sl.cpp
#	src/saveload/vehicle_sl.cpp
#	src/script/api/script_object.cpp
#	src/settings.cpp
#	src/string.cpp
#	src/string_func.h
#	src/table/CMakeLists.txt
#	src/table/settings/settings.ini
#	src/viewport_sprite_sorter_sse4.cpp
 2021-10-18 18:01:27 +01:00
Jonathan G Rennison
406b81abb1 Merge branch 'master' into jgrpp-beta 
# Conflicts:
#	src/economy.cpp
#	src/lang/traditional_chinese.txt
#	src/order_gui.cpp
#	src/settings.cpp
#	src/settings_internal.h
#	src/table/company_settings.ini
#	src/table/currency_settings.ini
#	src/table/gameopt_settings.ini
#	src/table/misc_settings.ini
#	src/table/settings.h.preamble
#	src/table/settings.ini
#	src/table/win32_settings.ini
#	src/table/window_settings.ini
 2021-10-18 00:43:50 +01:00
Jonathan G Rennison
784fcbd1e7 Merge branch 'master' into jgrpp-beta 
# Conflicts:
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/table/currency_settings.ini
#	src/table/gameopt_settings.ini
#	src/table/misc_settings.ini
#	src/table/settings.h.preamble
 2021-10-17 22:55:50 +01:00
Charles Pigott
3b7daca832 Change: Don't use 'server address' string in server list when displaying an invite code (#9615) 2021-10-17 18:14:25 +01:00
Jonathan G Rennison
4042480806 Merge branch 'jgrpp' into jgrpp-beta 
# Conflicts:
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/table/company_settings.ini
#	src/table/currency_settings.ini
#	src/table/gameopt_settings.ini
#	src/table/misc_settings.ini
#	src/table/settings.h.preamble
#	src/table/settings.ini
#	src/table/win32_settings.ini
#	src/table/window_settings.ini
 2021-10-08 18:12:04 +01:00
TELK
3e78624965 Fix #9362: Hover in online players window was slightly too big (#9364) 
This causes graphical glitches at the bottom of the window.

(cherry picked from commit 2d0abf5a76)
 2021-10-08 18:11:02 +01:00
Patric Stout
e4ad632989 Add: [Network] Keep the refresh button in lowered state while refreshing (#9600) 
This gives user visual feedback that the refresh is still pending, and
prevents people from clicking again and again thinking nothing is
happening. This is especially true for connections that fall back to
TURN, as that takes a few seconds to kick in.

Additionally, prevent clicking on the button again while a refresh
is pending. This is only delaying a successful result.
 2021-10-03 11:02:28 +02:00
Jonathan G Rennison
fd605e3cf3 Merge branch 'master' into jgrpp-beta 
# Conflicts:
#	.github/workflows/commit-checker.yml
#	src/company_cmd.cpp
#	src/console_cmds.cpp
#	src/crashlog.cpp
#	src/lang/english.txt
#	src/lang/german.txt
#	src/lang/indonesian.txt
#	src/lang/japanese.txt
#	src/lang/korean.txt
#	src/lang/swedish.txt
#	src/linkgraph/linkgraphjob.cpp
#	src/linkgraph/mcf.cpp
#	src/network/core/tcp.cpp
#	src/network/core/tcp.h
#	src/network/core/tcp_game.h
#	src/network/core/udp.h
#	src/network/network.cpp
#	src/network/network_admin.cpp
#	src/network/network_admin.h
#	src/network/network_chat_gui.cpp
#	src/network/network_client.cpp
#	src/network/network_client.h
#	src/network/network_func.h
#	src/network/network_internal.h
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/newgrf.cpp
#	src/newgrf_station.cpp
#	src/order_gui.cpp
#	src/rail_cmd.cpp
#	src/saveload/saveload.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/settings_type.h
#	src/station_cmd.cpp
#	src/stdafx.h
#	src/table/currency_settings.ini
#	src/table/misc_settings.ini
#	src/table/settings.h.preamble
#	src/table/settings.ini
#	src/terraform_cmd.cpp
#	src/timetable_gui.cpp
#	src/train_cmd.cpp
#	src/tree_cmd.cpp
#	src/water_cmd.cpp
 2021-09-27 22:47:23 +01:00
Jonathan G Rennison
0b0d154788 Merge branch 'master' into jgrpp-beta 
# Conflicts:
#	.github/workflows/ci-build.yml
#	src/lang/german.txt
#	src/lang/romanian.txt
#	src/lang/slovak.txt
#	src/lang/turkish.txt
#	src/network/core/address.cpp
#	src/network/core/tcp.h
#	src/network/core/udp.cpp
#	src/network/network.cpp
#	src/network/network_client.cpp
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/network/network_udp.cpp
#	src/openttd.cpp
#	src/saveload/newgrf_sl.cpp
#	src/tree_cmd.cpp
#	src/video/video_driver.hpp
#	src/window.cpp
#	src/window_gui.h
 2021-09-22 21:50:02 +01:00
dP
31cf9e888b Add: [Network] external chat messages for remote admins (#9563) 2021-09-19 23:09:06 +02:00
Patric Stout
d9f8ed7bdf Add: [Network] On join, log the ClientID + IP + Name clearly (#9558) 
Additionally, reword the disconnect to match connect / join messages.

Co-authored-by: Berbe <4251220+Berbe@users.noreply.github.com>
 2021-09-19 21:52:46 +01:00
Jonathan G Rennison
da1ac73c02 Merge commit 'f1dfa661a1898cde06a38ab4cb230c95912b245b' into jgrpp-beta 
# Conflicts:
#	src/lang/estonian.txt
#	src/lang/hungarian.txt
#	src/network/core/game_info.cpp
#	src/network/core/game_info.h
#	src/network/core/packet.h
#	src/network/network.cpp
#	src/network/network_client.cpp
#	src/network/network_server.cpp
#	src/network/network_udp.cpp
#	src/openttd.cpp
#	src/string_func.h
 2021-09-18 22:10:04 +01:00
Jonathan G Rennison
2bd535e834 Merge branch 'master' into jgrpp-beta 
# Conflicts:
#	src/engine_base.h
#	src/gfxinit.cpp
#	src/graph_gui.cpp
#	src/lang/brazilian_portuguese.txt
#	src/lang/dutch.txt
#	src/lang/french.txt
#	src/lang/korean.txt
#	src/lang/norwegian_bokmal.txt
#	src/lang/portuguese.txt
#	src/lang/russian.txt
#	src/lang/spanish.txt
#	src/lang/spanish_MX.txt
#	src/network/core/address.cpp
#	src/network/core/game_info.h
#	src/network/core/os_abstraction.h
#	src/network/core/udp.cpp
#	src/network/network_client.cpp
#	src/network/network_client.h
#	src/network/network_internal.h
#	src/newgrf_engine.cpp
#	src/settings_gui.cpp
#	src/station_cmd.cpp
#	src/string_func.h
#	src/town_gui.cpp
#	src/video/video_driver.cpp
#	src/widget_type.h
 2021-09-18 01:28:57 +01:00
Jonathan G Rennison
7e39d3f24a Support sending extended game info in response to PACKET_CLIENT_GAME_INFO 2021-09-17 23:44:59 +01:00
Jonathan G Rennison
8a0821c96e Merge branch 'master' into jgrpp-beta 
# Conflicts:
#	src/network/core/game_info.h
#	src/network/core/udp.cpp
#	src/network/core/udp.h
#	src/network/network.cpp
#	src/network/network_client.cpp
#	src/network/network_client.h
#	src/network/network_internal.h
#	src/network/network_udp.cpp
 2021-09-17 23:14:35 +01:00
Patric Stout
a8641ea44a Add: support filtering content entries for patchpacks (#9541) 
This changes nothing for us, but allows patchpacks to add the
right pieces of code to start filtering content entries on patchpack
only entries.
 2021-09-11 15:34:46 +02:00
Jonathan G Rennison
b67efb7e38 Add support for retrieving JGRPP-only content from content service 
See: https://github.com/OpenTTD/OpenTTD/pull/9541, 84cba1b8
 2021-09-10 21:44:25 +01:00
Patric Stout
84cba1b842 Add: support filtering content entries for patchpacks 
This changes nothing for us, but allows patchpacks to add the
right pieces of code to start filtering content entries on patchpack
only entries.

(cherry picked from commit 77860bb61e61307e4d9cf869ba62be8ca4d9d9b3)
 2021-09-10 21:24:02 +01:00
Jonathan G Rennison
6e3d023e69 Fix #9535: Maintain a reverse dependency map of network content (#9538) 
Fixes performance issues with dependency lookup when retrieving
content list from the content server.
 2021-09-09 18:06:00 +02:00
Patric Stout
f656b0ae96 Fix: use-after-free after ClientNetworkCoordinatorSocketHandler::CloseAllConnections() (#9534) 
The function clears all stun-handlers. This causes all of those
objects to be destroyed.
A handler can have a pending connecter, which was only killed in
case CloseConnection() was called. This is never the case when
the object is destroyed. In result, the connecter could finish
and cause a use-after-free by calling into the (now deleted)
handler.
 2021-09-05 18:17:39 +02:00
Jonathan G Rennison
fda17d25de Send back a message for rcon and settings_access failures 2021-09-05 16:54:16 +01:00
Jonathan G Rennison
ebab945838 Network content: Maintain a reverse dependency map 
Fixes performance issues with dependency lookup

See: https://github.com/OpenTTD/OpenTTD/issues/9535
 2021-09-04 12:06:44 +01:00
Patric Stout
306726827d Fix a2051bad: SendCmdNames only sent one name per packet (#9528) 
(cherry picked from commit 63116bd59f)
 2021-09-01 23:53:57 +01:00
Rubidium
92559e6f3a Fix #9388: thread unsafe use of NetworkAdminConsole/IConsolePrint 2021-09-01 22:40:44 +02:00
Patric Stout
63116bd59f Fix a2051bad: SendCmdNames only sent one name per packet (#9528) 2021-08-31 21:40:38 +02:00
Patric Stout
d8e870c50c Fix: when DNS didn't resolve any IPs, the debug message was misleading (#9519) 2021-08-28 21:19:53 +02:00
Patric Stout
dc5b7b996c Fix: [Network] show query errors in the server listing instead of error popup (#9506) 
When you are query several servers at once, it is rather unclear
for which server you got a popup. Instead, show any errors on the
server itself.

This is only true for the query-part. Joining a server still gives
an error popup to tell you about any issue.
 2021-08-23 20:16:22 +02:00
Patric Stout
e31b5d3870 Fix #9490: [Network] a full server couldn't be queried either (#9508) 
You can now still query a full server, as long as the maximum
amount of allowed connections isn't reached. This means that as
long as there are not 255 clients connected to a server, you can
always connect to query.
 2021-08-23 19:38:02 +02: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
Patric Stout
47ce306085 Fix c4b700f1: remove left-over debug statement (#9510) 2021-08-23 14:05:37 +02:00
Patric Stout
0d26359b5b Fix: [Network] don't show GameScript " (v0)" for old servers (#9507) 
Old servers don't tell the GameScript they are running, so nothing
should be shown.
All values in NetworkGameInfo initialize as 0/empty, except for GS
version. Someone has to be different from the rest, I guess.
 2021-08-23 12:41:20 +02:00
Patric Stout
4066a07d8f Fix: [Network] crash when last-joined server that is no longer available (#9503) 
If you update the server-list while not having last-joined selected
and it is no longer available, the game crashed.
 2021-08-21 11:56:29 +02:00
Michael Lutz
fff09a4af2 Fix d9c1d18f2: Wrong format string for console disconnect message. 2021-08-19 19:56:00 +02:00
Patric Stout
c4b700f1b0 Fix #9492: show for what server a relay session is being created (#9494) 
Currently it says "the server" which is a bit ambigious. Be more
specific.
 2021-08-18 12:06:14 +02:00
Patric Stout
5da60cef46 Fix: typo in the word "spectator" (tnx Heiki) (#9496) 2021-08-18 12:00:17 +02:00
Patric Stout
5c776f21e7 Fix 6acf204d: crash when showing coordinator-error-messages (#9488) 2021-08-17 19:42:46 +02:00
Patric Stout
6acf204d14 Fix: report reuse of invite-code and switch to local game-type (#9487) 
This prevents two servers battling for the same invite-code. Now
the last one wins.
 2021-08-17 13:35:29 +02:00
dP
2e6a77a78a Fix: connecting with the same name thrice hangs the server (#9485) 2021-08-16 11:09:54 +02:00
Patric Stout
579f393374 Add: open Online Players GUI on starting/joining a server (#9479) 2021-08-15 00:17:10 +02:00
Patric Stout
1ef4d3cf19 Remove: COMPANY_INFO packets and related code (#9475) 2021-08-14 23:24:02 +02:00
Patric Stout
3d55ea2d4d Feature: make "join game" button join the game, instead of first showing a lobby window (#9467) 
Nobody really paid attention to the lobby window, and it completely
missed its purpose. Most people don't even wait for companies to
show up, but just hit "New Company".
This in turn means people create a lot of unneeded companies, while
they "just want to watch the game" or join another company.

Instead, "Join Game" now just joins the game as spectators.
 2021-08-14 23:07:18 +02:00
Patric Stout
db13eebf29 Fix 508e465b: network servers didn't show invite-code / connection-type in Online Players GUI (#9478) 
The selector selects the first widget, which by accident was now only
the server visibility.
 2021-08-14 21:00:30 +02:00
Patric Stout
508e465b59 Add: synchronize server name to clients and display in Online Players GUI (#9472) 2021-08-14 10:19:40 +02:00
Patric Stout
4c1ea4020d Change: remove the ability to control "max spectators" (#9466) 
Soon we will make "join game" join the game as spectator first,
so limiting the amount of spectators makes no sense anymore in
that context. Not sure it ever did make sense.
 2021-08-10 20:03:13 +02:00
Rubidium
1c8f4bfaef Fix #9388: thread unsafe use of NetworkAdminConsole/IConsolePrint 
(cherry picked from commit d7a0e80fc18b689455eaca09883fccbcc722d7e3)

# Conflicts:
#	src/debug.cpp
#	src/debug.h
#	src/table/settings/gui_settings.ini

See: https://github.com/OpenTTD/OpenTTD/pull/9456
 2021-07-26 17:55:19 +01:00
Jonathan G Rennison
63d8f3bdd7 Revert "Fix thread safety issues in network admin socket console logging" 
This reverts commit ad15d4fd8f.
 2021-07-26 14:35:46 +01:00
Rubidium
ba29edb0b3 Cleanup: remove some references to the old master-server 2021-07-21 22:28:51 +02:00
Patric Stout
9cc706847c Fix: crash when joining a server again after a TCP disconnect (#9453) 
"my_client" wasn't always free'd when a game ended. "my_client"
keeps a reference inside the PT_NCLIENT pool. The rest of the
code assumes that when you are not in a game, it can freely
reset this pool.
In result: several ways to trigger a use-after-free.
 2021-07-21 21:55:30 +02:00