c929f7075e
Merge branch 'master' into jgrpp
...
# Conflicts:
# cmake/SourceList.cmake
# src/build_vehicle_gui.cpp
# src/company_gui.cpp
# src/console_cmds.cpp
# src/depot_base.h
# src/elrail.cpp
# src/network/core/udp.cpp
# src/network/network_admin.cpp
# src/network/network_chat_gui.cpp
# src/network/network_gui.cpp
# src/network/network_server.cpp
# src/newgrf.cpp
# src/newgrf_engine.cpp
# src/newgrf_railtype.cpp
# src/newgrf_railtype.h
# src/newgrf_storage.h
# src/os/unix/crashlog_unix.cpp
# src/rail.h
# src/rail_cmd.cpp
# src/rail_gui.cpp
# src/road_cmd.cpp
# src/road_map.h
# src/saveload/labelmaps_sl.cpp
# src/settings_gui.cpp
# src/settings_type.h
# src/sl/oldloader_sl.cpp
# src/station_cmd.cpp
# src/station_gui.cpp
# src/table/settings/world_settings.ini
# src/tests/test_script_admin.cpp
# src/textfile_gui.cpp
# src/toolbar_gui.cpp
# src/train_cmd.cpp
# src/tunnelbridge_cmd.cpp
# src/vehicle_gui.cpp
# src/widget.cpp
# src/window.cpp
# src/window_gui.h
# src/window_type.h
6 months ago
625ecbe58c
🌐 Update Galician Translations up to 2023-11-18
7 months ago
6e671ed6e2
Split save/load settings into separate INI files
...
Matching upstream for all settings
7 months ago
ccfdf626ad
Replace SF_ENABLE_TABLE_PATS flag and SC_PATCH with SF_PATCH
7 months ago
35d1955db0
Fix crash which could occur when adjusting train lengths for old saves
...
e.g. due to only partially initialised timetable
7 months ago
9c29950956
Show savegame version/info in load window if sl debug enabled
7 months ago
bea18ffc18
Fix cargodist after loading ChillPP savegames
7 months ago
581ed5b98f
Use compatibility table for loading non-table OPTS, PATS chunks
7 months ago
d948abd040
Remove PATX chunk, move to PATS
7 months ago
3e299aa488
Use upstream table chunk format for PATS
7 months ago
498c4161b8
Don't use a static vector for sorted PATX settings
7 months ago
9197cf6be1
Add saveload helper for conditionally upstream chunks
7 months ago
181eb6b6fe
Saveload: Adjust flags for saving using upstream chunks
7 months ago
4187b8cc62
Rename gameopt_settings to old_gameopt_settings
...
To match upstream
7 months ago
cf4cf5c08f
Codechange: vendor the nlohmann-json library ( #11290 )
...
(cherry picked from commit ba67f39db6
7 months ago
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
7 months ago
d931382fb2
Improve text for rename station extra functionality tooltip
7 months ago
c76dc937e3
Fix tooltip string parameters, change function signatures to match upstream
7 months ago
9ceef09e9c
Fix #11375 , 7c37dcb: Use STRING2 when the passed string can have 2 parameters ( #11376 )
...
(cherry picked from commit ab805c4e9e
7 months ago
b280dfb965
Split GUI settings into separate INI files
...
Matching upstream for non-save settings
7 months ago
d4f39ea6c2
Remove "Show order management button" setting
...
Now always enabled
7 months ago
3bcc99dd95
Fix CMake config for static MSVC builds
7 months ago
beee3cc369
Replace BytesToHexString with FormatArrayAsHex
7 months ago
6a35661db4
Update regression results
7 months ago
42213454f1
Remove unused _autosave_months constants
7 months ago
5656322434
Fix vehicle lateness updates when using timetabled 0 wait times
7 months ago
6708a886ac
Debug: Show current order and load times in vehicle debug info
7 months ago
86fff56c14
Add setting for whether to hide default stop location
7 months ago
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
7 months ago
cb9e088399
Add setting to control autosave interval mode
7 months ago
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
7 months ago
ec6cdce0c3
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/bridge_gui.cpp
# src/openttd.cpp
# src/settings_type.h
# src/table/settings/gui_settings.ini
7 months ago
524af62b8e
Remove now-unused autosave strings
7 months ago
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
7 months ago
79b5699e82
Fix test compilation on MacOS
7 months ago
57f50b4a40
Github: Re-enable regression tests for ci-build workflow
7 months ago
c7f9218fa5
Fix narrowing conversion warning in ring_buffer.hpp
7 months ago
a2d5c4354d
Fix various uint/size_t mismatches in string functions
7 months ago
c31a8971f2
Fix narrowing conversion warning in FormatString
7 months ago
c4f7794597
Fix ArrayStringParameters with move assignment/construction
7 months ago
d80820932f
Update: Korean translation up to 3da9f52
7 months ago
48e700bc32
Fix type issues with string parameter structs
7 months ago
fe57f3a089
Fix typo in help text for limit train acceleration setting
7 months ago
607690cef7
Fix string codes for various setting labels
7 months ago
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
7 months ago
3da9f521a5
Documentation: Fix stray HTML tag in road stops documentation
7 months ago
6b649f668e
Documentation: Fix table for road stops var 42/roadstop_terrain_type
8 months ago
39247b0120
Road stops: Add tile slope to varact2 variable 0x42
8 months ago
b9654985ad
Fix crash in sprite aligner window
...
When clicking sprite number after re-opening window
having previously used sprite picker tool
8 months ago
adbbbd14b6
Update simplified_chinese.txt
8 months ago
Jonathan G Rennison
pvillaverde
Loïc Guilloux
Patric Stout
TELK
WenSimEHRP