dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
55,540 Commits 1 Branch 0 Tags
7fb815aad8e366fdd004880c8bcb732a1cfe7e8a
Commit Graph

55540 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Loïc Guilloux
115241a052 Fix: disable "redundant move" warnings for GCC (#10803) 
GCC warns about redundant std::move while clang warns when they are missing, so we silence the less harmful one

(cherry picked from commit 3c59b8e9ec)
 2023-06-05 22:24:22 +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
ce3707fbbf MacOS: Bump deployment target to 10.13 2023-06-05 21:26:41 +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
Jonathan G Rennison
0e94dca563 Fix GetLinkGraphJobDesc for null saveload conv settings 2023-06-04 21:38:08 +01:00
Jonathan G Rennison
ec9766e691 Fix ai_developer_tools not being read before scanning for scripts 
See: #528
 2023-06-04 19:33:54 +01:00
Jonathan G Rennison
f9c9f53882 Fix town 0 not being included in public roads network 
See: #530
 2023-06-04 19:01:19 +01:00
Jonathan G Rennison
7119550aa7 Documentation: Adjust low level changes document 2023-06-03 21:39:04 +01:00
Jonathan G Rennison
dc32b0533c Viewport: Fix fixed vehicle route overlays not being marked dirty on remove 2023-06-03 20:29:55 +01:00
Jonathan G Rennison
0a8a9abe28 Window: Cache which window classes are currently present 2023-06-03 19:53:47 +01:00
Jonathan G Rennison
9fa6fb7438 Pay company loan interest before accumulating quarterly statistics 
See: #524
 2023-06-03 19:27:22 +01:00
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
 2023-06-03 19:16:57 +01:00
Jonathan G Rennison
69c118a2cb Documentation: Update info on road stop and object extended byte format 2023-06-03 11:07:13 +01:00
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
 2023-06-03 11:07:01 +01:00
Jonathan G Rennison
fc80a93672 Fix object town variables when no town is present 2023-06-02 22:19:54 +01:00
Jonathan G Rennison
3d4133cadb Debug: Fix debug window parent scope button with missing town 2023-06-02 22:18:40 +01:00
Jonathan G Rennison
5615cee503 Show town count in town directory window 2023-06-02 18:47:58 +01:00
Jonathan G Rennison
819b9fcdd9 Include 'perfect' mode in tree placer setting helptext 2023-06-02 18:41:52 +01:00
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
 2023-06-01 21:12:16 +01:00
Jonathan G Rennison
e3bd8966fc Debug: Allow setting parameters for extended vars in debug window 
Reafctor handling of set parameters
 2023-06-01 20:36:00 +01:00