Jonathan G Rennison
|
090656bd7f
|
Adjust handling of year display in wallclock mode and company inauguration years
See: #657
|
4 months ago |
Jonathan G Rennison
|
593a81d421
|
Saveload: Rename IsSavegameVersionUntil to IsSavegameVersionBeforeOrAt
To match upstream
|
4 months ago |
Jonathan G Rennison
|
53b06a3d04
|
Add event flag for removing invalid RVs during load
|
4 months ago |
Jonathan G Rennison
|
f52d56249d
|
Saveload: Use table format for industry build data chunks
|
4 months ago |
Jonathan G Rennison
|
0e262620d2
|
Saveload: Use table format for NewGRF/ID mapping chunks
|
4 months ago |
Jonathan G Rennison
|
b3bd1bb5ad
|
Use upstream load for non-table script chunks
|
4 months ago |
Jonathan G Rennison
|
a92377fe98
|
Use upstream save/load for various unchanged chunks
|
4 months ago |
Jonathan G Rennison
|
b178be36f3
|
Saveload: Maintain map of chunk ID to (first byte) block mode
|
4 months ago |
Jonathan G Rennison
|
dadbad2bfc
|
Saveload: Log changes in SlExecWithSlVersion
|
4 months ago |
Jonathan G Rennison
|
6dec7a5b35
|
Saveload: Add PeekByte method to ReadBuffer
|
4 months ago |
Jonathan G Rennison
|
bd2358f6cc
|
Saveload: Tidy up logging of chunk IDs
Add helper to dump chunk IDs as strings
Avoid duplicate logging of load steps for upstream load paths
|
4 months ago |
Jonathan G Rennison
|
ba1fa3ad29
|
Saveload: Fix SlNullPointers with upstream chunks
|
4 months ago |
Jonathan G Rennison
|
b58ecb0cd8
|
Saveload: Remove unnecessary auto-length use for tracerestrict
|
4 months ago |
Jonathan G Rennison
|
8e8d698b24
|
Fix comment spelling errors
|
4 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
|
4 months ago |
Jonathan G Rennison
|
4097fc4e33
|
Saveload: Enable upstream mode SlAutolength
Use non-upstream implementation for SlCopyBytes
|
4 months ago |
Jonathan G Rennison
|
8a85055c68
|
Saveload: Use std::span for autosave temporary buffer view
|
4 months ago |
Jonathan G Rennison
|
1040f9612f
|
Saveload: Tag duplicate detection in SlTableHeader as maybe unused
|
4 months ago |
Jonathan G Rennison
|
a874bb70b1
|
Remove unused saveload desc in cheats_sl.cpp
|
4 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
|
4 months ago |
Jonathan G Rennison
|
c6893388ab
|
Fix order flags collision in OT_GOTO_DEPOT
Move depot wait is timetabled flag to xflags
|
4 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
|
4 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
|
4 months ago |
Jonathan G Rennison
|
1f5b35fac4
|
Change link graph join and compression times to use scaled tick counter
|
4 months ago |
Jonathan G Rennison
|
7ce06e22b8
|
Split date types into calendar and economy dates
See: 735abfe1
|
4 months ago |
Jonathan G Rennison
|
7460e73252
|
SaveLoad: Fix crash when joining network server which used GRF custom town zones
|
4 months ago |
Jonathan G Rennison
|
903adceab5
|
Maintain map of targeted road vehicles to small UFO disaster vehicle
|
4 months ago |
Jonathan G Rennison
|
1e2834a422
|
Use upstream/table format for game log chunk
|
4 months ago |
Jonathan G Rennison
|
b05738284b
|
Windows: Avoid destruction of unjoined std::thread on ExitProcess
See: #649
|
4 months ago |
Jonathan G Rennison
|
11f75933bf
|
Saveload: Use table format for DATE, VIEW, MAPS chunks
Merge MISC into DATE
|
4 months ago |
Jonathan G Rennison
|
195b3b6d1d
|
Saveload: Add initial table chunk support to non-upstream save backend
|
4 months ago |
Jonathan G Rennison
|
5aaff39164
|
Fix wrong saveload types for std::string
|
4 months ago |
Jonathan G Rennison
|
60e59a8233
|
Saveload: Add wrapper to simplify conditionally upstream chunks
Where they're always saved as upstream and conditional on a feature
|
4 months ago |
Jonathan G Rennison
|
cfebbfac8c
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/autoreplace_cmd.cpp
# src/company_base.h
# src/company_gui.cpp
# src/cpu.cpp
# src/debug.h
# src/group.h
# src/group_cmd.cpp
# src/house.h
# src/industry.h
# src/newgrf_house.cpp
# src/news_type.h
# src/openttd.cpp
# src/saveload/company_sl.cpp
# src/settings_type.h
# src/sl/oldloader_sl.cpp
# src/story.cpp
# src/table/town_land.h
# src/viewport.cpp
|
4 months ago |
Jonathan G Rennison
|
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
|
5 months ago |
Jonathan G Rennison
|
0ea57528c9
|
Rename DateTicksScaled to StateTicks
Rename various other related/derived types and variables
|
5 months ago |
Jonathan G Rennison
|
f966153ae2
|
Saveload: Remove use of randombytes in company passwords storage
Use RandomBytesWithFallback
Replace related key/data arrays with std::array
|
5 months ago |
Jonathan G Rennison
|
9492aa1c0d
|
Saveload: Add span overloads to ReadBuffer and MemoryDumper
|
5 months ago |
Jonathan G Rennison
|
9bea1e3cc3
|
Scheduled dispatch: Allow tagging departure slots, add to conditional order
|
5 months ago |
Jonathan G Rennison
|
6c329871f1
|
Scheduled dispatch: Add per dispatch slot flags field
Add flag for slot re-use
|
5 months ago |
Jonathan G Rennison
|
1edc828b76
|
Pre-filter object descriptors in order save/load
|
5 months ago |
Jonathan G Rennison
|
bd51b1b69a
|
Remove pre-init of static vector in train speed adaptation map save/load
|
5 months ago |
Jonathan G Rennison
|
5b052ff91a
|
Avoid truncation when calculating AircraftCache::cached_max_range_sqr
|
5 months ago |
Jonathan G Rennison
|
1ce8930583
|
Use DateTicksScaled for Vehicle::last_loading_tick
|
5 months ago |
Jonathan G Rennison
|
822ecae85d
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/cargotype.h
# src/core/CMakeLists.txt
# src/core/span_type.hpp
# src/fileio.cpp
# src/fios.cpp
# src/misc/endian_buffer.hpp
# src/misc_gui.cpp
# src/saveload/saveload.h
# src/saveload/vehicle_sl.cpp
# src/screenshot.cpp
# src/settings.cpp
# src/settings_internal.h
# src/stdafx.h
# src/string_func.h
# src/strings.cpp
# src/strings_func.h
# src/strings_internal.h
|
5 months ago |
Jonathan G Rennison
|
5b7689a0aa
|
Scheduled dispatch: Add flag to re-use all dispatch slots
|
5 months ago |
Jonathan G Rennison
|
d62ae41e03
|
Tracerestrict: Remove TRSCOF_ACQUIRE_TRY_ON_RESERVE, same as TRSCOF_ACQUIRE_TRY
|
5 months ago |
Jonathan G Rennison
|
fc51491361
|
Tracerestrict: Use combined aux and cond op fields for TRIT_SLOT subtype
|
5 months ago |
Rubidium
|
5c5057e0fc
|
Fix #11801, 51f1e93: CalcClosestTownFromTile needs the kd-tree to be valid
(cherry picked from commit 4cc97e04e6 )
|
5 months ago |
Jonathan G Rennison
|
1e0bb019a7
|
Change cargo scaling settings to be linear instead of logarithmic
|
5 months ago |