Commit Graph

58419 Commits

Author SHA1 Message Date
Jonathan G Rennison
56356bb761 Change container type for several uses of std::map/std::set 2024-05-30 18:16:13 +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
cb1e41fc88 Remove use of memcmp in CheckCaches 2024-05-29 18:30:54 +01:00
Jonathan G Rennison
2b539a2d37 Fix water infrastructure total when changing owner of object on water 2024-05-28 20:33:35 +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
f2f8692fb2 Add setting to allow track editing to ignore realistic braking restrictions 2024-05-28 17:13:09 +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
effaf6acc4 Allow removing reservation boundary signal in realistic braking
All other operations were permitted so only disallowing removal
was not useful and could be trivially bypassed
2024-05-26 12:13:49 +01:00
Jonathan G Rennison
431a6a1262 Allow sorting by average order occupancy in shared order group mode
See: #698
2024-05-26 11:35:07 +01:00
Jonathan G Rennison
d39bdd352b Merge PR #700 into jgrpp 2024-05-26 10:47:43 +01:00
pvillaverde
dc465000f7 🌐 Update Galician Translations 2024-05-26 2024-05-26 09:29:54 +02:00
Jonathan G Rennison
1d70c781c6 Fix vehicle window showing profit last year in wallclock timekeeping mode 2024-05-23 20:05:18 +01:00
Qwest8K
6dfe5c4da9
Update: Russian translation (#695)
Russian localization update
2024-05-23 16:59:22 +01:00
Jonathan G Rennison
a8d830aa3e Fix signal side when using both sides signal style with no-entry signals 2024-05-21 20:42:49 +01:00
Jonathan G Rennison
a24d72f0d7 Fix flag values in CustomSignalSpriteContextFlags 2024-05-21 20:38:34 +01:00
Jonathan G Rennison
8907b9aa31 Reduce diff with upstream for console command functionality 2024-05-20 19:05:04 +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
48910a8b7d Version: Committing version data for tag: jgrpp-0.59.1 2024-05-20 01:56:46 +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
Jonathan G Rennison
fc5b3b90b4 Remove incorrect assertion as temporary fix for #692
See: https://github.com/OpenTTD/OpenTTD/issues/12651
2024-05-19 17:44:33 +01:00
Rubidium
1d13ac7280 Fix #12655, 4f6d75f: inconsistent state in client list and potential crash after client leaves
(cherry picked from commit f939e81bf0)
2024-05-19 17:38:36 +01:00
Peter Nelson
f62eb72fcb Fix #12685: nullptr dereference when checking for equal loaded/loading groups. (#12686)
Always treat empty groups as non-equal. Given that the case of both being empty is handled earlier, they cannot both be equal and empty.

Additionally if a loaded or loading set are all the same, only add one reference.

(cherry picked from commit 856ec901ca)
2024-05-19 17:36:12 +01:00
Jonathan G Rennison
3df3ed6690 Reduce frequency of brake overheating breakdowns
Decay overheat state more quickly
Avoid double-triggering overheating
Make overheating speed-dependent
2024-05-18 20:56:58 +01:00
Jonathan G Rennison
66d03530dc Adjust handling of vehicle subspeed with realistic braking
In particular when descending a steep slope with insufficient braking
2024-05-18 20:55:27 +01:00
Jonathan G Rennison
6d1f3b673e Fix non-percentage servicing interval when using wallclock mode 2024-05-18 15:00:43 +01:00
Jonathan G Rennison
89902c8ab1 Fix advisory max speed being higher than strict max for reservation end
In GetCurrentMaxSpeedInfoInternal
2024-05-18 09:24:57 +01:00
Jonathan G Rennison
242e87652b Fix setting display for industry cargo scaling 2024-05-14 17:17:45 +01:00
Jonathan G Rennison
b81da24a64 Fix setting default value for industry cargo scaling mode in old saves 2024-05-14 17:14:14 +01:00
Jonathan G Rennison
bdd1d36bd9 Fix road vehicle restart loading at same station when using implicit orders 2024-05-12 22:48:18 +01:00
TELK
b1faf3d39f Update: Korean translation 2024-05-11 09:54:55 +01:00
TELK
d3fc9997d1
Update: Korean translation up to 0.59.0 (#689)
* Update: Korean translation up to 0.59.0

* Update: Korean translation up to fc4ea241

* Update: Korean translation / missing ones
2024-05-09 17:13:20 +01:00
Peter Nelson
d7f029344f Codechange: Don't delete news items or NewGRF window when EffectVehicle is deleted. (#12334)
EffectVehicles never create news and can't be debugged, so searching for news items and windows to delete just wastes time.

(cherry picked from commit 737e3feaf0)
2024-05-08 18:01:51 +01:00
Jonathan G Rennison
fc4ea241b0 Merge branch 'master' into jgrpp 2024-05-07 17:43:49 +01:00
Jonathan G Rennison
6d4f616706 Fix crash when sorting by capacity in autoreplace window
Move capacity cache into GUIList sort parameter

See: #690
2024-05-07 17:41:37 +01:00
Jonathan G Rennison
5e24882c18 Use template specialisation for GUIList parameter reference/init behaviour 2024-05-07 17:34:15 +01:00
Jonathan G Rennison
18a42664fc Merge branch 'master' into jgrpp
Remove 'byte' typedef
2024-05-07 17:21:50 +01:00
Jonathan G Rennison
f1c0f864f5 Add setting to shorten vehicle view status text 2024-05-06 20:00:34 +01:00
Jonathan G Rennison
0a0b42a931 Bump OpenTTD content version to 14.1 2024-05-06 17:54:56 +01:00
Jonathan G Rennison
3e57319c0b Fix SDL keycode to vkey mapping 2024-05-06 17:02:40 +01:00
Jonathan G Rennison
eccffec758 Version: Committing version data for tag: jgrpp-0.59.0 2024-05-05 22:04:55 +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
f993e30850 Take cargo refit into account in build vehicle window capacity sort modes 2024-05-05 12:55:33 +01:00
Jonathan G Rennison
1e5c96ef87 De-duplicate filling TestedEngineDetails in build vehicle windows 2024-05-05 12:38:25 +01:00
Jonathan G Rennison
fe374a1db0 Allow sorting by cargo capacity/running cost in dual pane train purchase window 2024-05-05 12:31:11 +01:00
Jonathan G Rennison
126173a839 Fix text filter in dual-pane purchase window with GRF custom names 2024-05-04 11:40:45 +01:00
Jonathan G Rennison
6dab30f928 Documentation: Remove random_bits variable from road stops (NML) 2024-05-03 21:16:08 +01:00
Jonathan G Rennison
6ef682cf44 Documentation: Fix typo 2024-05-03 20:53:22 +01:00
Jonathan G Rennison
a413ddfd82 Readme: Expand introduction section a bit 2024-05-03 19:02:18 +01:00