Commit Graph

42547 Commits

Author SHA1 Message Date
PeterN
ed3759eef7 Fix: Land info window maximum width was not scaled. (#10894)
(cherry picked from commit 1ff0dc11d8)
2023-06-10 16:42:22 +01:00
Patric Stout
19a6846cb6 Codechange: initialize all values of ICURun on construction (#10892)
(cherry picked from commit 0302e6f168)
2023-06-10 16:42:22 +01:00
Loïc Guilloux
391b80d59a Fix: Check max member count in squirrel classes (#10883)
Manual cherry-pick from 23a0620658

(cherry picked from commit c880157518)
2023-06-10 16:42:22 +01:00
PeterN
8034609368 Fix: Ask FontConfig for the face index when opening fonts. (#10878)
This allows selection of the correct face in truetype fonts containing
multiple faces.

(cherry picked from commit 876871157f)
2023-06-10 16:42:22 +01:00
PeterN
ac420f208c Change: Cargo flow legend only shows defined cargo. (#10872)
This removes the large mostly-empty grid of cargo buttons when not using a complex industry set.

(cherry picked from commit 702194cfef)
2023-06-10 16:42:22 +01:00
Jonathan G Rennison
08030e1b8a Add hotkey for convert rail type by track piece 2023-06-10 10:21:33 +01:00
Jonathan G Rennison
ccdca8ae52 Add setting to increase size of main toolbar 2023-06-09 19:21:28 +01:00
Jonathan G Rennison
36e1c28173 Fix trains ascending a sloped bridge ramp having incorrect z in wormhole
z one larger than the correct value due to an extra increment on the
transition frame
2023-06-08 22:47:01 +01:00
Jonathan G Rennison
f8301f735f Delivered cargo graph: Add missing overrides, remove unused variable 2023-06-08 00:14:44 +01:00
Jonathan G Rennison
ac2f9a21e8 Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/
Leave afterload in src/saveload/
2023-06-08 00:01:40 +01:00
Jonathan G Rennison
3c9ce6f9a5 Implement waypoint build window text filter for road waypoints 2023-06-08 00:01:39 +01:00
Jonathan G Rennison
02549c5224 Merge branch 'master' into jgrpp
# Conflicts:
#	cmake/CompileFlags.cmake
#	src/cargomonitor.cpp
#	src/core/CMakeLists.txt
#	src/economy.cpp
#	src/landscape.cpp
#	src/linkgraph/flowmapper.cpp
#	src/linkgraph/linkgraph_gui.cpp
#	src/linkgraph/linkgraphschedule.cpp
#	src/misc_gui.cpp
#	src/newgrf_generic.cpp
#	src/newgrf_storage.cpp
#	src/rail_gui.cpp
#	src/saveload/afterload.cpp
#	src/saveload/station_sl.cpp
#	src/script/script_gui.cpp
#	src/station_cmd.cpp
#	src/station_gui.cpp
#	src/string_func.h
#	src/terraform_cmd.cpp
2023-06-08 00:01:38 +01:00
Jonathan G Rennison
d3fbe88a9c Add setting for departure boards duration when using minutes
Default to 24 hours
2023-06-07 02:20:32 +01:00
Jonathan G Rennison
f3116eedcf Support 64 bit values in the give money and change bank balance commands
See: #535
2023-06-06 22:09:01 +01:00
Jonathan G Rennison
3151751eda Allow using the money cheat with values greater than 32 bits
See: #536
2023-06-06 21:49:30 +01:00
Jonathan G Rennison
d03465db59 Set default values for DoCommandPEx optional parameters 2023-06-06 21:48:24 +01:00
Jonathan G Rennison
bc00753996 NewGRF stations: Remove extended version of varuiable 68 2023-06-06 21:35:39 +01:00
Jonathan G Rennison
1d8df99c83 Fix upstream savegame load for versions 311 and later 2023-06-06 21:09:06 +01:00
Jonathan G Rennison
57762ce9f6 Enable upstream load for build object limit settings 2023-06-06 21:08:23 +01:00
Jonathan G Rennison
fa0771979f Add upstream savegame load support for versions 315 2023-06-06 20:18:58 +01:00
Jonathan G Rennison
929dd46fcf Add upstream savegame load support for versions 313 and 314 2023-06-06 19:48:59 +01:00
Michael Lutz
e5654a0414 Codechange: Use a dedicated variable for disaster vehicle action state. (#10798)
(cherry picked from commit 72c7536325)
2023-06-06 19:59:10 +01:00
Jonathan G Rennison
2c91866831 Adjust spacing of buttons in cargo payments rate graph 2023-06-06 19:32:16 +01:00
Jonathan G Rennison
2a5a9c2f9d Add by cargo mode to company delivered cargo history graph 2023-06-06 19:31:59 +01:00
Jonathan G Rennison
f09dfc79bd Add cargo type filters to company delivered cargo window
Adapted from Citymania
2023-06-06 18:19:19 +01:00
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.
2023-06-05 22:05:51 +01:00
Jonathan G Rennison
bc07331056 Remove src/3rdparty/optional 2023-06-05 21:26:41 +01:00
PeterN
ab83725d73 Add: NewGRF string code "9A 21" to display force from textstack. (#10782)
(cherry picked from commit 61516627ad)
2023-06-05 21:07:55 +01:00
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)
2023-06-05 20:47:58 +01:00
Jonathan G Rennison
5c2f9dffe6 Fix compilation error in newgrf_profile console command on some platforms 2023-06-05 20:47:58 +01:00
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)
2023-06-05 20:34:54 +01:00
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)
2023-06-05 20:31:41 +01:00
Jonathan G Rennison
d481d382cb Fix missing include in company_base.h 2023-06-05 20:14:52 +01:00
Jonathan G Rennison
7cce9f934d Fix strncasecmp related compilation errors on MSVC 2023-06-05 20:08:09 +01:00
Jonathan G Rennison
ffb4548f1b Fix std::optional related compilation errors on some platforms 2023-06-05 20:04:13 +01:00
Jonathan G Rennison
3d382fe531 Debug: Fix compilation error when using RANDOM_DEBUG 2023-06-05 20:02:34 +01:00
Jonathan G Rennison
b84d1bcee4 Cheats window: Fix inflation factor arrow buttons
See: #533, #534
2023-06-05 19:51:35 +01:00
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
2023-06-05 19:37:33 +01:00
Jonathan G Rennison
665a4ca55b Add Window method to change window class
Use in BuildRoadStationWindow
2023-06-05 19:20:46 +01:00
Jonathan G Rennison
6215e326fd Add constants for toolbar help menu items 2023-06-05 19:20:46 +01:00
Patric Stout
3b1407d240 Feature: allow to do a hostile takeover of an AI company (in singleplayer) (#10914)
With the removal of the share-system, you could no longer make an
AI disappear in a single player game. At least, not without going
into the console.
2023-06-05 19:32:22 +02:00
PeterN
f814c86389 Codechange: Reorganise hotkey initialisation. (#10951)
Hotkeys are now initialized inline, and use std::vector instead of
separate static C-arrays and std::string instead of char *. The list end
marker is no longer required.
2023-06-05 18:12:30 +01:00
rubidium42
921f5afc4d Codechange: Apply suggestions from code review 2023-06-05 17:07:39 +02:00
Rubidium
2dd2b698d2 Codechange: convert C-style GetTownName API to std::string returning API 2023-06-05 17:07:39 +02:00
Rubidium
14915526ad Cleanup: remove stre-style GetString 2023-06-05 11:23:31 +02:00
Patric Stout
772729cc7d Fix: when syncing width of GUI items, take padding into account (#10915) 2023-06-05 10:27:04 +02:00
Rubidium
15c75e6f45 Codechange: use std::array and std::string for high scores 2023-06-04 23:49:43 +02:00
Rubidium
c158089eff Codechange: use C++ style methods to combine a Utf8Encoded character and a formatted string 2023-06-04 23:32:02 +02:00
PeterN
6ae6b65edb Cleanup: Remove doubled statements. (#10944) 2023-06-04 21:54:44 +01:00
Jonathan G Rennison
0e94dca563 Fix GetLinkGraphJobDesc for null saveload conv settings 2023-06-04 21:38:08 +01:00