dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
56,488 Commits 1 Branch 0 Tags
4f8a7382ca6fd02fff2475f13d89119df2ac0904
Commit Graph

43235 Commits

Author SHA1 Message Date
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
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
beee3cc369 Replace BytesToHexString with FormatArrayAsHex 2023-11-13 23:44:36 +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
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
Jonathan G Rennison
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
 2023-11-09 01:55:23 +00:00
Peter Nelson
ab535c0a86 Codechange: Add base() method to StrongType to allow access to the base type without casting. (#11445) 
This removes the ability to explicitly cast to the base type, but the requirement
to use .base() means the conversion is still explicit.
 2023-11-06 20:29:35 +00:00
translators
737775f834 Update: Translations from eints 
korean: 14 changes by telk5093
polish: 1 change by pAter-exe
 2023-11-06 18:38:37 +00:00
Peter Nelson
badce415ea Change: Add horizontal scrollbar to Industry Directory window. 
This list could be very wide depending on industries and language.
 2023-11-05 22:22:32 +00:00
Peter Nelson
8ff6562b2f Codechange: Reduce variable scope. 2023-11-05 22:22:32 +00:00
Peter Nelson
6b9dc8cfcf Codechange: Don't filter industry list by cargo type every 3-sec refresh. 
The 3-sec refresh is to update the list sorting. The filter only needs to
be applied once rebuilding the list.
 2023-11-05 22:22:32 +00:00
Peter Nelson
4033750968 Codechange: Remove redundant NWID_VERTICAL in Industry Directory layout. 2023-11-05 22:22:32 +00:00
Peter Nelson
d380f2f3a2 Codechange: Simplify layout of depot pickers. 2023-11-05 20:09:45 +00:00
Peter Nelson
665902f5ba Codechange: Add widget dimensions to standardise picker winodws. 2023-11-05 20:09:45 +00:00
Peter Nelson
3cab980b30 Codechange: Skip invisible (zero-size) widgets in PIP Containers. 
This gets rid of doubled-up spacing where an invisible child widget would be.
 2023-11-05 20:09:45 +00:00
Peter Nelson
6317967dba Codechange: Add ability to allocate PIP-space dynamically by ratio. 
This can be used to space out, centre, start-align, or end-align widgets without additional spacers.
 2023-11-05 20:09:45 +00:00
Peter Nelson
ac54bd7e58 Codechange: Apply PIP during AssignSizePosition() instead of SetupSmallestSize(). 2023-11-05 20:09:45 +00:00
Peter Nelson
43aa91a7f5 Fix #11437: Flipped shorter rail vehicles disappear in windows. (#11446) 
Mixed signed/unsigned strikes again, causing an incorrect sprite offset for shortened vehicles.
 2023-11-05 20:09:11 +00:00
Peter Nelson
a9aaa2a183 Codechange: Don't be lenient with invalid NWidgetPart lists. 
Some NWidgetPart combinations were ignored but it was not clear that they do nothing. Instead, assert if NWidgetPart is incorrectly applied.
 2023-11-05 19:24:59 +00:00
Peter Nelson
b1eb5533eb Add: WindowDesc unit test to validate NWidgetPart lists. 2023-11-05 19:24:59 +00:00
Peter Nelson
1c94fb0389 Add: Mock sprite cache intialization. 
This fills up the sprite cache with SPR_OPENTTD_BASE + OPENTTD_SPRITE_COUNT zero-size sprites, to
allow GetSpriteSize() calls to continue from unit-tests.
 2023-11-05 19:24:59 +00:00
Peter Nelson
05436d9c2f Add: Expose minimal parts of SpriteCache internals. 
These parts are needed to be able to mock the SpriteCache for unit-tests.
 2023-11-05 19:24:59 +00:00
Peter Nelson
46f63074da Add: MockFontCache for testing GUI code that only needs to know font sizes. 2023-11-05 19:24:59 +00:00
translators
af4c7799fe Update: Translations from eints 
korean: 1 change by telk5093
finnish: 1 change by hpiirai
portuguese (brazilian): 1 change by pasantoro
 2023-11-05 18:37:09 +00:00
Peter Nelson
b5861fd8f3 Fix: Using MIN_YEAR for a date is probably wrong, Use MIN_DATE instead. (#11444) 
Even with strong types ...
 2023-11-05 15:43:56 +00:00