18a42664fc
Merge branch 'master' into jgrpp
...
Remove 'byte' typedef
1 week ago
d90c540f9e
Enable economy day length scaling in wallclock timekeeping mode
2 weeks ago
919830db7a
Fix: do not use lengthof() for non C-style arrays
...
(cherry picked from commit c544a2be0a
1 month ago
a3cfd23cf9
Codechange: rename byte to uint8_t ( #12308 )
2 months ago
0e76f774eb
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/landscape.cpp
# src/landscape.h
# src/misc_gui.cpp
# src/newgrf_commons.cpp
# src/order_cmd.cpp
# src/pathfinder/yapf/yapf_base.hpp
# src/station_cmd.cpp
# src/tunnelbridge_cmd.cpp
# src/vehicle.cpp
# src/water_cmd.cpp
# src/window.cpp
2 months ago
ba79f7b2ba
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/base_station_base.h
# src/newgrf_roadstop.cpp
# src/newgrf_station.cpp
# src/object_gui.cpp
# src/saveload/settings_sl.cpp
# src/saveload/station_sl.cpp
# src/settings.cpp
# src/settings_internal.h
# src/timer/timer_game_calendar.cpp
2 months ago
8f22066b9a
Fix #12147 : reset all saved settings to their default before loading a game ( #12210 )
3 months ago
3a301cd986
Add helper functions for network settings admin state
3 months ago
93bf033107
Add whether the vehicle is non-front to the vehicle pool pointer tag
...
Add iteration filters which check this
3 months ago
05e237f8d1
Add wrapper to iterate vehicle pool with vehicle type filter
...
Without needing to dereference vehicle pointers if using tagged pointers
3 months ago
090656bd7f
Adjust handling of year display in wallclock mode and company inauguration years
...
See: #657
3 months ago
c7e95d5b03
Close graph windows when changing timekeeping mode
3 months ago
33cbfc3e76
Cache current ticks per calendar day
3 months ago
7581ce0010
Fix changing time keeping units incorrectly updating state ticks offset
3 months ago
79388e4207
Include dates and tick counters in state checksum
3 months ago
f32eef4f38
Allow changing time-keeping mode in-game
3 months ago
a98a56669b
Merge branch 'master' into jgrpp
...
# Conflicts:
# regression/regression/result.txt
# src/autoreplace_cmd.cpp
# src/industry_gui.cpp
# src/landscape.cpp
# src/network/network_content.cpp
# src/newgrf_roadstop.cpp
# src/pathfinder/yapf/yapf_ship.cpp
# src/road_gui.cpp
# src/saveload/ai_sl.cpp
# src/saveload/saveload.h
# src/saveload/vehicle_sl.cpp
# src/station.cpp
# src/station_gui.cpp
# src/video/cocoa/cocoa_ogl.h
# src/video/sdl2_opengl_v.h
# src/video/video_driver.hpp
# src/video/win32_v.h
# src/widget_type.h
# src/widgets/dropdown.cpp
# src/widgets/dropdown_type.h
# src/window.cpp
3 months ago
fdd666f66a
Merge tag '14.0-beta1' into jgrpp
...
# Conflicts:
# src/3rdparty/squirrel/squirrel/sqcompiler.cpp
# src/aircraft.h
# src/animated_tile.h
# src/base_consist.h
# src/cargotype.h
# src/company_gui.cpp
# src/console_cmds.cpp
# src/core/overflowsafe_type.hpp
# src/engine_gui.cpp
# src/industry_gui.cpp
# src/lang/english.txt
# src/music/extmidi.cpp
# src/network/core/network_game_info.cpp
# src/network/network_server.cpp
# src/newgrf.cpp
# src/newgrf_industries.cpp
# src/order_base.h
# src/order_cmd.cpp
# src/order_gui.cpp
# src/order_type.h
# src/os/macosx/misc_osx.cpp
# src/os/windows/crashlog_win.cpp
# src/rail_gui.cpp
# src/rail_gui.h
# src/roadveh.h
# src/roadveh_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/company_sl.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/saveload/saveload_error.hpp
# src/script/api/script_town.cpp
# src/settingsgen/settingsgen.cpp
# src/ship.h
# src/ship_cmd.cpp
# src/smallmap_gui.cpp
# src/spritecache.cpp
# src/stdafx.h
# src/strgen/strgen.cpp
# src/strgen/strgen.h
# src/table/settings/script_settings.ini
# src/timetable_cmd.cpp
# src/timetable_gui.cpp
# src/town.h
# src/town_cmd.cpp
# src/town_cmd.h
# src/town_gui.cpp
# src/train.h
# src/train_cmd.cpp
# src/tree_cmd.cpp
# src/vehicle.cpp
# src/vehicle_base.h
# src/vehicle_cmd.cpp
# src/vehicle_gui.cpp
# src/vehiclelist.cpp
# src/waypoint_base.h
# src/widget.cpp
3 months ago
838b166726
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/cheat_gui.cpp
# src/command.cpp
# src/command_func.h
# src/company_base.h
# src/debug.cpp
# src/debug.h
# src/economy.cpp
# src/engine_type.h
# src/graph_gui.cpp
# src/misc_cmd.cpp
# src/misc_cmd.h
# src/network/core/os_abstraction.cpp
# src/openttd.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/settings_type.h
# src/ship_cmd.cpp
# src/stdafx.h
# src/tests/bitmath_func.cpp
# src/town_cmd.cpp
# src/town_gui.cpp
3 months ago
3ec77973df
Fix setting callbacks when using setting_newgame console command
...
See: https://github.com/OpenTTD/OpenTTD/issues/12059
3 months ago
bd74340416
Disable settings inapplicable for the current timekeeping mode
3 months ago
c45bfccc2e
Always use 27ms/tick in wallclock timing mode
3 months ago
450c6b76d6
Ensure tile loop counts and cargo scalers updated when day length changed
3 months ago
86a6f63e2f
Merge branch 'master' into jgrpp
...
# Conflicts:
# .github/workflows/ci-build.yml
# .github/workflows/codeql.yml
# .github/workflows/commit-checker.yml
# .github/workflows/release-linux-legacy.yml
# .github/workflows/release-linux.yml
# .github/workflows/release-macos.yml
# .github/workflows/release-windows-store.yml
# .github/workflows/release-windows.yml
# .github/workflows/upload-cdn.yml
# .github/workflows/upload-gog.yml
# .github/workflows/upload-steam.yml
# src/console_cmds.cpp
# src/core/math_func.hpp
# src/fios.cpp
# src/fios.h
# src/intro_gui.cpp
# src/network/network_server.cpp
# src/openttd.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/settings_internal.h
# src/settings_table.cpp
# src/settings_type.h
# src/table/settings.h.preamble
# src/table/settings/company_settings.ini
# src/table/settings/currency_settings.ini
# src/table/settings/difficulty_settings.ini
# src/table/settings/economy_settings.ini
# src/table/settings/game_settings.ini
# src/table/settings/gui_settings.ini
# src/table/settings/linkgraph_settings.ini
# src/table/settings/locale_settings.ini
# src/table/settings/misc_settings.ini
# src/table/settings/multimedia_settings.ini
# src/table/settings/network_private_settings.ini
# src/table/settings/network_settings.ini
# src/table/settings/news_display_settings.ini
# src/table/settings/old_gameopt_settings.ini
# src/table/settings/pathfinding_settings.ini
# src/table/settings/script_settings.ini
# src/table/settings/win32_settings.ini
# src/table/settings/window_settings.ini
# src/table/settings/world_settings.ini
# src/viewport.cpp
# src/viewport_func.h
# src/window.cpp
3 months ago
a48e15dce0
Add wallclock time settings
3 months ago
fc40f485ff
Fix changing the day length setting not immediately taking effect
3 months ago
d02b1547f6
Remove: setting "no_http_content_downloads" ( #12058 )
...
As we now use HTTPS, it is very likely this will work on most systems.
For systems that do have HTTPS blocked, it will fail instantly,
and it will fallback to TCP anyway. That makes this setting no longer
very useful.
3 months ago
3407b3edc0
Fix tile hash cache check warnings when loading very old savegames
...
See: #648
3 months ago
60e59a8233
Saveload: Add wrapper to simplify conditionally upstream chunks
...
Where they're always saved as upstream and conditional on a feature
3 months ago
db8b77a72e
Remove empty DayLengthPreChange
3 months ago
d39236d50c
Store state ticks directly in savegame instead of the offset
...
Initialise the state ticks value to a constant for new games,
instead of using an implicit offset of 0
3 months ago
0ea57528c9
Rename DateTicksScaled to StateTicks
...
Rename various other related/derived types and variables
3 months ago
f966153ae2
Saveload: Remove use of randombytes in company passwords storage
...
Use RandomBytesWithFallback
Replace related key/data arrays with std::array
3 months ago
b1718478c8
Codechange: Replace old non-standard attributes with C++17/20 standard attributes.
3 months ago
7acf78964f
Remove: "generation_seed" from config, as it was a write-only value ( #11927 )
4 months ago
17dfc1a49a
Codechange: Replace SF_GUI_NEGATIVE_IS_SPECIAL with a settings value callback.
4 months ago
9e9a8ca7f6
Codechange: Add callbacks to IntSettingDesc to support dynamic strings for title, help and values.
4 months ago
022b9e92d2
Codechange: Move settings string formatting into IntSettingDesc members.
4 months ago
75f21065c9
Codechange: refactor DecodeHexText to a generic purpose ConvertHexToBytes ( #11866 )
...
DecodeHexText() does more than just decoding hex. ConvertHexToBytes()
now only does pure hex decoding. This required a bit of refactoring
for the code using DecodeHexText().
4 months ago
2d77cf9c80
Codechange: replace StrStartsWith/StrEndsWith with starts_with and ends_with
4 months ago
3ab31f5518
Add settings for town/industry cargo production scaling modes
4 months ago
1e0bb019a7
Change cargo scaling settings to be linear instead of logarithmic
4 months ago
0df59defc4
Merge branch 'master' into jgrpp
...
# Conflicts:
# .github/workflows/release-linux.yml
# .github/workflows/release.yml
# src/rail_cmd.cpp
# src/rail_gui.cpp
# src/script/api/script_rail.cpp
# src/settings_gui.cpp
# src/signal_type.h
# src/video/sdl2_v.cpp
4 months ago
55683c4350
Fix enabling map edge mode setting when void edge tiles were not flat
4 months ago
78e08d5711
Add setting text/warnings about why YAPF is recommended for trains
4 months ago
2ec4b2a8ca
Return end of string pointer in SettingDesc formatters
4 months ago
914b92b21f
Merge branch 'master' into jgrpp
...
Bump savegame for water regions for ship pathfinder
Use ring_buffer for ShipPathCache
4 months ago
14db9b2854
Fix loading of pre-selected AIs from config file
4 months ago
97e6f3062e
Adding of _t to (u)int types, and WChar to char32_t
...
See: eaae0bb5e
4 months ago
a573d065e1
Add missing IsDefaultValue to SettingDesc, from upstream
4 months ago
Jonathan G Rennison
Rubidium
Patric Stout
frosch