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
|
2 months ago |
Rubidium
|
27eadc13ec
|
Codechange: rename TILE_ADD(XY) to TileAdd(XY)
|
2 months ago |
|
Rubidium
|
bab5a8a787
|
Codechange: use std::source_location over __FILE__ and __LINE__ for Backup
|
2 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
|
2 months ago |
Loïc Guilloux
|
845b894fd8
|
Remove: [Script] random_deviation from setting description table (#12221)
|
3 months ago |
|
Jonathan G Rennison
|
9e807d2072
|
Fix desync after joining a server with flood_from_edges setting enabled
|
3 months ago |
|
Jonathan G Rennison
|
f403d99c90
|
Saveload: Add helper to iterate orders from order lists and vehicles
|
3 months ago |
|
Loïc Guilloux
|
fad77261ea
|
Fix f6dd505: Missing savegame conversion for current_order (#12188)
|
3 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
|
3 months ago |
|
Jonathan G Rennison
|
090656bd7f
|
Adjust handling of year display in wallclock mode and company inauguration years
See: #657
|
3 months ago |
|
Jonathan G Rennison
|
5605650e26
|
Saveload: Don't apply state ticks offset on load if not stored in save
|
3 months ago |
|
Jonathan G Rennison
|
57a4586f08
|
Set flood from edges setting to false when loading old saves before then
|
3 months ago |
|
Jonathan G Rennison
|
593a81d421
|
Saveload: Rename IsSavegameVersionUntil to IsSavegameVersionBeforeOrAt
To match upstream
|
3 months ago |
|
Jonathan G Rennison
|
675b31887a
|
Saveload: Fix recalculation of _state_ticks
For XSLFI_VARIABLE_DAY_LENGTH versions 1 to 3
|
3 months ago |
|
Jonathan G Rennison
|
69ae516353
|
Fix loading of depot unbunch bit from vanilla saves
|
3 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
|
3 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
|
3 months ago |
|
Jonathan G Rennison
|
c6893388ab
|
Fix order flags collision in OT_GOTO_DEPOT
Move depot wait is timetabled flag to xflags
|
3 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
|
3 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
|
3 months ago |
|
Jonathan G Rennison
|
c45bfccc2e
|
Always use 27ms/tick in wallclock timing mode
|
3 months ago |
|
Jonathan G Rennison
|
a48e15dce0
|
Add wallclock time settings
|
3 months ago |
|
Jonathan G Rennison
|
1f5b35fac4
|
Change link graph join and compression times to use scaled tick counter
|
3 months ago |
|
Jonathan G Rennison
|
7ce06e22b8
|
Split date types into calendar and economy dates
See: 735abfe1
|
3 months ago |
|
Loïc Guilloux
|
3ffa176870
|
Change: [Script] Store randomizers in savegame (#12063)
|
3 months ago |
|
Jonathan G Rennison
|
3407b3edc0
|
Fix tile hash cache check warnings when loading very old savegames
See: #648
|
3 months ago |
|
Jonathan G Rennison
|
516e8defb5
|
Add wrappers to get and update the current effective day length factor
|
3 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
|
3 months ago |
|
Jonathan G Rennison
|
9aa8059c79
|
Include elapsed state ticks since load in crash/failure logs
Consolidate game load date/time variables
|
3 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
|
3 months ago |
|
Jonathan G Rennison
|
0ea57528c9
|
Rename DateTicksScaled to StateTicks
Rename various other related/derived types and variables
|
3 months ago |
Tyler Trahan
|
b2b4cceb49
|
Fix #11997: Adjust economy date by 1920 when loading TTD/TTO savegames (#12007)
|
3 months ago |
|
Tyler Trahan
|
f6dd5053a3
|
Feature: Order flag to unbunch vehicles at depot (#11945)
|
4 months ago |
Patric Stout
|
849fd5ae03
|
Change: [Script] replace easy/medium/hard values with default value (#11959)
|
4 months ago |
frosch
|
b1718478c8
|
Codechange: Replace old non-standard attributes with C++17/20 standard attributes.
|
4 months ago |
Peter Nelson
|
60dcf3b5e2
|
Codechange: Rename TownEffect to TownAcceptanceEffect.
This makes it clearer that TownEffect only affects acceptance behaviour.
|
4 months ago |
|
Loïc Guilloux
|
ab1407fc43
|
Fix: [Script] Apply random deviation only at script start (#11944)
|
4 months ago |
dP
|
897b59c158
|
Add: [GS] Allow to set max loan for each company separately (#11224)
|
4 months ago |
Koen Bussemaker
|
5a55c4a934
|
Feature: [NewGRF] Allow higher max speeds for ships
|
4 months ago |
|
Jonathan G Rennison
|
1ce8930583
|
Use DateTicksScaled for Vehicle::last_loading_tick
|
4 months ago |
|
Jonathan G Rennison
|
ced17a74e8
|
Do not update viewport signs when running headlessly
|
4 months ago |
|
Tyler Trahan
|
fd9e72a7e7
|
Feature: Use real-time "wallclock" timekeeping units (#11341)
|
4 months ago |
|
Tyler Trahan
|
735abfe111
|
Codechange: Split dates and timers into Economy and Calendar time (#10700)
|
4 months ago |
Kuhnovic
|
b38d3c2208
|
Change: simplified water region evaluation, removed savegame data (#11750)
|
4 months ago |
|
Peter Nelson
|
c0ab436077
|
Codechange: Store Colours in Colours type. (#11625)
This reduces casts, some magic numbers, and introduces a bit of type-safety.
|
4 months ago |
|
Jonathan G Rennison
|
3ab31f5518
|
Add settings for town/industry cargo production scaling modes
|
4 months ago |
|
Jonathan G Rennison
|
1e0bb019a7
|
Change cargo scaling settings to be linear instead of logarithmic
|
4 months ago |
|
Jonathan G Rennison
|
c8ff26f2b8
|
Reset town/industry scaling settings when loading old games
|
4 months ago |
|
Jonathan G Rennison
|
c8d82eb988
|
Fix two rail types per tile with savegame versions before 24
|
4 months ago |
|
Jonathan G Rennison
|
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 |