dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,365 Commits 1 Branch 0 Tags
15f4e629360dcc645c16a867702e625b0b6fb70a
Commit Graph

3250 Commits

Author SHA1 Message Date
Jonathan G Rennison
15f4e62936 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/network/network.cpp
#	src/pathfinder/yapf/yapf.h
#	src/pathfinder/yapf/yapf_ship.cpp
#	src/saveload/afterload.cpp
#	src/ship_cmd.cpp
#	src/station_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
 2024-07-06 18:24:53 +01:00
Jonathan G Rennison
5dc0bb61ea Test: Check that game packet ID to string mappings are correct/complete 2024-07-03 17:52:20 +01:00
Jonathan G Rennison
7c569b2c83 Fix PACKET_SERVER_MAP_DONE prepending with packet encryption 
Also fix logging of sent encrypted packets
 2024-07-03 02:32:57 +01:00
Jonathan G Rennison
06718b632d Fix TCP game packet ID to string mapping 2024-07-03 02:07:39 +01:00
Jonathan G Rennison
b416a41f8b Fix minor spelling errors 2024-06-17 17:55:45 +01:00
Jonathan G Rennison
c67f14dc88 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/fileio.cpp
#	src/fileio_func.h
#	src/industry_cmd.cpp
#	src/ini.cpp
#	src/openttd.cpp
#	src/os/windows/win32_main.cpp
#	src/settingsgen/settingsgen.cpp
#	src/strgen/strgen.cpp
#	src/strings.cpp
 2024-06-10 22:38:23 +01:00
Jonathan G Rennison
102ba8932e Remove use of non-threadsafe strerror 
Add helper class to use strerror_r or strerror_s
 2024-06-10 20:16:08 +01:00
Jonathan G Rennison
e53998ec01 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/cheat_gui.cpp
#	src/industry_gui.cpp
#	src/linkgraph/linkgraphschedule.cpp
#	src/misc/getoptdata.h
#	src/music/dmusic.cpp
#	src/network/core/os_abstraction.cpp
#	src/newgrf_engine.cpp
#	src/openttd.cpp
#	src/order_gui.cpp
#	src/os/windows/win32.cpp
#	src/pathfinder/npf/queue.cpp
#	src/smallmap_gui.cpp
#	src/strgen/strgen.cpp
 2024-06-08 22:57:36 +01:00
Jonathan G Rennison
0351734729 Fix narrowing warning using packet GetDeserialisationPosition 2024-05-31 23:19:55 +01:00
Jonathan G Rennison
7997430688 Add various missing includes 2024-05-31 23:09:19 +01:00
Jonathan G Rennison
32b8ec34ff Merge branch 'master' into jgrpp 
# Conflicts:
#	src/autoreplace_gui.cpp
#	src/build_vehicle_gui.cpp
#	src/cheat_gui.cpp
#	src/company_gui.cpp
#	src/debug.cpp
#	src/engine_gui.h
#	src/error_gui.cpp
#	src/group_gui.cpp
#	src/industry_cmd.cpp
#	src/industry_gui.cpp
#	src/misc_gui.cpp
#	src/network/network_gui.cpp
#	src/newgrf.cpp
#	src/newgrf_debug_gui.cpp
#	src/newgrf_gui.cpp
#	src/order_gui.cpp
#	src/rail_gui.cpp
#	src/road_gui.cpp
#	src/saveload/saveload.cpp
#	src/screenshot_gui.cpp
#	src/sound/win32_s.cpp
#	src/statusbar_gui.cpp
#	src/strgen/strgen.cpp
#	src/table/newgrf_debug_data.h
#	src/timetable_gui.cpp
#	src/toolbar_gui.cpp
#	src/town_gui.cpp
#	src/vehicle_gui.cpp
#	src/video/sdl2_v.cpp
#	src/video/sdl_v.cpp
#	src/viewport.cpp
 2024-05-31 22:57:16 +01:00
