Commit Graph

56643 Commits (540cec2af5b769503bbb58ad7fef591887ad4ef8)
 

Author SHA1 Message Date
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
10 months ago
Jonathan G Rennison 9822fa6584
Fix: Trivial autoreplace of mixed cargo articulated engines (#11253)
Do not fail autoreplace/autorenew of mixed cargo articulated engines
due to an inability to refit to mixed cargoes, when no refit is
required because the target engine already has a suitable set of cargoes.
Notably, this allows autorenew (autoreplace to same engine type)
to succeed.
10 months ago
Peter Nelson 96d98d08c8
Change: Use sparse padding for main intro menu. (#11475) 10 months ago
Peter Nelson c80fa7d752
Codechange: Simplify setting minimum width for game options dropdown lists. (#11474)
Height isn't necessary as drop down controls already have sufficient height, so we can use GetDropDownListDimension() to get the width.
10 months ago
Peter Nelson f58a7ef673
Codechange: Remove now-unnecessary containers in picker layouts. (#11473)
These are no longer necessary as the issue they work around was resolved by #11471
10 months ago
Peter Nelson 293a26f248
Change: Use sparse padding and SETTING_BUTTON sizes for custom currency window. (#11472) 10 months ago
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
10 months ago
Peter Nelson 05b55c4d43
Fix: Extra space allocated to container-within-container may not get allocated to children. (#11471)
Always derive additional length from contained widgets instead of from the container, as the container's minimal length may have been adjusted by an NC_EQUALSIZE parent container.
10 months ago
pvillaverde 625ecbe58c 🌐 Update Galician Translations up to 2023-11-18 10 months ago
Jonathan G Rennison 6e671ed6e2 Split save/load settings into separate INI files
Matching upstream for all settings
10 months ago
Jonathan G Rennison ccfdf626ad Replace SF_ENABLE_TABLE_PATS flag and SC_PATCH with SF_PATCH 10 months ago
Jonathan G Rennison 35d1955db0 Fix crash which could occur when adjusting train lengths for old saves
e.g. due to only partially initialised timetable
10 months ago
Jonathan G Rennison 9c29950956 Show savegame version/info in load window if sl debug enabled 10 months ago
Jonathan G Rennison bea18ffc18 Fix cargodist after loading ChillPP savegames 10 months ago
Jonathan G Rennison 581ed5b98f Use compatibility table for loading non-table OPTS, PATS chunks 10 months ago
Jonathan G Rennison d948abd040 Remove PATX chunk, move to PATS 10 months ago
Jonathan G Rennison 3e299aa488 Use upstream table chunk format for PATS 10 months ago
Jonathan G Rennison 498c4161b8 Don't use a static vector for sorted PATX settings 10 months ago
Jonathan G Rennison 9197cf6be1 Add saveload helper for conditionally upstream chunks 10 months ago
Jonathan G Rennison 181eb6b6fe Saveload: Adjust flags for saving using upstream chunks 10 months ago
Jonathan G Rennison 4187b8cc62 Rename gameopt_settings to old_gameopt_settings
To match upstream
10 months ago
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
10 months ago
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
10 months ago
translators 29102ce42c Update: Translations from eints
dutch: 1 change by Afoklala
10 months ago
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.
10 months ago
Jonathan G Rennison d931382fb2 Improve text for rename station extra functionality tooltip 10 months ago
Jonathan G Rennison c76dc937e3 Fix tooltip string parameters, change function signatures to match upstream 10 months ago
Loïc Guilloux 9ceef09e9c Fix #11375, 7c37dcb: Use STRING2 when the passed string can have 2 parameters (#11376)
(cherry picked from commit ab805c4e9e)
10 months ago
Peter Nelson b2d4d90502 Change: Apply interface scaling to NewGRF settings min/max sizes. 10 months ago
Peter Nelson 42ae61a4fe Change: Use sparse padding for NewGRF settings window. 10 months ago
Peter Nelson cdb4e98a15
Change: Use sparse padding for AI/GS settings windows. (#11466) 10 months ago
Peter Nelson f93711838f
Fix 6317967: Missing exception for SetPipRatio(). (#11465) 10 months ago
Peter Nelson 60651227a0
Change: Simplify world gen widgets and use sparse padding. (#11464) 10 months ago
translators bca321443a Update: Translations from eints
french: 1 change by Lishouuu
10 months ago
Peter Nelson 7d48a3f073
Codechange: Move RectPadding::zero definition to header. (#11461)
This potentially allows better inlining/optimization.
10 months ago
Peter Nelson e2e0753916
Codechange: Use GetCurrentRect() where feasible. (#11460) 10 months ago
Peter Nelson 17ceed0241
Change: Use sparse padding for Game Options window. (#11463) 10 months ago
Peter Nelson 306e75223a Change: Adjust layouts and standardize spacing for company-related windows. 10 months ago
Peter Nelson 58c037fba0 Change: Increase finance window lines (and underlines) with interface scale. 10 months ago
translators 1dff1e34f6 Update: Translations from eints
tamil: 3 changes by Jeyanthinath
10 months ago
Jonathan G Rennison b280dfb965 Split GUI settings into separate INI files
Matching upstream for non-save settings
10 months ago
Jonathan G Rennison d4f39ea6c2 Remove "Show order management button" setting
Now always enabled
10 months ago
Jonathan G Rennison 3bcc99dd95 Fix CMake config for static MSVC builds 10 months ago
Jonathan G Rennison beee3cc369 Replace BytesToHexString with FormatArrayAsHex 10 months ago
Jonathan G Rennison 6a35661db4 Update regression results 10 months ago
Jonathan G Rennison 42213454f1 Remove unused _autosave_months constants 10 months ago
Jonathan G Rennison 5656322434 Fix vehicle lateness updates when using timetabled 0 wait times 10 months ago
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.
10 months ago
Peter Nelson 08dfe35442 Codechange: Move DropDownList height and width calculation to helper. 10 months ago
Jonathan G Rennison 6708a886ac Debug: Show current order and load times in vehicle debug info 10 months ago