Commit Graph

57141 Commits (6247d624a323a6d2ab49dad0aedc98d72a98f405)
 

Author SHA1 Message Date
Jonathan G Rennison 8ae1587987 Merge branch 'master' into jgrpp
# Conflicts:
#	src/os/windows/crashlog_win.cpp
#	src/os/windows/font_win32.cpp
#	src/os/windows/win32.cpp
#	src/os/windows/win32.h
#	src/video/win32_v.cpp
#	src/video/win32_v.h
6 months ago
Loïc Guilloux 03df70ce8a
Fix #11752: [Win32] Wrong multi-line text layout due to incorrect partial run handling (#11761) 6 months ago
Jonathan G Rennison 0436dd1abe Move instead of copy town list into ShowSelectTownWindow 6 months ago
Jonathan G Rennison 394cf1bf9b Fix incorrect town distance sorting in scenario editor house picker town selector
See #628
6 months ago
Jonathan G Rennison 78e08d5711 Add setting text/warnings about why YAPF is recommended for trains 6 months ago
Jonathan G Rennison a0861347db Settings: Move advise default flag/functionality to guiproc 6 months ago
Jonathan G Rennison 411f5b2ca2 Change default for purchase land area permitted setting to allow by area 6 months ago
Loïc Guilloux 28efa65e0c
Revert a2edf52: SQOpsLimiter does a more precise job (#11754) 6 months ago
Jonathan G Rennison 1101b04371 Fix: Build button text when train purchase window using "Engines" filter 6 months ago
Rubidium 32ab765792 Fix #11485: new run on same line must not use last_space of previous run as cut-off point
Use the start of the next run instead as the location of the last space.
6 months ago
Patric Stout b1812751e0
Fix: [CI] unbreak Linux releases by using a slightly older rust-cache action (#11758)
The maintainer bumped node16 -> node20 in a patch version, which
is a bit awkward for us, as we can't run node20 in this workflow
(yet). Most other actions used a major version for that, and for
similar reasons we cannot upgrade "download-artifact" to v4.

This is a temporary solution, while we start looking into how to
support node20 in this workflow.
6 months ago
Jonathan G Rennison e1c9de2318 Improve handling of conditional orders with vehicle route lines 6 months ago
Jonathan G Rennison 44f0875924 Fix 30506201: Train purchase in dual pane window for non-cargo filters 6 months ago
Jonathan G Rennison 041f36d565 Add try to acquire slot order subtype 6 months ago
Jonathan G Rennison 2fc631b15b Rename OT_RELEASE_SLOT to OT_SLOT, use a subtype field 6 months ago
translators 94d31864b3 Update: Translations from eints
chinese (simplified): 16 changes by WenSimEHRP
arabic (egypt): 23 changes by AviationGamerX
korean: 1 change by telk5093
portuguese (brazilian): 10 changes by pasantoro
polish: 4 changes by pAter-exe
6 months ago
Jonathan G Rennison 6140431427 Adjust German translations of "slot"
See #627
6 months ago
Jonathan G Rennison 3050620189 Merge branch 'master' into jgrpp
# Conflicts:
#	src/autoreplace_cmd.cpp
#	src/build_vehicle_gui.cpp
#	src/cargotype.cpp
#	src/economy.cpp
#	src/engine_gui.cpp
#	src/industry_cmd.cpp
#	src/industry_gui.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/linkgraph/refresh.cpp
#	src/linkgraph/refresh.h
#	src/newgrf.cpp
#	src/newgrf_airporttiles.h
#	src/newgrf_roadstop.cpp
#	src/newgrf_station.cpp
#	src/newgrf_station.h
#	src/order_base.h
#	src/order_cmd.cpp
#	src/order_func.h
#	src/order_gui.cpp
#	src/pathfinder/pathfinder_type.h
#	src/saveload/afterload.cpp
#	src/subsidy_base.h
#	src/vehicle_cmd.cpp
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
6 months ago
Jonathan G Rennison 02e6925c2a Select zoom layer before doing clipping/offsets in GfxBlitter 6 months ago
Jonathan G Rennison 7dd820fe22 Crash/desync logs: Include non-default settings section 6 months ago
Jonathan G Rennison 2ec4b2a8ca Return end of string pointer in SettingDesc formatters 6 months ago
Patric Stout d3ee045c2d
Codechange: refactor the Windows-only DllLoader in a cross-platform LibraryLoader (#11751) 6 months ago
Jonathan G Rennison b42beecb0d Use array unique_ptr for water regions 6 months ago
Jonathan G Rennison 316d34918f Fix missing water region invalidations for rail with water and water objects 6 months ago
Jonathan G Rennison 1914c11459 Debug: Use zoning dropdown for debug zoning modes
Control visibility using misc_debug 2, instead of controlling
debug modes themselves using misc_debug
6 months ago
Jonathan G Rennison a0475b16a0 Zoning window: Refactor string/mode mapping handling 6 months ago
Loïc Guilloux 251008663b Fix #11748: Incorrect clamping of negative service interval values (#11749)
(cherry picked from commit f7bd70baec)
6 months ago
Jonathan G Rennison de91c56ed5 Debug: Add chicken bits for water region invalidation/init 6 months ago
Jonathan G Rennison b45b8e77f3 Add cache checking of water regions 6 months ago
Loïc Guilloux f7bd70baec
Fix #11748: Incorrect clamping of negative service interval values (#11749) 6 months ago
Jonathan G Rennison 39a0e29f90 Move patch label array out of WaterRegion
Use unique_ptr, with no storage for trivial cases
6 months ago
Jonathan G Rennison fdb7d7b930 Move x, y, out of WaterRegion, use a reference wrapper type class 6 months ago
Jonathan G Rennison 985bd99c44 Debug: Add debug zoning overlays for water regions 6 months ago
Jonathan G Rennison 936d636cdd No longer save/load water region invalidation states
Move InitializeWaterRegions to AllocateMap
No longer ForceUpdate in InitializeWaterRegions
6 months ago
Jonathan G Rennison 86b046cd26
Fix: Incorrect assertion in GetTileIndexFromLocalCoordinate (#11747) 6 months ago
Jonathan G Rennison 9206fa1fce Use shift/mask to get water region ID 6 months ago
Jonathan G Rennison 5dd67651a3 Replace tile area in WaterRegion with x, y
Use non-virtual tile iterator
6 months ago
Peter Nelson 8f2266f0ed
Codechange: Use range-for when validating and finalising industries. (#11744) 6 months ago
Jonathan G Rennison c2e1dfcfc1 Adjust various water region types 6 months ago
Jonathan G Rennison 09eefd6e95 Cleanup: Remove unused constant YAPF_SHIP_PATH_CACHE_LENGTH 6 months ago
Jonathan G Rennison c1b421c0c3 Fix: Clear one way state when removing road from road+tram tile 6 months ago
Jonathan G Rennison 45205a4284 Clear ship path cache when performing collision avoidance 6 months ago
Jonathan G Rennison ced7bc54b7 Debug: Show ship path cache in debug window 6 months ago
Peter Nelson 97e2bc612c Codechange: Rename and move SpriteGroup-specific cargo types into a namespace.
These 'cargo types' have special defined uses and must not be used elsewhere. This makes it clearer that they are special.
6 months ago
Peter Nelson 400ae65ff2 Codechange: Redefine some cargo-related values in terms of CargoID instead of CargoType.
Values used as special filter types are now defined as offsets from NUM_CARGO instead of confusingly reusing CARGO_NO_REFIT/CARGO_AUTO_REFIT types.
6 months ago
Peter Nelson 952d111b94 Codechange: Split CT_INVALID into CT_INVALID and INVALID_CARGO.
INVALID_CARGO is a CargoID and should be used for most purposes in game.
CT_INVALID is a CargoType used for defining default properties.
6 months ago
translators 4fd986bd07 Update: Translations from eints
english (au): 7 changes by krysclarke
english (us): 7 changes by 2TallTyler
chinese (simplified): 6 changes by WenSimEHRP
serbian: 39 changes by DoLoop216
russian: 3 changes by Ln-Wolf
finnish: 4 changes by hpiirai
portuguese: 10 changes by azulcosta
polish: 34 changes by pAter-exe
6 months ago
Jonathan G Rennison 914b92b21f Merge branch 'master' into jgrpp
Bump savegame for water regions for ship pathfinder
Use ring_buffer for ShipPathCache
6 months ago
Jonathan G Rennison 14db9b2854 Fix loading of pre-selected AIs from config file 6 months ago
Jonathan G Rennison 6492cec113 Merge branch 'master' into jgrpp 6 months ago