dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
57,611 Commits 1 Branch 0 Tags
5098c77c380bf2fd1da87aa906c4a334e589ca5c
Commit Graph

57611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan G Rennison
38df621e62 Improve train speed adaptation with realistic braking 
Take into account recorded speeds at signals along the reservation
As noted in the lookahead

See: #613
 2023-11-25 00:23:27 +00:00
Peter Nelson
47eabe0cd9 Fix 7cfcf65: Check if last-remembered build vehicle cargo filter is valid. (#11486) 
This can be invalid when switching between games with different cargoes loaded.
 2023-11-23 22:46:22 +00:00
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
Peter Nelson
096da3e59f Fix #11407: Don't steal focus from dropdown menus. (#11484) 2023-11-22 19:09:20 +00:00
Jonathan G Rennison
85e1146fab Documentation: Fix typo in NewGRF additions (NML) document 2023-11-21 20:56:06 +00:00
Peter Nelson
09d01bd015 Fix: Restore original cargo legend 'blob' dimensions. (#11480) 
An off-by-one in a previous life made the 'blob' too narrow.
 2023-11-21 19:51:24 +00:00
Peter Nelson
c2f19fed24 Fix: Widget without tooltip should use STR_NULL not STR_EMPTY. (#11482) 2023-11-21 19:35:47 +00:00
Peter Nelson
c18a1494b7 Codechange: Remove FONT_HEIGHT_... macros. (#11481) 
These make it look like we're dealing with a constant, but actually each is a call to `GetCharacterHeight(...)`.
 2023-11-21 19:04:24 +00:00
translators
96ec9c1b47 Update: Translations from eints 
indonesian: 67 changes by ekaknl22
 2023-11-21 18:40:02 +00:00
Jonathan G Rennison
154df0bb7d Fix some unused variable warnings when asserts are disabled 2023-11-20 23:59:08 +00:00
Peter Nelson
0d60dc0353 Fix 96d98d08: Crash in text layouter due to trying to find height of string with zero-width. 
96d98d08 removed the hardcoded minimum width in favour of all-calculated widths, however this does not work when determining multiline text sizes.
 2023-11-20 23:09:20 +00:00
Peter Nelson
62d4fd0572 Codechange: Add method to guess the width/height required for a multiline string. 
This is necessary for widget layouts where a minimum width is not yet known during UpdateWidgetSize().
 2023-11-20 23:09:20 +00:00
Peter Nelson
f281525492 Codechange: Add method to resize both width and height of a widget. 2023-11-20 23:09:20 +00:00
Peter Nelson
d04fd4602d Codechange: Assert that max width passed to GetStringHeight is non-zero. 
Max width of zero will cause text layouters to crash, potentially after exhausting memory first.
 2023-11-20 23:09:20 +00:00
Peter Nelson
0578b8eaa9 Change: Use picker-spacing for scenario found town window. (#11478) 2023-11-20 23:06:15 +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
Peter Nelson
a58a043402 Fix 6065122: Missing SetFill on worldgen spacer. (#11477) 2023-11-20 19:31:26 +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
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.
 2023-11-20 14:16:28 +01:00
Peter Nelson
96d98d08c8 Change: Use sparse padding for main intro menu. (#11475) 2023-11-20 01:12:25 +00:00
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.
 2023-11-20 00:44:06 +00:00
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
 2023-11-20 00:14:06 +00:00
Peter Nelson
293a26f248 Change: Use sparse padding and SETTING_BUTTON sizes for custom currency window. (#11472) 2023-11-19 21:12:55 +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
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.
 2023-11-19 00:36:53 +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)

# 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