Jonathan G Rennison
498c4161b8
Don't use a static vector for sorted PATX settings
2023-11-17 23:08:29 +00:00
Jonathan G Rennison
9197cf6be1
Add saveload helper for conditionally upstream chunks
2023-11-17 23:08:29 +00:00
Jonathan G Rennison
181eb6b6fe
Saveload: Adjust flags for saving using upstream chunks
2023-11-17 23:08:29 +00:00
Jonathan G Rennison
4187b8cc62
Rename gameopt_settings to old_gameopt_settings
...
To match upstream
2023-11-17 19:53:24 +00:00
Jonathan G Rennison
cf4cf5c08f
Codechange: vendor the nlohmann-json library ( #11290 )
...
(cherry picked from commit ba67f39db6
2023-11-17 19:20:35 +00:00
Jonathan G Rennison
af1150182a
Merge branch 'master' into jgrpp
...
# Conflicts:
# .github/workflows/ci-build.yml
# .github/workflows/release-source.yml
# CMakeLists.txt
# COMPILING.md
# src/network/network_survey.cpp
# src/network/network_survey.h
# src/openttd.cpp
# src/tests/CMakeLists.txt
2023-11-17 19:17:14 +00:00
Jonathan G Rennison
d931382fb2
Improve text for rename station extra functionality tooltip
2023-11-17 17:27:37 +00:00
Jonathan G Rennison
c76dc937e3
Fix tooltip string parameters, change function signatures to match upstream
2023-11-17 17:26:57 +00:00
Loïc Guilloux
9ceef09e9c
Fix #11375 , 7c37dcb: Use STRING2 when the passed string can have 2 parameters ( #11376 )
...
(cherry picked from commit ab805c4e9e
2023-11-16 23:38:05 +00:00
Jonathan G Rennison
b280dfb965
Split GUI settings into separate INI files
...
Matching upstream for non-save settings
2023-11-14 18:08:15 +00:00
Jonathan G Rennison
d4f39ea6c2
Remove "Show order management button" setting
...
Now always enabled
2023-11-14 00:18:47 +00:00
Jonathan G Rennison
3bcc99dd95
Fix CMake config for static MSVC builds
2023-11-14 00:06:53 +00:00
Jonathan G Rennison
beee3cc369
Replace BytesToHexString with FormatArrayAsHex
2023-11-13 23:44:36 +00:00
Jonathan G Rennison
6a35661db4
Update regression results
2023-11-13 23:13:09 +00:00
Jonathan G Rennison
42213454f1
Remove unused _autosave_months constants
2023-11-13 23:07:49 +00:00
Jonathan G Rennison
5656322434
Fix vehicle lateness updates when using timetabled 0 wait times
2023-11-13 22:35:51 +00:00
Jonathan G Rennison
6708a886ac
Debug: Show current order and load times in vehicle debug info
2023-11-13 20:58:43 +00:00
Jonathan G Rennison
86fff56c14
Add setting for whether to hide default stop location
2023-11-13 19:21:57 +00:00
Jonathan G Rennison
fc1c47cbd2
Merge branch 'master' into jgrpp
...
# Conflicts:
# cmake/CompileFlags.cmake
# src/crashlog.cpp
# src/crashlog.h
# src/date_type.h
# src/depot_type.h
# src/landscape.cpp
# src/openttd.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/os/macosx/crashlog_osx.cpp
# src/os/unix/crashlog_unix.cpp
# src/os/windows/crashlog_win.cpp
# src/pathfinder/npf/npf.cpp
# src/road_cmd.cpp
# src/script/api/script_infrastructure.cpp
# src/stdafx.h
# src/table/settings/gui_settings.ini
# src/table/settings/pathfinding_settings.ini
# src/tests/CMakeLists.txt
2023-11-13 19:08:22 +00:00
Jonathan G Rennison
cb9e088399
Add setting to control autosave interval mode
2023-11-13 18:45:18 +00:00
Patric Stout
19bbcb180d
Change: base autosaves intervals on real time (instead of game time) ( #10655 )
...
There are two fundamental issues with autosave:
- When fast-forwarding, it saves way too often
- When paused, it never saves
Both makes no sense. Autosaves are meant to prevent you from
accidentally losing your work. The emphasis on "your" work.
To solve both issues, the autosave now works on real time. You
can select every 10 / 30 / 60 / 120 minutes, which are similar to
what the setting was in game-months.
When you pause, autosaving will stop. Unless you make any change
to the game; then it will continue to make autosaves, even so
the game is paused. Unpausing / pausing resets this mechanism.
(cherry picked from commit f5fad88723
2023-11-13 18:33:20 +00:00
Jonathan G Rennison
ec6cdce0c3
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/bridge_gui.cpp
# src/openttd.cpp
# src/settings_type.h
# src/table/settings/gui_settings.ini
2023-11-12 14:15:19 +00:00
Jonathan G Rennison
524af62b8e
Remove now-unused autosave strings
2023-11-12 13:44:16 +00:00
Jonathan G Rennison
4bfa8b7b7b
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/openttd.cpp
# src/settings_gui.cpp
# src/settings_type.h
# src/table/settings/gameopt_settings.ini
# src/table/settings/gui_settings.ini
2023-11-12 13:43:40 +00:00
Jonathan G Rennison
79b5699e82
Fix test compilation on MacOS
2023-11-09 21:06:17 +00:00
Jonathan G Rennison
57f50b4a40
Github: Re-enable regression tests for ci-build workflow
2023-11-09 20:30:03 +00:00
Jonathan G Rennison
c7f9218fa5
Fix narrowing conversion warning in ring_buffer.hpp
2023-11-09 20:30:03 +00:00
Jonathan G Rennison
a2d5c4354d
Fix various uint/size_t mismatches in string functions
2023-11-09 20:28:06 +00:00
Jonathan G Rennison
c31a8971f2
Fix narrowing conversion warning in FormatString
2023-11-09 19:41:11 +00:00
Jonathan G Rennison
c4f7794597
Fix ArrayStringParameters with move assignment/construction
2023-11-09 17:43:20 +00:00
TELK
d80820932f
Update: Korean translation up to 3da9f52
2023-11-09 16:29:03 +00:00
Jonathan G Rennison
48e700bc32
Fix type issues with string parameter structs
2023-11-09 16:09:47 +00:00
Jonathan G Rennison
fe57f3a089
Fix typo in help text for limit train acceleration setting
2023-11-09 02:06:25 +00:00
Jonathan G Rennison
607690cef7
Fix string codes for various setting labels
2023-11-09 02:05:51 +00:00
Jonathan G Rennison
3436e0a781
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/error.h
# src/error_gui.cpp
# src/linkgraph/linkgraph_gui.cpp
# src/misc_gui.cpp
# src/newgrf_gui.cpp
# src/news_gui.cpp
# src/rail_cmd.cpp
# src/saveload/gamelog_sl.cpp
# src/script/api/script_text.cpp
# src/script/script_instance.cpp
# src/statusbar_gui.cpp
# src/strings.cpp
# src/strings_func.h
# src/strings_internal.h
# src/table/settings/gui_settings.ini
# src/table/settings/linkgraph_settings.ini
# src/textbuf_gui.h
2023-11-09 01:55:23 +00:00
Jonathan G Rennison
3da9f521a5
Documentation: Fix stray HTML tag in road stops documentation
2023-10-23 22:49:07 +01:00
Jonathan G Rennison
6b649f668e
Documentation: Fix table for road stops var 42/roadstop_terrain_type
2023-10-19 17:44:54 +01:00
Jonathan G Rennison
39247b0120
Road stops: Add tile slope to varact2 variable 0x42
2023-10-15 22:27:28 +01:00
Jonathan G Rennison
b9654985ad
Fix crash in sprite aligner window
...
When clicking sprite number after re-opening window
having previously used sprite picker tool
2023-10-15 21:51:41 +01:00
WenSimEHRP
adbbbd14b6
Update simplified_chinese.txt
2023-10-04 20:14:29 +01:00
Jonathan G Rennison
e3ccc54670
Adjust setting text for departure board conditional order handling
2023-10-04 18:29:55 +01:00
Jonathan G Rennison
cd091e04f5
Add settings filter to only show non-vanilla settings
2023-10-04 18:20:25 +01:00
Jonathan G Rennison
0620026d56
Tracerestrict: Add long reserve (unless stopping) mode
...
Requires realistic braking
2023-10-03 20:59:28 +01:00
Jonathan G Rennison
b299c4dce8
Tracerestrict: Add enum type for TRIT_LONG_RESERVE values
2023-10-03 18:11:41 +01:00
Patric Stout
4280c413a6
Fix: only count distance traveled in vehicles for cargo payment ( #11283 )
...
No longer you can utilize the free (and instant) labour of station
workers, transporting your cargo from one part of the station to
the other. No more!
Based on patch by dP.
(cherry picked from commit df400ef84a
2023-10-02 19:26:08 +01:00
Patric Stout
05c35c8e31
Fix: base cargo payment on load/unload tile, instead of station sign location ( #11281 )
...
(cherry picked from commit 9c49a61249
2023-10-02 00:25:15 +01:00
Patric Stout
a15847cf4f
Codechange: simplify splitting of CargoPacket ( #11286 )
...
(cherry picked from commit d1a0ca67be
2023-10-01 23:55:26 +01:00
Patric Stout
59d5270a8c
Fix b0e73277: save/load next_station for CargoPacket again
...
(cherry picked from commit 9e3763cfb3
2023-10-01 23:50:23 +01:00
Patric Stout
a38b072e4b
Fix: don't compare next_station when trying to merge CargoPackets
...
For vehicle packets they shouldn't be compared, and for station
packets they are already in a bucket per next_station.
(cherry picked from commit 1243c331b6
2023-10-01 23:50:14 +01:00
Patric Stout
4ee51442d2
Codechange: rename next_station to next_hop to avoid confusing with another next_station
...
(cherry picked from commit 9f8c1ea552
2023-10-01 23:49:30 +01:00
