Jonathan G Rennison
88d7be1d99
Change FormatArrayAsHex to be uppercase by default
...
To match upstream
14 hours ago
Jonathan G Rennison
5e971bfc02
Fix abstract filetype not being set for network client join savegames
2 days ago
Rubidium
1d13ac7280
Fix #12655 , 4f6d75f: inconsistent state in client list and potential crash after client leaves
...
(cherry picked from commit f939e81bf0
)
2 days ago
Jonathan G Rennison
fc4ea241b0
Merge branch 'master' into jgrpp
2 weeks ago
Jonathan G Rennison
18a42664fc
Merge branch 'master' into jgrpp
...
Remove 'byte' typedef
2 weeks ago
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)
2 weeks ago
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
3 weeks ago
Jonathan G Rennison
0150f8f570
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/network/network_server.cpp
1 month ago
Rubidium
919830db7a
Fix: do not use lengthof() for non C-style arrays
...
(cherry picked from commit c544a2be0a
)
1 month ago
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
2 months ago
Patric Stout
f08da1d373
Codechange: the "no revision detected" string is with four zeros (norev0000) ( #12328 )
2 months ago
Patric Stout
a3cfd23cf9
Codechange: rename byte to uint8_t ( #12308 )
2 months ago
Jonathan G Rennison
041e71ec05
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/crashlog.cpp
# src/gfx.cpp
# src/network/network_client.cpp
# src/openttd.cpp
# src/openttd.h
# src/saveload/saveload.cpp
# src/survey.cpp
2 months ago
Rubidium
fe12d38024
Codechange: split initiating of joining and identification of the client
2 months ago
Rubidium
15d02f51ed
Codechange: use span to send bytes to Packet and add span recv function
2 months ago
Rubidium
b6c75dec3a
Codechange: explicitly allow only one state in initial handshake/authorization
2 months ago
Rubidium
26d1d5d6e7
Codechange: move decision whether to check NewGRFs to SendNewGRFCheck, just like for sending game/company passwords
2 months ago
Rubidium
6eff879e49
Codechange: pass the socket handler that is going to send the packet into the packet
2 months ago
Rubidium
3c488e1eb8
Codechange: don't check things outside the lock, that could change while waiting on the lock
2 months ago
Rubidium
ec4104ec6c
Codechange: do not pass the socket when the receiver already knows it
2 months ago
Patric Stout
3e625b5b1a
Add: track savegame size to report with survey ( #12304 )
2 months ago
Ivan Fefer
23d733be95
Add: Basic autocompletion on tab for console commands ( #12163 )
2 months ago
Rubidium
24efdf6ac5
Codefix 363e251: incorrect trace debug message
2 months ago
Rubidium
86cb184eb4
Codechange: use std::source_location over __FILE__ and __LINE__ for WindowDesc
2 months ago
Rubidium
bab5a8a787
Codechange: use std::source_location over __FILE__ and __LINE__ for Backup
2 months ago
Jonathan G Rennison
b04a356f53
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/vehicle.cpp
3 months ago
Patric Stout
7824ae5b59
Fix #12196 : disable "select upgrade" button when filtering
3 months ago
Patric Stout
b307541099
Fix #12196 : always show selected content, even when filtering
3 months ago
Jonathan G Rennison
a816829cd1
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/station_gui.cpp
# src/vehicle_cmd.cpp
# src/vehicle_gui.cpp
3 months ago
Peter Nelson
d4f0f0e2c5
Codechange: Use `GetVisibleRangeIterators()` in more places. ( #12190 )
...
This replaces more first/last index calculation, along with indexed array/vector access, with iterator access instead.
3 months ago
Jonathan G Rennison
55410152a2
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/openttd.cpp
# src/script/api/script_text.cpp
# src/settings_type.h
3 months ago
Jonathan G Rennison
3a301cd986
Add helper functions for network settings admin state
3 months ago
Jonathan G Rennison
828d2146eb
Merge branch 'master' into jgrpp
...
# Conflicts:
# CMakeLists.txt
# bin/ai/CMakeLists.txt
# bin/game/CMakeLists.txt
# src/ai/ai_info.cpp
# src/company_base.h
# src/economy.cpp
# src/game/game_info.cpp
# src/gfx_type.h
# src/linkgraph/linkgraph_gui.cpp
# src/palette.cpp
# src/palette_func.h
# src/saveload/saveload.h
# src/saveload/vehicle_sl.cpp
# src/ship_cmd.cpp
# src/train_cmd.cpp
# src/vehicle_base.h
# src/window.cpp
# src/window_func.h
3 months ago
Jonathan G Rennison
93bf033107
Add whether the vehicle is non-front to the vehicle pool pointer tag
...
Add iteration filters which check this
3 months ago
Peter Nelson
912d7bd80e
Codechange: Give ColourShade values names instead of numbers.
3 months ago
Peter Nelson
ae3390fe48
Codechange: Add ColourShade enum.
3 months ago
Peter Nelson
0463d4c198
Codechange: Remove direct access to _colour_gradient.
...
Access is now through GetColourGradient, which ensures parameters are in range.
3 months ago
Jonathan G Rennison
090656bd7f
Adjust handling of year display in wallclock mode and company inauguration years
...
See: #657
3 months ago
Jonathan G Rennison
c637d376d0
Fix cb588d8d: Ordering of command per tick limit and pause mode filtering ( #12126 )
...
The command per tick limit should be applied after the pause mode filter
3 months ago
Jonathan G Rennison
79388e4207
Include dates and tick counters in state checksum
3 months ago
Damian Laczak
2aa574a48f
Fix #10983 : [AdminPort] Correct order of messages
...
(cherry picked from commit 49c3215751
)
3 months ago
Jonathan G Rennison
a98a56669b
Merge branch 'master' into jgrpp
...
# Conflicts:
# regression/regression/result.txt
# src/autoreplace_cmd.cpp
# src/industry_gui.cpp
# src/landscape.cpp
# src/network/network_content.cpp
# src/newgrf_roadstop.cpp
# src/pathfinder/yapf/yapf_ship.cpp
# src/road_gui.cpp
# src/saveload/ai_sl.cpp
# src/saveload/saveload.h
# src/saveload/vehicle_sl.cpp
# src/station.cpp
# src/station_gui.cpp
# src/video/cocoa/cocoa_ogl.h
# src/video/sdl2_opengl_v.h
# src/video/video_driver.hpp
# src/video/win32_v.h
# src/widget_type.h
# src/widgets/dropdown.cpp
# src/widgets/dropdown_type.h
# src/window.cpp
3 months ago
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
3 months ago
Jonathan G Rennison
8581808952
Merge tag '14.0-beta2' into jgrpp
...
# Conflicts:
# CMakeLists.txt
# src/cargotype.cpp
# src/console_cmds.cpp
# src/graph_gui.cpp
# src/industry_cmd.cpp
# src/industrytype.h
# src/misc_gui.cpp
# src/network/network_client.cpp
# src/newgrf.cpp
# src/newgrf_town.cpp
# src/object_cmd.cpp
# src/openttd.cpp
# src/pathfinder/water_regions.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/table/build_industry.h
# src/table/engines.h
# src/vehicle.cpp
# src/vehicle_cmd.cpp
# src/vehicle_gui.cpp
3 months ago
Jonathan G Rennison
fdd666f66a
Merge tag '14.0-beta1' into jgrpp
...
# Conflicts:
# src/3rdparty/squirrel/squirrel/sqcompiler.cpp
# src/aircraft.h
# src/animated_tile.h
# src/base_consist.h
# src/cargotype.h
# src/company_gui.cpp
# src/console_cmds.cpp
# src/core/overflowsafe_type.hpp
# src/engine_gui.cpp
# src/industry_gui.cpp
# src/lang/english.txt
# src/music/extmidi.cpp
# src/network/core/network_game_info.cpp
# src/network/network_server.cpp
# src/newgrf.cpp
# src/newgrf_industries.cpp
# src/order_base.h
# src/order_cmd.cpp
# src/order_gui.cpp
# src/order_type.h
# src/os/macosx/misc_osx.cpp
# src/os/windows/crashlog_win.cpp
# src/rail_gui.cpp
# src/rail_gui.h
# src/roadveh.h
# src/roadveh_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/company_sl.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/saveload/saveload_error.hpp
# src/script/api/script_town.cpp
# src/settingsgen/settingsgen.cpp
# src/ship.h
# src/ship_cmd.cpp
# src/smallmap_gui.cpp
# src/spritecache.cpp
# src/stdafx.h
# src/strgen/strgen.cpp
# src/strgen/strgen.h
# src/table/settings/script_settings.ini
# src/timetable_cmd.cpp
# src/timetable_gui.cpp
# src/town.h
# src/town_cmd.cpp
# src/town_cmd.h
# src/town_gui.cpp
# src/train.h
# src/train_cmd.cpp
# src/tree_cmd.cpp
# src/vehicle.cpp
# src/vehicle_base.h
# src/vehicle_cmd.cpp
# src/vehicle_gui.cpp
# src/vehiclelist.cpp
# src/waypoint_base.h
# src/widget.cpp
3 months ago
Damian Laczak
49c3215751
Fix #10983 : [AdminPort] Correct order of messages
3 months ago
Jonathan G Rennison
838b166726
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/cheat_gui.cpp
# src/command.cpp
# src/command_func.h
# src/company_base.h
# src/debug.cpp
# src/debug.h
# src/economy.cpp
# src/engine_type.h
# src/graph_gui.cpp
# src/misc_cmd.cpp
# src/misc_cmd.h
# src/network/core/os_abstraction.cpp
# src/openttd.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/settings_type.h
# src/ship_cmd.cpp
# src/stdafx.h
# src/tests/bitmath_func.cpp
# src/town_cmd.cpp
# src/town_gui.cpp
3 months ago
Jonathan G Rennison
86a6f63e2f
Merge branch 'master' into jgrpp
...
# Conflicts:
# .github/workflows/ci-build.yml
# .github/workflows/codeql.yml
# .github/workflows/commit-checker.yml
# .github/workflows/release-linux-legacy.yml
# .github/workflows/release-linux.yml
# .github/workflows/release-macos.yml
# .github/workflows/release-windows-store.yml
# .github/workflows/release-windows.yml
# .github/workflows/upload-cdn.yml
# .github/workflows/upload-gog.yml
# .github/workflows/upload-steam.yml
# src/console_cmds.cpp
# src/core/math_func.hpp
# src/fios.cpp
# src/fios.h
# src/intro_gui.cpp
# src/network/network_server.cpp
# src/openttd.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/settings_internal.h
# src/settings_table.cpp
# src/settings_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/viewport.cpp
# src/viewport_func.h
# src/window.cpp
3 months ago
Jonathan G Rennison
b13b2781bd
Add string codes for upstream wallclock mode, add upstream language changes
3 months ago
Jonathan G Rennison
7ce06e22b8
Split date types into calendar and economy dates
...
See: 735abfe1
3 months ago