Jonathan G Rennison
853ed272be Merge branch 'master' into jgrpp 
# Conflicts:
#	src/airport_gui.cpp
#	src/blitter/32bpp_optimized.cpp
#	src/blitter/32bpp_simple.cpp
#	src/blitter/32bpp_sse2.cpp
#	src/blitter/8bpp_optimized.cpp
#	src/blitter/8bpp_simple.cpp
#	src/blitter/null.cpp
#	src/build_vehicle_gui.cpp
#	src/company_gui.cpp
#	src/crashlog.cpp
#	src/dropdown.cpp
#	src/dropdown_type.h
#	src/genworld_gui.cpp
#	src/gfx.cpp
#	src/main_gui.cpp
#	src/newgrf_debug_gui.cpp
#	src/news_gui.cpp
#	src/news_type.h
#	src/openttd.cpp
#	src/order_gui.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/signs.cpp
#	src/smallmap_gui.cpp
#	src/spritecache.cpp
#	src/spriteloader/grf.cpp
#	src/texteff.cpp
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/video/opengl.cpp
#	src/viewport.cpp
#	src/waypoint_cmd.cpp
#	src/zoom_type.h
 2024-05-30 17:54:01 +01:00
Jonathan G Rennison
1e9fb74451 Merge branch 'master' into jgrpp 
# Conflicts:
#	.github/workflows/release-windows.yml
#	src/autoreplace_gui.cpp
#	src/cargotype.cpp
#	src/company_base.h
#	src/company_cmd.cpp
#	src/company_gui.cpp
#	src/currency.h
#	src/date_gui.cpp
#	src/dropdown.cpp
#	src/dropdown_func.h
#	src/dropdown_type.h
#	src/game/game_gui.cpp
#	src/genworld.cpp
#	src/genworld_gui.cpp
#	src/ground_vehicle.hpp
#	src/group_gui.cpp
#	src/house.h
#	src/industry_gui.cpp
#	src/network/network_client.cpp
#	src/network/network_server.cpp
#	src/network/network_type.h
#	src/newgrf_class_func.h
#	src/newgrf_house.cpp
#	src/newgrf_roadstop.h
#	src/openttd.cpp
#	src/order_gui.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/screenshot_gui.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/slider.cpp
#	src/smallmap_gui.cpp
#	src/station_cmd.cpp
#	src/stdafx.h
#	src/survey.cpp
#	src/tile_map.h
#	src/town_cmd.cpp
#	src/town_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
 2024-05-28 20:33:35 +01:00
Jonathan G Rennison
cbea3b8b46 Add console command to merge two companies 2024-05-28 20:33:35 +01:00
Jonathan G Rennison
7874fb7a12 Add public key auth support for settings_access console command 2024-05-27 16:24:34 +01:00
Jonathan G Rennison
84a0dd326f Merge branch 'master' into jgrpp 
# Conflicts:
#	src/console_cmds.cpp
#	src/network/core/config.h
#	src/network/core/packet.h
#	src/network/core/tcp.cpp
#	src/network/core/tcp_game.cpp
#	src/network/core/tcp_game.h
#	src/network/network_client.cpp
#	src/network/network_client.h
#	src/network/network_gui.h
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/table/settings/network_secrets_settings.ini
 2024-05-27 16:17:10 +01:00
Jonathan G Rennison
88d7be1d99 Change FormatArrayAsHex to be uppercase by default 
To match upstream
 2024-05-20 18:30:57 +01:00
Jonathan G Rennison
5e971bfc02 Fix abstract filetype not being set for network client join savegames 2024-05-19 18:44:08 +01:00
Rubidium
1d13ac7280 Fix #12655, 4f6d75f: inconsistent state in client list and potential crash after client leaves 
(cherry picked from commit f939e81bf0aef5bdb1cf825536418f17e81b85a3)
 2024-05-19 17:38:36 +01:00
Jonathan G Rennison
fc4ea241b0 Merge branch 'master' into jgrpp 2024-05-07 17:43:49 +01:00
Jonathan G Rennison
18a42664fc Merge branch 'master' into jgrpp 
Remove 'byte' typedef
 2024-05-07 17:21:50 +01:00
Peter Nelson
6de4fa921c Change: Use standard padding for company password window. 
Also use now-established OnResize pattern for setting height of password warning widget.

(cherry picked from commit 0090431e99b8301c9e3ee14fb3435075708294d5)
 2024-05-05 19:20:53 +01:00
Jonathan G Rennison
c5cd598217 Debug: Log number of GRFs at level sl=2 when loading a game 
Add helper to get the number of non-static GRFs in a GRF config
 2024-04-29 20:14:37 +01:00
Jonathan G Rennison
0150f8f570 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/network/network_server.cpp
 2024-04-18 17:37:25 +01:00
