Jonathan G Rennison
|
674642f9cc
|
Add a priority field to TimerGameTick::TPeriod
Use this as the primary sort key for TimerGameTick::TPeriod,
to avoid container sort order changes on timer period saveload.
|
5 months ago |
Jonathan G Rennison
|
e17c6da46a
|
Fix industry cargoes when loading newer vanilla savegames
|
6 months ago |
Jonathan G Rennison
|
28e74005d0
|
Remove various uses of lengthof on std::array
|
6 months ago |
Peter Nelson
|
c5b854a422
|
Codechange: Avoid lengthof() on std::array.
(cherry picked from commit 295508fc53 )
|
6 months ago |
Jonathan G Rennison
|
041e71ec05
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/crashlog.cpp
# src/gfx.cpp
# src/network/network_client.cpp
# src/openttd.cpp
# src/openttd.h
# src/saveload/saveload.cpp
# src/survey.cpp
|
7 months ago |
Patric Stout
|
3e625b5b1a
|
Add: track savegame size to report with survey (#12304)
|
7 months ago |
Jonathan G Rennison
|
9f205727bf
|
Extend industry production/transported totals to 32 bits
|
7 months ago |
Jonathan G Rennison
|
fe730bce31
|
Merge branch 'master' into jgrpp
# Conflicts:
# .github/workflows/ci-build.yml
# .github/workflows/codeql.yml
# .github/workflows/release-linux.yml
# .github/workflows/release-macos.yml
# .github/workflows/release-windows.yml
# src/map.cpp
# src/music/midifile.hpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/pathfinder/yapf/yapf_rail.cpp
# src/pbs.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.h
# src/saveload/vehicle_sl.cpp
# src/script/api/script_text.cpp
# src/ship_cmd.cpp
# src/train_cmd.cpp
# src/vehicle.cpp
# src/vehicle_base.h
# src/vehicle_func.h
# src/vehicle_gui.cpp
# src/vehicle_gui_base.h
# src/viewport.cpp
# src/waypoint_cmd.cpp
|
7 months ago |
Rubidium
|
27eadc13ec
|
Codechange: rename TILE_ADD(XY) to TileAdd(XY)
|
7 months ago |
Rubidium
|
bab5a8a787
|
Codechange: use std::source_location over __FILE__ and __LINE__ for Backup
|
7 months ago |
Jonathan G Rennison
|
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
|
7 months ago |
Jonathan G Rennison
|
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
|
7 months ago |
Tyler Trahan
|
32b0fb9f6e
|
Fix #12010: Use economy timer for vehicle stats minimum age, not calendar (#12142)
|
7 months ago |
Loïc Guilloux
|
845b894fd8
|
Remove: [Script] random_deviation from setting description table (#12221)
|
7 months ago |
Peter Nelson
|
8172e25273
|
Codechange: Use range-for when iterating station speclists. (#12212)
This replaces indexed access.
|
7 months ago |
Peter Nelson
|
cff48c0f63
|
Codechange: Templatise SlStationSpecList to reduce duplication.
SlStationSpecList now handles both StationSpec and RoadStopSpec, and replaces indexed array access with range-for and reserve/emplace_back pattern.
|
7 months ago |
Peter Nelson
|
41b3314d76
|
Codechange: Replace separate Station/RoadStopSpecList with template struct.
Reduces duplication and simplifies reuse.
Additionally naming an item that is used in a list as a ...List was
pretty weird.
|
7 months ago |
Patric Stout
|
8f22066b9a
|
Fix #12147: reset all saved settings to their default before loading a game (#12210)
|
7 months ago |
Jonathan G Rennison
|
b04a356f53
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/vehicle.cpp
|
7 months ago |
Jonathan G Rennison
|
9e807d2072
|
Fix desync after joining a server with flood_from_edges setting enabled
|
7 months ago |
Peter Nelson
|
f0a891c4f7
|
Cleanup: Remove unused last_num_specs from SlRoadStopTileData. (#12198)
Inadvertently copy & pasted from another Sl handler.
|
7 months ago |
Jonathan G Rennison
|
f403d99c90
|
Saveload: Add helper to iterate orders from order lists and vehicles
|
7 months ago |
Loïc Guilloux
|
fad77261ea
|
Fix f6dd505: Missing savegame conversion for current_order (#12188)
|
7 months ago |
Jonathan G Rennison
|
567e235883
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/saveload/saveload.h
|
7 months ago |
Jonathan G Rennison
|
93bf033107
|
Add whether the vehicle is non-front to the vehicle pool pointer tag
Add iteration filters which check this
|
7 months ago |
Peter Nelson
|
56cf89d189
|
Change: Use bitmap for free unit ID generation. (#12165)
This improves performance of finding the next free unit number for a vehicle.
Based loosely on pool's used slot bitmap.
|
7 months ago |
Jonathan G Rennison
|
090656bd7f
|
Adjust handling of year display in wallclock mode and company inauguration years
See: #657
|
7 months ago |
Rubidium
|
4c117dd2d8
|
Revert #11993: new number format system does not and cannot work for CJK languages
There are too many intricacies that I am unaware of that are popping up after
asking whether things are right or not.
I do not want to keep playing whack-a-mole, so just revert the whole thing.
This reverts:
15be383b93
360fe8b0b6
1aa9a5c0ab
59f56941e5
7e2eefb91f
b741b2ba6f
609d0071d5
9f8fd80112
a253205b93
819c6c756e
|
7 months ago |
Jonathan G Rennison
|
5605650e26
|
Saveload: Don't apply state ticks offset on load if not stored in save
|
7 months ago |
Jonathan G Rennison
|
57a4586f08
|
Set flood from edges setting to false when loading old saves before then
|
7 months ago |
Jonathan G Rennison
|
593a81d421
|
Saveload: Rename IsSavegameVersionUntil to IsSavegameVersionBeforeOrAt
To match upstream
|
7 months ago |
Jonathan G Rennison
|
675b31887a
|
Saveload: Fix recalculation of _state_ticks
For XSLFI_VARIABLE_DAY_LENGTH versions 1 to 3
|
7 months ago |
Jonathan G Rennison
|
a92377fe98
|
Use upstream save/load for various unchanged chunks
|
7 months ago |
Jonathan G Rennison
|
ba1fa3ad29
|
Saveload: Fix SlNullPointers with upstream chunks
|
7 months ago |
Jonathan G Rennison
|
69ae516353
|
Fix loading of depot unbunch bit from vanilla saves
|
7 months ago |
Jonathan G Rennison
|
6e10f01f59
|
Fix timetable durations when loading old saves
With version 1 of XSLFI_TT_WAIT_IN_DEPOT or without XSLFI_TIMETABLE_EXTRA
|
7 months ago |
Jonathan G Rennison
|
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
|
7 months ago |
Jonathan G Rennison
|
4097fc4e33
|
Saveload: Enable upstream mode SlAutolength
Use non-upstream implementation for SlCopyBytes
|
7 months ago |
Jonathan G Rennison
|
8581808952
|
Merge tag '14.0-beta2' into jgrpp
# Conflicts:
# CMakeLists.txt
# src/cargotype.cpp
# src/console_cmds.cpp
# src/graph_gui.cpp
# src/industry_cmd.cpp
# src/industrytype.h
# src/misc_gui.cpp
# src/network/network_client.cpp
# src/newgrf.cpp
# src/newgrf_town.cpp
# src/object_cmd.cpp
# src/openttd.cpp
# src/pathfinder/water_regions.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/table/build_industry.h
# src/table/engines.h
# src/vehicle.cpp
# src/vehicle_cmd.cpp
# src/vehicle_gui.cpp
|
8 months ago |
Jonathan G Rennison
|
c6893388ab
|
Fix order flags collision in OT_GOTO_DEPOT
Move depot wait is timetabled flag to xflags
|
8 months ago |
Jonathan G Rennison
|
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
|
8 months ago |
Rubidium
|
a4d4301a0c
|
Codechange: We are heading to 15
|
8 months ago |
Rubidium
|
609d0071d5
|
Change: Remove saving of digit group and decimal separator configurations from the savegame
|
8 months ago |
Rubidium
|
e67fc33172
|
Codechange: Add support for NULL strings in SaveLoadCompat
|
8 months ago |
Jonathan G Rennison
|
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
|
8 months ago |
Jonathan G Rennison
|
c45bfccc2e
|
Always use 27ms/tick in wallclock timing mode
|
8 months ago |
Jonathan G Rennison
|
a48e15dce0
|
Add wallclock time settings
|
8 months ago |
Jonathan G Rennison
|
1f5b35fac4
|
Change link graph join and compression times to use scaled tick counter
|
8 months ago |
Jonathan G Rennison
|
7ce06e22b8
|
Split date types into calendar and economy dates
See: 735abfe1
|
8 months ago |
Jonathan G Rennison
|
5ab5f4ace7
|
Codefix df691eb3: Reloading GRFs destructed small UFO targeting road vehicle (#12072)
|
8 months ago |