515f33b84d
Remove unnecessary IO stream includes/uses
3 weeks ago
f75f9f11de
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/CMakeLists.txt
# src/network/network_server.cpp
# src/newgrf.cpp
# src/newgrf_class.h
# src/newgrf_class_func.h
# src/newgrf_object.h
# src/object_gui.cpp
# src/openttd.cpp
# src/pathfinder/aystar.cpp
# src/rail_gui.cpp
# src/road_gui.cpp
# src/saveload/station_sl.cpp
# src/script/api/script_rail.cpp
# src/settings.cpp
# src/table/object_land.h
# src/widgets/CMakeLists.txt
1 month ago
e2510b4627
Merge branch 'master' into jgrpp
...
Company password removal/pubkey access: mostly skipped
# Conflicts:
# src/company_cmd.h
# src/network/core/tcp_game.h
# src/network/network_server.cpp
# src/saveload/saveload.h
1 month ago
7dd8729a33
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/cachecheck.cpp
# src/network/network.cpp
# src/openttd.cpp
# src/pathfinder/follow_track.hpp
# src/saveload/saveload.cpp
# src/textfile_gui.cpp
1 month ago
5b36c1db11
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/bridge_gui.cpp
# src/build_vehicle_gui.cpp
# src/core/geometry_func.hpp
# src/disaster_vehicle.cpp
# src/dropdown.cpp
# src/dropdown_func.h
# src/engine_gui.h
# src/genworld_gui.cpp
# src/industry_cmd.cpp
# src/industrytype.h
# src/network/network_content.cpp
# src/newgrf.cpp
# src/newgrf_airport.h
# src/newgrf_engine.cpp
# src/order_gui.cpp
# src/pathfinder/water_regions.cpp
# src/saveload/town_sl.cpp
# src/slider_func.h
# src/station_cmd.cpp
# src/station_gui.cpp
# src/table/airport_defaults.h
# src/tilematrix_type.hpp
# src/vehicle_gui.cpp
# src/vehicle_gui_base.h
# src/video/sdl_v.cpp
1 month ago
37b129c3c0
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/effectvehicle.cpp
# src/fileio.cpp
# src/gfx.cpp
# src/newgrf_commons.h
# src/road_gui.cpp
# src/saveload/gamelog_sl.cpp
# src/saveload/saveload.cpp
# src/settings_gui.cpp
# src/settings_internal.h
# src/settings_table.cpp
# src/signs_gui.cpp
# src/smallmap_gui.cpp
# src/sortlist_type.h
# src/table/settings.h.preamble
# src/table/settings/company_settings.ini
# src/table/settings/currency_settings.ini
# src/table/settings/difficulty_settings.ini
# src/table/settings/economy_settings.ini
# src/table/settings/game_settings.ini
# src/table/settings/gui_settings.ini
# src/table/settings/linkgraph_settings.ini
# src/table/settings/locale_settings.ini
# src/table/settings/misc_settings.ini
# src/table/settings/multimedia_settings.ini
# src/table/settings/network_private_settings.ini
# src/table/settings/network_settings.ini
# src/table/settings/news_display_settings.ini
# src/table/settings/old_gameopt_settings.ini
# src/table/settings/pathfinding_settings.ini
# src/table/settings/script_settings.ini
# src/table/settings/win32_settings.ini
# src/table/settings/window_settings.ini
# src/table/settings/world_settings.ini
# src/vehicle_gui.cpp
# src/vehiclelist.cpp
# src/video/opengl.cpp
# src/viewport.cpp
1 month ago
f88568eba1
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/cargotype.cpp
# src/company_base.h
# src/company_gui.cpp
# src/core/pool_func.hpp
# src/core/pool_type.hpp
# src/graph_gui.cpp
# src/industry_gui.cpp
# src/ini_load.cpp
# src/landscape.cpp
# src/linkgraph/linkgraph_gui.cpp
# src/network/core/packet.cpp
# src/network/core/udp.cpp
# src/newgrf.cpp
# src/newgrf_gui.cpp
# src/newgrf_station.cpp
# src/order_base.h
# src/order_cmd.cpp
# src/order_gui.cpp
# src/os/unix/unix.cpp
# src/rail_gui.cpp
# src/saveload/industry_sl.cpp
# src/saveload/station_sl.cpp
# src/screenshot.cpp
# src/settings_gui.cpp
# src/sl/oldloader_sl.cpp
# src/station_cmd.cpp
# src/station_gui.cpp
# src/town.h
# src/town_cmd.cpp
# src/town_gui.cpp
# src/vehicle_gui.cpp
# src/viewport.cpp
# src/viewport_sprite_sorter_sse4.cpp
# src/waypoint_gui.cpp
2 months ago
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
3 months ago
5dc0bb61ea
Test: Check that game packet ID to string mappings are correct/complete
3 months ago
7c569b2c83
Fix PACKET_SERVER_MAP_DONE prepending with packet encryption
...
Also fix logging of sent encrypted packets
3 months ago
06718b632d
Fix TCP game packet ID to string mapping
3 months ago
b416a41f8b
Fix minor spelling errors
3 months ago
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
3 months ago
102ba8932e
Remove use of non-threadsafe strerror
...
Add helper class to use strerror_r or strerror_s
3 months ago
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
4 months ago
0351734729
Fix narrowing warning using packet GetDeserialisationPosition
4 months ago
7997430688
Add various missing includes
4 months ago
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
4 months ago
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
4 months ago
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
4 months ago
cbea3b8b46
Add console command to merge two companies
4 months ago
7874fb7a12
Add public key auth support for settings_access console command
4 months ago
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
4 months ago
88d7be1d99
Change FormatArrayAsHex to be uppercase by default
...
To match upstream
4 months ago
5e971bfc02
Fix abstract filetype not being set for network client join savegames
4 months ago
1d13ac7280
Fix #12655 , 4f6d75f: inconsistent state in client list and potential crash after client leaves
...
(cherry picked from commit f939e81bf0
4 months ago
486af1a6fc
Fix: [Admin] #12411 Send Network Welcome Packet to admin port after game creation completed
...
WelcomeAll moved into NetworkOnGameStart
Signed-off-by: Muxy <muxy@goulp.net>
4 months ago
f939e81bf0
Fix #12655 , 4f6d75f: inconsistent state in client list and potential crash after client leaves
4 months ago
a313676189
Doc: reason for using ::SendNet over ::Post in few cases
5 months ago
ed888c617b
Codechange: just use ::Post over ::SendNet for creating new companies
5 months ago
fc4ea241b0
Merge branch 'master' into jgrpp
5 months ago
18a42664fc
Merge branch 'master' into jgrpp
...
Remove 'byte' typedef
5 months ago
849d1fa1b3
Cleanup: remove UI for asking user for company password
5 months ago
457d51fc49
Cleanup: remove company password hashing and anything related to it
5 months ago
a9318cf653
Cleanup: remove UI for changing the password
5 months ago
9dc1fdc385
Cleanup: remove client side password checks when moving to a different company
5 months ago
16639939e9
Cleanup: remove command line option for company password
5 months ago
ca4bef1504
Cleanup: remove company password related network packets
5 months ago
71fc907584
Change: remove company passwords over client allow lists
5 months ago
a002803d1c
Remove: autoclean_unprotected settings; all companies will be protected
5 months ago
4f3db8eeaf
Feature: authorize specific clients to join network company without password
5 months ago
66354ab9eb
Codechange: introduce allow list infrastructure for companies
5 months ago
b9c894b717
Fix: for GUI network servers, name the first company the same as any other company
5 months ago
455e202e03
Fix: server's client is shown incorrectly in some cases
5 months ago
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)
5 months ago
84ebae0bf5
Codechange: Tweak layout of network client list. ( #12624 )
...
Use PIP spacing instead of spacers and more used of standard WidgetDimensions.
5 months ago
532ce1a907
Codechange: Use Recv/Send_bytes for md5sum. ( #12602 )
...
Use existing functions to handle serialisation of arrays instead of indexed for-loop.
5 months ago
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
5 months ago
33aedc43a5
Codechange: Shrink GUIList vectors less often, reserve before use.
...
After sorting and filter lists for GUI, we often shirnk them to reduce size. However this has very little benefit:
1) The memory has already been allocated, so it doesn't prevent that memory being required.
2) It causes a new allocation and copy when the vector is shrunk, actually using more memory.
3) The list is in window state, so the lifetime is only while the window is open.
4) When a filter is clearer, the original size will be needed again, which will cause another allocation.
In fact it is beneficial to reserve to the known maximum in most cases, so do that instead.
5 months ago
f44d8fa2e4
Codechange: Remove CDECL from filter functions. ( #12578 )
...
These functions are not passed to qsort()...
5 months ago
Jonathan G Rennison
Rubidium
Muxy
Peter Nelson