Commit Graph

57084 Commits

Author SHA1 Message Date
Jonathan G Rennison
6e671ed6e2 Split save/load settings into separate INI files
Matching upstream for all settings
2023-11-18 20:00:55 +00:00
Jonathan G Rennison
ccfdf626ad Replace SF_ENABLE_TABLE_PATS flag and SC_PATCH with SF_PATCH 2023-11-18 14:52:30 +00:00
Jonathan G Rennison
35d1955db0 Fix crash which could occur when adjusting train lengths for old saves
e.g. due to only partially initialised timetable
2023-11-18 13:41:19 +00:00
Jonathan G Rennison
9c29950956 Show savegame version/info in load window if sl debug enabled 2023-11-18 13:24:25 +00:00
Jonathan G Rennison
bea18ffc18 Fix cargodist after loading ChillPP savegames 2023-11-18 12:23:10 +00:00
Jonathan G Rennison
581ed5b98f Use compatibility table for loading non-table OPTS, PATS chunks 2023-11-18 12:22:06 +00:00
Jonathan G Rennison
d948abd040 Remove PATX chunk, move to PATS 2023-11-18 00:21:35 +00:00
Jonathan G Rennison
3e299aa488 Use upstream table chunk format for PATS 2023-11-18 00:01:46 +00:00
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)

# Conflicts:
#	.github/workflows/ci-build.yml
#	CMakeLists.txt
#	COMPILING.md
#	src/os/macosx/survey_osx.cpp
#	src/os/windows/survey_win.cpp
#	src/script/api/script_admin.cpp
#	src/script/api/script_event_types.cpp
#	src/tests/test_script_admin.cpp
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
translators
29102ce42c Update: Translations from eints
dutch: 1 change by Afoklala
2023-11-17 18:38:21 +00:00
Peter Nelson
08778094f4
Fix: extmidi did not move on to next song after playing ends. (#11469)
`song` is no longer a C-style string so cannot be cleared by writing a NUL char.
Use `.clear()` to properly clear a std::string.
2023-11-17 17:42:19 +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
Peter Nelson
b2d4d90502 Change: Apply interface scaling to NewGRF settings min/max sizes. 2023-11-16 20:54:51 +00:00
Peter Nelson
42ae61a4fe Change: Use sparse padding for NewGRF settings window. 2023-11-16 20:54:51 +00:00
Peter Nelson
cdb4e98a15
Change: Use sparse padding for AI/GS settings windows. (#11466) 2023-11-16 20:02:07 +00:00
Peter Nelson
f93711838f
Fix 6317967: Missing exception for SetPipRatio(). (#11465) 2023-11-16 19:22:02 +00:00
Peter Nelson
60651227a0
Change: Simplify world gen widgets and use sparse padding. (#11464) 2023-11-16 18:58:59 +00:00
translators
bca321443a Update: Translations from eints
french: 1 change by Lishouuu
2023-11-16 18:39:24 +00:00
Peter Nelson
7d48a3f073
Codechange: Move RectPadding::zero definition to header. (#11461)
This potentially allows better inlining/optimization.
2023-11-16 17:07:29 +00:00
Peter Nelson
e2e0753916
Codechange: Use GetCurrentRect() where feasible. (#11460) 2023-11-16 17:06:57 +00:00
Peter Nelson
17ceed0241
Change: Use sparse padding for Game Options window. (#11463) 2023-11-16 17:06:38 +00:00
Peter Nelson
306e75223a Change: Adjust layouts and standardize spacing for company-related windows. 2023-11-15 12:43:44 +00:00
Peter Nelson
58c037fba0 Change: Increase finance window lines (and underlines) with interface scale. 2023-11-15 12:43:44 +00:00
translators
1dff1e34f6 Update: Translations from eints
tamil: 3 changes by Jeyanthinath
2023-11-14 18:36:57 +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
Peter Nelson
7cfcf65f95 Codechange: Simplify cargo filter lists, building only when required.
Some cargo filter lists were built in advance, and used as lookups to test which cargo type to filter.

Instead, use the Cargo ID directly as the filter parameter, and build the lists only when the drop down list is used.
2023-11-13 21:30:46 +00:00
Peter Nelson
08dfe35442 Codechange: Move DropDownList height and width calculation to helper. 2023-11-13 21:30:46 +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
translators
1242b355e5 Update: Translations from eints
danish: 1 change by bscargo
polish: 1 change by pAter-exe
2023-11-13 18:38:10 +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
Peter Nelson
c877494f7a
Codechange: Simplify autoreplace rail/road types by using separate widget. (#11457)
This avoids needing to determine which type of list to deal with by additionally checking the window number for VEH_TRAIN/VEH_ROAD.
2023-11-13 12:32:34 +00:00
Tyler Trahan
7a6d102c4b
Codechange: Clean up timetable start checks (#11456) 2023-11-13 07:19:39 -05:00
translators
5446ece100 Update: Translations from eints
vietnamese: 7 changes by KhoiCanDev
korean: 1 change by telk5093
catalan: 7 changes by J0anJosep
2023-11-12 18:38:05 +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