Jonathan G Rennison
3f90910bb8
Show train speed adaptation info in debug window
2023-11-23 18:19:18 +00:00
Jonathan G Rennison
c9a205c707
Train speed adaptation: Move IsOutOfDate to be a method
2023-11-23 17:59:27 +00:00
Jonathan G Rennison
85e1146fab
Documentation: Fix typo in NewGRF additions (NML) document
2023-11-21 20:56:06 +00:00
Jonathan G Rennison
154df0bb7d
Fix some unused variable warnings when asserts are disabled
2023-11-20 23:59:08 +00:00
Jonathan G Rennison
0d4d4a9cac
Merge branch 'master' into jgrpp
...
# Conflicts:
# cmake/CompileFlags.cmake
# src/3rdparty/squirrel/squirrel/sqclosure.h
# src/3rdparty/squirrel/squirrel/sqobject.h
# src/3rdparty/squirrel/squirrel/sqvm.h
# src/aircraft.h
# src/airport_gui.cpp
# src/blitter/32bpp_sse_func.hpp
# src/blitter/null.hpp
# src/bridge_gui.cpp
# src/build_vehicle_gui.cpp
# src/cargotype.h
# src/cheat_gui.cpp
# src/command.cpp
# src/command_func.h
# src/company_gui.cpp
# src/console_gui.cpp
# src/date_gui.cpp
# src/depot_gui.cpp
# src/dock_gui.cpp
# src/economy.cpp
# src/error_gui.cpp
# src/fileio.cpp
# src/fios.cpp
# src/fios_gui.cpp
# src/fontcache/spritefontcache.h
# src/framerate_gui.cpp
# src/game/game_text.cpp
# src/gamelog.cpp
# src/genworld_gui.cpp
# src/gfx_layout_fallback.cpp
# src/group_gui.cpp
# src/highscore_gui.cpp
# src/hotkeys.cpp
# src/industry_cmd.cpp
# src/industry_gui.cpp
# src/landscape.cpp
# src/main_gui.cpp
# src/misc_cmd.cpp
# src/misc_gui.cpp
# src/network/core/tcp_game.cpp
# src/network/core/udp.cpp
# src/network/network_chat_gui.cpp
# src/network/network_content_gui.cpp
# src/network/network_gui.cpp
# src/network/network_server.cpp
# src/network/network_server.h
# src/newgrf_airport.cpp
# src/newgrf_airport.h
# src/newgrf_airporttiles.cpp
# src/newgrf_airporttiles.h
# src/newgrf_animation_base.h
# src/newgrf_canal.cpp
# src/newgrf_commons.h
# src/newgrf_config.cpp
# src/newgrf_debug_gui.cpp
# src/newgrf_engine.cpp
# src/newgrf_engine.h
# src/newgrf_generic.cpp
# src/newgrf_gui.cpp
# src/newgrf_house.cpp
# src/newgrf_house.h
# src/newgrf_industries.cpp
# src/newgrf_industries.h
# src/newgrf_industrytiles.cpp
# src/newgrf_industrytiles.h
# src/newgrf_object.cpp
# src/newgrf_object.h
# src/newgrf_railtype.cpp
# src/newgrf_railtype.h
# src/newgrf_roadstop.cpp
# src/newgrf_roadstop.h
# src/newgrf_roadtype.cpp
# src/newgrf_roadtype.h
# src/newgrf_spritegroup.cpp
# src/newgrf_spritegroup.h
# src/newgrf_station.cpp
# src/newgrf_station.h
# src/newgrf_town.cpp
# src/newgrf_town.h
# src/news_gui.cpp
# src/object_gui.cpp
# src/order_gui.cpp
# src/os/macosx/crashlog_osx.cpp
# src/os/unix/crashlog_unix.cpp
# src/os/windows/crashlog_win.cpp
# src/os/windows/win32.cpp
# src/os/windows/win32_main.cpp
# src/pathfinder/npf/npf.cpp
# src/pathfinder/npf/queue.cpp
# src/rail_cmd.cpp
# src/rail_gui.cpp
# src/road_gui.cpp
# src/roadveh.h
# src/saveload/saveload.cpp
# src/screenshot.cpp
# src/script/api/script_text.hpp
# src/settings.cpp
# src/settings_gui.cpp
# src/settings_internal.h
# src/settings_table.cpp
# src/signs_cmd.cpp
# src/signs_gui.cpp
# src/smallmap_gui.cpp
# src/smallmap_gui.h
# src/spriteloader/grf.hpp
# src/station_cmd.cpp
# src/station_gui.cpp
# src/station_map.h
# src/statusbar_gui.cpp
# src/stdafx.h
# src/strgen/strgen.cpp
# src/table/newgrf_debug_data.h
# src/terraform_gui.cpp
# src/timer/timer_game_calendar.cpp
# src/timer/timer_window.cpp
# src/town.h
# src/town_cmd.cpp
# src/town_gui.cpp
# src/train_gui.cpp
# src/transparency_gui.cpp
# src/vehicle_gui.cpp
# src/water_cmd.cpp
# src/waypoint_cmd.cpp
# src/widget.cpp
# src/widget_type.h
# src/widgets/dropdown.cpp
# src/widgets/rail_widget.h
# src/widgets/terraform_widget.h
# src/window.cpp
# src/window_gui.h
2023-11-20 22:27:05 +00:00
Jonathan G Rennison
b80e2dff19
Fix crash which could occur when adding/updating text effects
...
When DParam 0 or 1 contained a leftover string
See: #612
2023-11-20 19:25:23 +00:00
Jonathan G Rennison
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
2023-11-19 13:00:21 +00:00
pvillaverde
625ecbe58c
🌐 Update Galician Translations up to 2023-11-18
2023-11-18 20:16:35 +00:00
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
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