Patric Stout
f7bd080015 Codechange: improve desync documentation (#12521) 2024-04-17 20:36:08 +00:00
Patric Stout
07b162ffc4 Codechange: skip all commands of the past during desync replay (#12520) 2024-04-17 20:05:45 +00:00
Patric Stout
a0636d8200 Codechange: use infinite-fast-forward when rerunning command-log (#12519) 2024-04-17 20:01:58 +00:00
Patric Stout
1005c86c62 Codechange: record cache warnings with a "warning" prefix (#12518) 2024-04-17 19:49:55 +00:00
Peter Nelson
4eaeccdaeb Codechange: Introduce FioRemove() to remove files. (#12491) 
New function FioRemove() handles OTTD2FS conversion, and uses std::filesystem::remove instead of unlink, all in one location.
 2024-04-14 23:43:50 +01:00
rubidium42
442daf58da Codechange: replace lengthof with std::size in Windows specific code 2024-04-10 23:17:13 +02:00
Peter Nelson
54be756aae Codechange: Pass NewGRF strings as std::string_view instead of char *. (#12461) 2024-04-09 08:40:27 +01:00
Peter Nelson
de4e00c93f Codechange: Pass by reference to UpdateWidgetSize. (#12457) 
These parameters are always provided and not optional.
 2024-04-09 08:34:45 +01:00
Rubidium
919830db7a Fix: do not use lengthof() for non C-style arrays 
(cherry picked from commit c544a2be0a)
 2024-04-08 18:36:26 +01:00
Peter Nelson
74e09abf76 Codechange: Use dynamic_cast instead of C-cast after FindWindowById. (#12448) 
dynamic_cast was used in most places, but not all.
 2024-04-08 13:26:19 +01:00
Rubidium
c544a2be0a Fix: do not use lengthof() for non C-style arrays 2024-04-06 07:21:31 +02:00
Peter Nelson
7572cfd103 Codechange: Redefine ZOOM_LVL so that ZOOM_LVL_NORMAL is 1x zoom. 
This matches expectations of what normal zoom means.
 2024-04-04 22:27:03 +01:00
Peter Nelson
56cac21086 Codechange: Use functions to create common drop down list items. 2024-04-01 22:33:16 +01:00
Peter Nelson
d683ec0183 Codechange: Move dropdown and slider out of widgets directory. (#12403) 
Also shuffle headers to place widget includes near end.

This leaves the widgets directory solely for defining Widget IDs.
 2024-03-31 19:37:16 +01:00
Rubidium
d5e28a904d Fix fb9d4af: use different nonces for key exchange and stream encryption 2024-03-31 15:14:16 +02:00
Rubidium
8e12bd35ae Fix: server shutdown and newgame packets should be stable 
The server sends shutdown and newgame (reboot) packets to any connected client.
This can be useful, so you can tell clients that are trying to join that the
server is restarting. However, that means that packets can be sent before a
version check has been done.
So, these packets should be in the stable packet range instead of the one that
is unstable and guarded by a version check.
 2024-03-25 22:50:05 +01:00
Rubidium
9aa6669266 Fix: inconsistent check for client authorized status 2024-03-25 22:32:23 +01:00
Rubidium
84bbe235e4 Fix: do not send chat to clients that have not authorized yet 2024-03-25 22:32:23 +01:00
Rubidium
c01bf06ee1 Codefix: some minor errors in tcp-game protocol documentation 2024-03-24 06:40:38 +01:00
Rubidium
a12f166815 Fix: crash to desktop when attempting to join a company while not joined (yet) 
(cherry picked from commit 0f25eaa271)

# Conflicts:
#	src/console_cmds.cpp
 2024-03-23 20:54:42 +00:00
Rubidium
0f25eaa271 Fix: crash to desktop when attempting to join a company while not joined (yet) 2024-03-23 13:33:41 +01:00
Rubidium
f599108c16 Codechange: move 'months_empty' to CompanyProperties 2024-03-23 11:59:34 +01:00
Rubidium
7580eac2d5 Codechange: create helper class for useful NetworkAuthorizedKeys functions 2024-03-18 22:56:58 +01:00
Rubidium
4af089b9be Feature: console command to change authorized keys 2024-03-17 21:21:33 +01:00
Rubidium
b7dfa3eb90 Feature: authorized key authentication for rcon 2024-03-17 20:36:25 +01:00
Rubidium
1cf8799810 Feature: encrypt the connection between game server and client 2024-03-17 19:48:34 +01:00