Commit Graph

56973 Commits (305062018918425feaad19330e31e65887320cf2)
 

Author SHA1 Message Date
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
5 months ago
Jonathan G Rennison 02e6925c2a Select zoom layer before doing clipping/offsets in GfxBlitter 5 months ago
Jonathan G Rennison 7dd820fe22 Crash/desync logs: Include non-default settings section 5 months ago
Jonathan G Rennison 2ec4b2a8ca Return end of string pointer in SettingDesc formatters 5 months ago
Jonathan G Rennison b42beecb0d Use array unique_ptr for water regions 5 months ago
Jonathan G Rennison 316d34918f Fix missing water region invalidations for rail with water and water objects 5 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
5 months ago
Jonathan G Rennison a0475b16a0 Zoning window: Refactor string/mode mapping handling 5 months ago
Loïc Guilloux 251008663b Fix #11748: Incorrect clamping of negative service interval values (#11749)
(cherry picked from commit f7bd70baec)
5 months ago
Jonathan G Rennison de91c56ed5 Debug: Add chicken bits for water region invalidation/init 5 months ago
Jonathan G Rennison b45b8e77f3 Add cache checking of water regions 5 months ago
Loïc Guilloux f7bd70baec
Fix #11748: Incorrect clamping of negative service interval values (#11749) 5 months ago
Jonathan G Rennison 39a0e29f90 Move patch label array out of WaterRegion
Use unique_ptr, with no storage for trivial cases
5 months ago
Jonathan G Rennison fdb7d7b930 Move x, y, out of WaterRegion, use a reference wrapper type class 5 months ago
Jonathan G Rennison 985bd99c44 Debug: Add debug zoning overlays for water regions 5 months ago
Jonathan G Rennison 936d636cdd No longer save/load water region invalidation states
Move InitializeWaterRegions to AllocateMap
No longer ForceUpdate in InitializeWaterRegions
5 months ago
Jonathan G Rennison 86b046cd26
Fix: Incorrect assertion in GetTileIndexFromLocalCoordinate (#11747) 5 months ago
Jonathan G Rennison 9206fa1fce Use shift/mask to get water region ID 5 months ago
Jonathan G Rennison 5dd67651a3 Replace tile area in WaterRegion with x, y
Use non-virtual tile iterator
5 months ago
Peter Nelson 8f2266f0ed
Codechange: Use range-for when validating and finalising industries. (#11744) 5 months ago
Jonathan G Rennison c2e1dfcfc1 Adjust various water region types 5 months ago
Jonathan G Rennison 09eefd6e95 Cleanup: Remove unused constant YAPF_SHIP_PATH_CACHE_LENGTH 5 months ago
Jonathan G Rennison c1b421c0c3 Fix: Clear one way state when removing road from road+tram tile 5 months ago
Jonathan G Rennison 45205a4284 Clear ship path cache when performing collision avoidance 5 months ago
Jonathan G Rennison ced7bc54b7 Debug: Show ship path cache in debug window 5 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.
5 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.
5 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.
5 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
5 months ago
Jonathan G Rennison 914b92b21f Merge branch 'master' into jgrpp
Bump savegame for water regions for ship pathfinder
Use ring_buffer for ShipPathCache
5 months ago
Jonathan G Rennison 14db9b2854 Fix loading of pre-selected AIs from config file 5 months ago
Jonathan G Rennison 6492cec113 Merge branch 'master' into jgrpp 5 months ago
Jonathan G Rennison 6eaa3cf7f8 Removing road from combined road/tram tile should clear one way state 5 months ago
Jonathan G Rennison 36776248b9 Do not get one way states when building road stops on tram-only tiles 5 months ago
Jonathan G Rennison a90cbd837e Do not try to display one way markings for tram-only road stops 5 months ago
Jonathan G Rennison c488dae9c8 Fix strings for amount of rivers setting in settings window 5 months ago
Loïc Guilloux c86d918921
Add: [Script] Optional filter parameter to more ScriptXXXList constructors (#11698) 5 months ago
Jonathan G Rennison e0361791fd Used curved instead of square circular area for mapgen water desert removal 5 months ago
Jonathan G Rennison 69f7c3e63b Add function to iterate (curved) circular tile area 5 months ago
Jonathan G Rennison 16b840d86e Increase DateTicks to 64 bits, fix overflow after year 79455 5 months ago
Jonathan G Rennison bd35b0c47c Debug: Log more info in GfxBlitter sprite dimension assert failures 5 months ago
Jonathan G Rennison 5e2ac22ef5 Assert: Add more assert macros for using a simple string as the extra text 5 months ago
Kuhnovic f1e999ec59
Feature: Region-based pathfinder for ships (#10543) 5 months ago
translators 9a7c4dda52 Update: Translations from eints
english (au): 3 changes by krysclarke
english (us): 3 changes by 2TallTyler
chinese (simplified): 5 changes by WenSimEHRP
korean: 3 changes by telk5093
russian: 3 changes by Ln-Wolf
finnish: 3 changes by hpiirai
french: 5 changes by Lishouuu
5 months ago
Tyler Trahan 56dd8497e0
Fix: Use consistent wording on waypoint button tooltip (#11700) 5 months ago
Kaspars Putniņš cfc14a57e1
Add: Latvian Lats currency (#11691) 5 months ago
Jonathan G Rennison 4b48d3b5fe
Fix: String gender scan with SCC_INDUSTRY_NAME (#11697) 5 months ago
Tyler Trahan 948651d086
Fix: Use consistent wording for lorry stations (#11699) 5 months ago
Jonathan G Rennison 61db988a4a Fix time since pickup values in station rating tooltips with day length
See: #625
5 months ago
translators 6bf7a86a04 Update: Translations from eints
english (us): 2 changes by 2TallTyler
korean: 2 changes by telk5093
danish: 2 changes by bscargo
5 months ago