Commit Graph

42034 Commits (f9f1cb21901e6ce91612735ebf96236c17c89655)

Author SHA1 Message Date
Jonathan G Rennison fa0771979f Add upstream savegame load support for versions 315 1 year ago
Jonathan G Rennison 929dd46fcf Add upstream savegame load support for versions 313 and 314 1 year ago
Michael Lutz e5654a0414 Codechange: Use a dedicated variable for disaster vehicle action state. (#10798)
(cherry picked from commit 72c7536325)
1 year ago
Jonathan G Rennison 2c91866831 Adjust spacing of buttons in cargo payments rate graph 1 year ago
Jonathan G Rennison 2a5a9c2f9d Add by cargo mode to company delivered cargo history graph 1 year ago
Jonathan G Rennison f09dfc79bd Add cargo type filters to company delivered cargo window
Adapted from Citymania
1 year ago
Jonathan G Rennison 43c1b42a2c Revert "Revert "Codechange: Explicitly move a few variables to avoid a copy constructor (fixes warning from clang)""
This reverts commit a99418cb69.
1 year ago
Jonathan G Rennison bc07331056 Remove src/3rdparty/optional 1 year ago
PeterN ab83725d73 Add: NewGRF string code "9A 21" to display force from textstack. (#10782)
(cherry picked from commit 61516627ad)
1 year ago
PeterN 98788e865f Fix #10502: Refit engine before attaching free wagons. (#10926)
Caused by incorrect order of operations when buying a train engine with refit and attaching free wagons.

(cherry picked from commit ee2d0745e9)
1 year ago
Jonathan G Rennison 5c2f9dffe6 Fix compilation error in newgrf_profile console command on some platforms 1 year ago
Peter Nelson b505805bfe Fix: Don't rely on static initialization to set up sprite font caches.
The order of static initialization is undefined, so this can cause initalization
before relevant caches are initializations.

(cherry picked from commit f454ec8d63)
1 year ago
Rubidium dd94b087c4 Fix: multiplication result converted to larger type
Technically unlikely to happen, though uint16 * uint16 get promoted to int and
then stored as uint64; similarly uint * uint16 remains uint and gets stored as
uint64. In both cases the value can get truncated before the change to uint64.

(cherry picked from commit 4a6fdc8293)
1 year ago
Jonathan G Rennison d481d382cb Fix missing include in company_base.h 1 year ago
Jonathan G Rennison 7cce9f934d Fix strncasecmp related compilation errors on MSVC 1 year ago
Jonathan G Rennison ffb4548f1b Fix std::optional related compilation errors on some platforms 1 year ago
Jonathan G Rennison 3d382fe531 Debug: Fix compilation error when using RANDOM_DEBUG 1 year ago
Jonathan G Rennison b84d1bcee4 Cheats window: Fix inflation factor arrow buttons
See: #533, #534
1 year ago
Jonathan G Rennison 61e9c3084f Add picker tool to main toolbar help menu
See: #498

Supports:
* Rail types
* Road/tram types
* Objects
* Rail stations/waypoints
* Road stops/waypoints

Add unset hotkey
1 year ago
Jonathan G Rennison 665a4ca55b Add Window method to change window class
Use in BuildRoadStationWindow
1 year ago
Jonathan G Rennison 6215e326fd Add constants for toolbar help menu items 1 year ago
Jonathan G Rennison 0e94dca563 Fix GetLinkGraphJobDesc for null saveload conv settings 1 year ago
Jonathan G Rennison ec9766e691 Fix ai_developer_tools not being read before scanning for scripts
See: #528
1 year ago
Jonathan G Rennison f9c9f53882 Fix town 0 not being included in public roads network
See: #530
1 year ago
Jonathan G Rennison dc32b0533c Viewport: Fix fixed vehicle route overlays not being marked dirty on remove 1 year ago
Jonathan G Rennison 0a8a9abe28 Window: Cache which window classes are currently present 1 year ago
Jonathan G Rennison 9fa6fb7438 Pay company loan interest before accumulating quarterly statistics
See: #524
1 year ago
Jonathan G Rennison 3a47b421b0 Merge branch 'master' into jgrpp
# Conflicts:
#	src/company_cmd.cpp
#	src/core/overflowsafe_type.hpp
#	src/economy.cpp
#	src/engine_base.h
#	src/ground_vehicle.cpp
#	src/group_gui.cpp
#	src/industry_cmd.cpp
#	src/industry_gui.cpp
#	src/newgrf_commons.cpp
#	src/newgrf_engine.cpp
#	src/newgrf_industries.cpp
#	src/newgrf_object.cpp
#	src/newgrf_roadstop.cpp
#	src/newgrf_station.cpp
#	src/rail_gui.cpp
#	src/road_cmd.h
#	src/road_gui.cpp
#	src/saveload/afterload.cpp
#	src/script/api/script_log.cpp
#	src/script/api/script_log.hpp
#	src/settings_gui.cpp
#	src/settingsgen/settingsgen.cpp
#	src/station_cmd.cpp
#	src/station_cmd.h
#	src/station_gui.cpp
#	src/strgen/strgen.cpp
#	src/string_func.h
#	src/string_type.h
#	src/table/settings/network_private_settings.ini
#	src/tests/math_func.cpp
#	src/textfile_gui.cpp
#	src/timetable_gui.cpp
#	src/town_cmd.cpp
#	src/vehicle.cpp
#	src/waypoint_cmd.cpp
#	src/waypoint_cmd.h
#	src/widgets/dropdown.cpp
1 year ago
Jonathan G Rennison 36fadb5424 Merge branch 'master' into jgrpp
# Conflicts:
#	src/base_station_base.h
#	src/newgrf.cpp
#	src/newgrf_class.h
#	src/newgrf_class_func.h
#	src/newgrf_commons.cpp
#	src/newgrf_commons.h
#	src/newgrf_roadstop.cpp
#	src/newgrf_roadstop.h
#	src/newgrf_station.cpp
#	src/saveload/newgrf_sl.cpp
#	src/saveload/saveload.h
#	src/saveload/station_sl.cpp
1 year ago
Jonathan G Rennison fc80a93672 Fix object town variables when no town is present 1 year ago
Jonathan G Rennison 3d4133cadb Debug: Fix debug window parent scope button with missing town 1 year ago
Jonathan G Rennison 5615cee503 Show town count in town directory window 1 year ago
Jonathan G Rennison 819b9fcdd9 Include 'perfect' mode in tree placer setting helptext 1 year ago
Jonathan G Rennison 58c0aac15f Fix re-opening GRF/script settings windows not closing drop down windows
Causing assertion failure on drop down item selection

See: #527
1 year ago
Jonathan G Rennison e3bd8966fc Debug: Allow setting parameters for extended vars in debug window
Reafctor handling of set parameters
1 year ago
Jonathan G Rennison a10c5a62c9 Factor out function to get value with broadest digits 1 year ago
Jonathan G Rennison 18a79a35d0 Fix truncation of GetDebugString output string
See: #525
1 year ago
Jonathan G Rennison f7964cb3aa Add function to get name of extended variable ID
Add table for internal variable IDs which aren't mappable externally
1 year ago
Jonathan G Rennison bdb9a72aa4 NewGRF: Add/extend station variables for station info of nearby tiles
In preparation for support of more than 255 stations per GRF
1 year ago
Jonathan G Rennison 1dbbbed9e5 NewGRF: Only extend value of road stops variable 68 if feature tested for 1 year ago
Jonathan G Rennison 2450705aa0 Use btree map for tracerestrict GUI drop down list mapping 1 year ago
Jonathan G Rennison ec6f9478ee Improve efficiency of station docking tiles check in CheckCaches 1 year ago
Jonathan G Rennison 24ffc5233c Remove CapacitiesMap typedef 1 year ago
Jonathan G Rennison 326d0c329c Remove some unnecessary colour strings 1 year ago
Jonathan G Rennison 40a9f19c20 Implement text filtering in dual pane train build window 1 year ago
Jonathan G Rennison 2ed248a61d Merge branch 'master' into jgrpp
# Conflicts:
#	.github/workflows/ci-build.yml
#	.github/workflows/release-linux.yml
#	src/aircraft_cmd.cpp
#	src/airport_gui.cpp
#	src/articulated_vehicles.cpp
#	src/build_vehicle_gui.cpp
#	src/company_gui.cpp
#	src/genworld_gui.cpp
#	src/gfx_layout.cpp
#	src/misc_gui.cpp
#	src/newgrf.cpp
#	src/newgrf_config.h
#	src/newgrf_engine.cpp
#	src/news_gui.cpp
#	src/order_gui.cpp
#	src/roadveh_cmd.cpp
#	src/saveload/saveload.h
#	src/saveload/vehicle_sl.cpp
#	src/ship_cmd.cpp
#	src/statusbar_gui.cpp
#	src/table/settings/network_private_settings.ini
#	src/table/settings/network_settings.ini
#	src/toolbar_gui.cpp
#	src/train_cmd.cpp
#	src/vehicle_gui.cpp
1 year ago
Jonathan G Rennison 6880cf24a0 Fix crash in template replacement failure news if autorenew succeeds 1 year ago
Jonathan G Rennison 13183d3f13 Add command result flag for whether SetResultData was called
Use for tracerestrict validation result fail offset
1 year ago
Jonathan G Rennison 5dcbd9271b Hide min_years_for_shares setting when shares are disabled 1 year ago
Jonathan G Rennison bac8f032da Re-add company shares 1 year ago
Jonathan G Rennison 6297abdb3b Remove str_fmt and str_vfmt 1 year ago
Jonathan G Rennison 94c422499f Use last pointer in std::string returning GetString 1 year ago
Jonathan G Rennison 7aef72b946 Add static_assert for length of _command_proc_table 1 year ago
Jonathan G Rennison 02fe4af934 Merge branch 'master' into jgrpp
# Conflicts:
#	.github/workflows/release-windows.yml
#	src/company_base.h
#	src/company_cmd.cpp
#	src/company_gui.cpp
#	src/console_cmds.cpp
#	src/economy.cpp
#	src/economy_cmd.h
#	src/fios.h
#	src/goal.cpp
#	src/group_gui.cpp
#	src/network/core/config.h
#	src/network/network_admin.cpp
#	src/newgrf_config.cpp
#	src/os/windows/win32.cpp
#	src/saveload/afterload.cpp
#	src/saveload/company_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload_error.hpp
#	src/settings_gui.cpp
#	src/ship_cmd.cpp
#	src/stdafx.h
#	src/story.cpp
#	src/story_base.h
#	src/string.cpp
#	src/table/settings/economy_settings.ini
#	src/tests/CMakeLists.txt
#	src/tests/math_func.cpp
1 year ago
Jonathan G Rennison 3ec66e5fb5 Fix not being able to reload GS in script debug window
See: #523
1 year ago
Jonathan G Rennison bf1e66b2f3 Add missing <functional> header to src/timer/timer.h 1 year ago
Jonathan G Rennison 6091d7470c Merge branch 'master' into jgrpp
# Conflicts:
#	.github/workflows/release-macos.yml
#	src/company_gui.cpp
#	src/linkgraph/linkgraph.cpp
#	src/newgrf_debug_gui.cpp
#	src/strgen/strgen_base.cpp
#	src/timetable_gui.cpp
1 year ago
Jonathan G Rennison b02817f262 Merge branch 'master' into jgrpp
# Conflicts:
#	src/newgrf.cpp
1 year ago
Jonathan G Rennison ef03d44fb3 Use std::unique_ptr for GRFLineToSpriteOverride 1 year ago
Jonathan G Rennison f00e0e195f cpp-btree: Add support for uncopyable/move-only map/multimap value types 1 year ago
Jonathan G Rennison b381a30d2d Merge branch 'master' into jgrpp
# Conflicts:
#	src/base_media_func.h
#	src/cargopacket.h
#	src/gfxinit.cpp
#	src/industry_cmd.cpp
#	src/window_gui.h
1 year ago
Jonathan G Rennison 42b3c5fe25 Fix highlight of adjacent rail/road waypoints when only one waypoint type 1 year ago
Jonathan G Rennison fd4d4d341d Merge branch 'master' into jgrpp
# Conflicts:
#	src/animated_tile.cpp
#	src/cargopacket.h
#	src/cheat_gui.cpp
#	src/company_cmd.cpp
#	src/company_gui.cpp
#	src/date.cpp
#	src/disaster_vehicle.cpp
#	src/dock_gui.cpp
#	src/economy.cpp
#	src/engine.cpp
#	src/error_gui.cpp
#	src/fontcache/spritefontcache.cpp
#	src/game/game_gui.cpp
#	src/game/game_text.cpp
#	src/gfx.cpp
#	src/graph_gui.cpp
#	src/highscore_gui.cpp
#	src/industry_cmd.cpp
#	src/lang/dutch.txt
#	src/lang/english_AU.txt
#	src/lang/english_US.txt
#	src/lang/finnish.txt
#	src/lang/french.txt
#	src/lang/italian.txt
#	src/lang/portuguese.txt
#	src/lang/russian.txt
#	src/lang/turkish.txt
#	src/lang/vietnamese.txt
#	src/main_gui.cpp
#	src/misc_gui.cpp
#	src/network/network_gui.cpp
#	src/network/network_server.cpp
#	src/newgrf.cpp
#	src/newgrf.h
#	src/newgrf_generic.cpp
#	src/news_gui.cpp
#	src/openttd.cpp
#	src/os/unix/unix.cpp
#	src/os/windows/font_win32.cpp
#	src/os/windows/win32.cpp
#	src/rail_gui.cpp
#	src/road_gui.cpp
#	src/saveload/afterload.cpp
#	src/saveload/misc_sl.cpp
#	src/saveload/oldloader_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/script/script_gui.cpp
#	src/settings_table.cpp
#	src/signs_gui.cpp
#	src/smallmap_gui.cpp
#	src/smallmap_gui.h
#	src/spritecache.cpp
#	src/spritecache.h
#	src/spriteloader/grf.cpp
#	src/station_cmd.cpp
#	src/statusbar_gui.cpp
#	src/stdafx.h
#	src/strgen/strgen_base.cpp
#	src/subsidy.cpp
#	src/table/settings/difficulty_settings.ini
#	src/texteff.cpp
#	src/timetable_cmd.cpp
#	src/timetable_gui.cpp
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/town_gui.cpp
#	src/townname.cpp
#	src/vehicle.cpp
#	src/waypoint_cmd.cpp
#	src/widgets/dropdown.cpp
#	src/window.cpp
1 year ago
Jonathan G Rennison 7615c831aa Avoid unnecessary checks when removing adjacent level crossing tile 1 year ago
Jonathan G Rennison 0b9b080aa6 Fix closing build waypoint window not closing waypoint selection window 1 year ago
Jonathan G Rennison a419674157 Add coverage button to waypoint window 1 year ago
Jonathan G Rennison df5ca1d7fb Highlight waypoint tiles when adjacent or distant joining 1 year ago
Jonathan G Rennison 65159f4b22 Refactor viewport catchment overlay change handling 1 year ago
Jonathan G Rennison 23ab1cb3d0 Show ctrl-click function of shared orders button in tooltip 1 year ago
Jonathan G Rennison 9f24895480 Fix case of Ctrl+Click in English tooltip texts 1 year ago
Jonathan G Rennison 0fd62de4f2 Re-organise interface settings in settings window
Fix enable_single_veh_shared_order_gui not being listed
1 year ago
Jonathan G Rennison f053082478 Viewport map: Use transport colour for road bridge/tunnels and aqueducts
In route mode
1 year ago
Jonathan G Rennison b5ee8e9e42 Add unset hotkey to toggle showing slopes in viewport map mode
See: #522
1 year ago
Jonathan G Rennison d29cec53e0 Viewport map: Show bridges and tunnels in rail type colour in routes mode
See: #522
1 year ago
Jonathan G Rennison 9cb992ab14 Viewport map: Adjust vertical alignment of tunnels 1 year ago
Jonathan G Rennison 5428b6dd9b GS: Documentation/comment fixes for ScriptAsyncMode 1 year ago
Jonathan G Rennison cd9930542d GS: Add GSAsyncMode(bool) class to set async mode of script DoCommands
In asynchronous mode, don't wait for result of executed command,
just fire-and-forget, and return estimated cost/result
1 year ago
Jonathan G Rennison 72dcdfafbd Add setting for server sent commands per frame limit
Use higher of this and existing commands per frame limit setting
for server-originating commands, e.g. GS
1 year ago
Jonathan G Rennison a25e674f06 Add "command" debug category to log commands 1 year ago
Jonathan G Rennison 8bb23e07ba Merge PR #520 into jgrpp 1 year ago
Jonathan G Rennison e8748c310c Merge PR #519 into jgrpp 1 year ago
Jonathan G Rennison a99418cb69 Revert "Codechange: Explicitly move a few variables to avoid a copy constructor (fixes warning from clang)"
This reverts commit 6378a78817.

Fixes: #521
1 year ago
translators e9b376d484 Update: Translations from eints
catalan: 14 changes by J0anJosep
portuguese: 20 changes by azulcosta
portuguese (brazilian): 15 changes by ericandradex

(cherry picked from commit 27b40da06a)
1 year ago
Jonathan G Rennison 37b8b59c85 Merge branch 'master' into jgrpp
# Conflicts:
#	src/date_type.h
#	src/linkgraph/linkgraphjob.cpp
#	src/linkgraph/linkgraphschedule.cpp
#	src/saveload/saveload.h
#	src/table/settings/linkgraph_settings.ini
1 year ago
Jonathan G Rennison 9a4512f789 Remove linkgraph duration not day length scaled setting
Now always enabled
1 year ago
Jonathan G Rennison 5dd99fb046 Add setting for milliseconds per game tick mode 1 year ago
Jonathan G Rennison 5e8266ac7d Fix value of payment algorithm setting when loading new vanilla saves 1 year ago
Jonathan G Rennison 8ba1010fb4 Merge branch 'master' into jgrpp 1 year ago
TELK 6ec28479ea Update: Korean translation for 0.53.3 1 year ago
pvillaverde 49da6b2070 🌐 Update Galician Translations up to 0.53.3 1 year ago
Jonathan G Rennison 2677c60f11 Don't show different version warning in save window when no file selected 1 year ago
Jonathan G Rennison 3cbd1a5a76 Add conditional order test for whether slot is empty/not empty 1 year ago
Jonathan G Rennison 7cad92988f Avoid unnecessary scroll bar resets in refit window
When vehicle consist is changed
1 year ago
Jonathan G Rennison d3eb7242ea Fix removal of order backups when upgrading airports 1 year ago
Jonathan G Rennison 4ca0b43975 Fix train z pos after reversing at wrong-way signalled bridge wormhole
Could cause train disconnection or wrong wagon spacing
1 year ago
Jonathan G Rennison 29495b4e3d Tracerestrict: Fix default state of copy/share button planes 1 year ago
Jonathan G Rennison 731f2fb46e Tracerestrict: Add button to share program onto other signals 1 year ago
Jonathan G Rennison 9f89f1fb42 Tracerestrict: Do not change copy button selection plane when active 1 year ago
Jonathan G Rennison cd0cc13724 Suppress calls to AdjustGUIZoom during startup phase
See: #518
1 year ago
Jonathan G Rennison 9e1066049f Reduce strength of station rating source station penalty on truncation 1 year ago