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
|
2024-02-19 03:23:19 +00:00 |
|
Jonathan G Rennison
|
c6893388ab
|
Fix order flags collision in OT_GOTO_DEPOT
Move depot wait is timetabled flag to xflags
|
2024-02-19 00:41:05 +00:00 |
|
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
|
2024-02-18 22:22:29 +00:00 |
|
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
|
2024-02-17 11:53:35 +00:00 |
|
Jonathan G Rennison
|
c45bfccc2e
|
Always use 27ms/tick in wallclock timing mode
|
2024-02-16 17:55:49 +00:00 |
|
Jonathan G Rennison
|
a48e15dce0
|
Add wallclock time settings
|
2024-02-15 20:31:09 +00:00 |
|
Jonathan G Rennison
|
1f5b35fac4
|
Change link graph join and compression times to use scaled tick counter
|
2024-02-15 02:05:27 +00:00 |
|
Jonathan G Rennison
|
7ce06e22b8
|
Split date types into calendar and economy dates
See: 735abfe1
|
2024-02-13 21:34:09 +00:00 |
|
Jonathan G Rennison
|
1e2834a422
|
Use upstream/table format for game log chunk
|
2024-02-11 16:34:03 +00:00 |
|
Jonathan G Rennison
|
3407b3edc0
|
Fix tile hash cache check warnings when loading very old savegames
See: #648
|
2024-02-10 23:17:08 +00:00 |
|
Jonathan G Rennison
|
516e8defb5
|
Add wrappers to get and update the current effective day length factor
|
2024-02-09 19:39:58 +00:00 |
|
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
|
2024-02-09 18:50:49 +00:00 |
|
Jonathan G Rennison
|
9aa8059c79
|
Include elapsed state ticks since load in crash/failure logs
Consolidate game load date/time variables
|
2024-02-07 21:19:55 +00:00 |
|
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
|
2024-02-07 20:05:11 +00:00 |
|
Jonathan G Rennison
|
0ea57528c9
|
Rename DateTicksScaled to StateTicks
Rename various other related/derived types and variables
|
2024-02-07 18:36:47 +00:00 |
|
Peter Nelson
|
2fd9096070
|
Change: Decouple and remove landscape-dependent cargo types. (#11719)
Cargo types of default engines, industries and houses are now specified in terms of label.
|
2024-02-04 10:16:08 +00:00 |
|
Rubidium
|
7a740eefa0
|
Codechange: use std::unique_ptr for managing SaveLoadParams
|
2024-02-03 21:38:33 +01:00 |
|
Rubidium
|
4b372b6050
|
Codechange: use std::shared_ptr to manage saveload filters instead of manually trying to avoid double frees
|
2024-02-03 21:38:33 +01:00 |
|
Tyler Trahan
|
f6dd5053a3
|
Feature: Order flag to unbunch vehicles at depot (#11945)
|
2024-02-03 08:04:24 -05:00 |
|
Patric Stout
|
849fd5ae03
|
Change: [Script] replace easy/medium/hard values with default value (#11959)
|
2024-02-03 09:15:03 +00:00 |
|
frosch
|
b1718478c8
|
Codechange: Replace old non-standard attributes with C++17/20 standard attributes.
|
2024-02-02 22:29:28 +01:00 |
|
Peter Nelson
|
60dcf3b5e2
|
Codechange: Rename TownEffect to TownAcceptanceEffect.
This makes it clearer that TownEffect only affects acceptance behaviour.
|
2024-02-02 20:37:49 +00:00 |
|
Loïc Guilloux
|
ab1407fc43
|
Fix: [Script] Apply random deviation only at script start (#11944)
|
2024-02-01 10:48:40 +01:00 |
|
dP
|
897b59c158
|
Add: [GS] Allow to set max loan for each company separately (#11224)
|
2024-01-30 19:15:19 +01:00 |
|
Tyler Trahan
|
2b1f78d2ca
|
Fix: Use alternate timekeeping units in savegame title (#11912)
|
2024-01-29 22:11:00 +00:00 |
|
Koen Bussemaker
|
5a55c4a934
|
Feature: [NewGRF] Allow higher max speeds for ships
|
2024-01-28 14:54:51 +01:00 |
|
Jonathan G Rennison
|
1ce8930583
|
Use DateTicksScaled for Vehicle::last_loading_tick
|
2024-01-27 16:38:27 +00:00 |
|
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
|
2024-01-25 18:37:23 +00:00 |
|
Jonathan G Rennison
|
ced17a74e8
|
Do not update viewport signs when running headlessly
|
2024-01-24 23:26:02 +00:00 |
|
Tyler Trahan
|
21581b6ab3
|
Feature: Setting for minutes per calendar year (#11428)
|
2024-01-23 18:33:54 -05:00 |
|
Tyler Trahan
|
fd9e72a7e7
|
Feature: Use real-time "wallclock" timekeeping units (#11341)
|
2024-01-23 11:36:09 -05:00 |
|
Tyler Trahan
|
735abfe111
|
Codechange: Split dates and timers into Economy and Calendar time (#10700)
|
2024-01-22 09:04:34 -05:00 |
|
Kuhnovic
|
b38d3c2208
|
Change: simplified water region evaluation, removed savegame data (#11750)
|
2024-01-21 20:56:50 +00:00 |
|
Peter Nelson
|
c0ab436077
|
Codechange: Store Colours in Colours type. (#11625)
This reduces casts, some magic numbers, and introduces a bit of type-safety.
|
2024-01-21 13:23:04 +00:00 |
|
Rubidium
|
4cc97e04e6
|
Fix #11801, 51f1e93: CalcClosestTownFromTile needs the kd-tree to be valid
|
2024-01-17 23:40:19 +01:00 |
|
Rubidium
|
47c0184a0b
|
Codechange: replace ROR/ROL with std::rotr/rotl
|
2024-01-17 23:05:40 +01:00 |
|
Jonathan G Rennison
|
17d47ba06f
|
Fix 661bdae2: cargo_payment not cleared when aircraft loading cancelled
|
2024-01-17 06:33:54 +01:00 |
|
Patric Stout
|
fd073a2810
|
Remove: replace custom span with std::span
|
2024-01-17 00:25:08 +01:00 |
|
Patric Stout
|
8b4c5a6269
|
Codechange: compile-time validate the string format of SlErrorCorruptFmt (#11805)
|
2024-01-16 20:58:55 +00:00 |
|
Jonathan G Rennison
|
3ab31f5518
|
Add settings for town/industry cargo production scaling modes
|
2024-01-16 19:12:10 +00:00 |
|
Jonathan G Rennison
|
1e0bb019a7
|
Change cargo scaling settings to be linear instead of logarithmic
|
2024-01-16 18:02:34 +00:00 |
|
Jonathan G Rennison
|
c8ff26f2b8
|
Reset town/industry scaling settings when loading old games
|
2024-01-16 17:43:05 +00:00 |
|
Jonathan G Rennison
|
c8d82eb988
|
Fix two rail types per tile with savegame versions before 24
|
2024-01-16 01:15:58 +00:00 |
|
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
|
2024-01-16 01:15:58 +00:00 |
|
Rubidium
|
661bdae2e5
|
Fix #11785, cf16f45: when bumping aircraft into the air, remove them from the loading vehicle list again
|
2024-01-16 00:08:19 +01:00 |
|
Rubidium
|
f99793547e
|
Fix fbd71a9: for TTO savegames, getting the savegame type left the file pointing to the wrong location
|
2024-01-16 00:08:19 +01:00 |
|
Rubidium
|
d5518f6263
|
Fix 36a0818: TTO did not save company shares
|
2024-01-16 00:08:19 +01:00 |
|
Rubidium
|
51f1e939e8
|
Change: be more resilient against missing towns in old loader
|
2024-01-16 00:08:19 +01:00 |
|
Rubidium
|
67b405d2f6
|
Fix #11783, 953445a: TTO savegames are not 65536 by 65536
|
2024-01-16 00:08:19 +01:00 |
|
Rubidium
|
f5b320e502
|
Codechange: use range based for loop, instead of tile numbers
|
2024-01-16 00:08:19 +01:00 |
|