dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
54,025 Commits 1 Branch 0 Tags
24b744f7c83435c0e70e8e1ffb8a40458da78480
Commit Graph

2505 Commits

Author SHA1 Message Date
Jonathan G Rennison
24b744f7c8 Merge branch 'master' into jgrpp 
# Conflicts:
#	bin/ai/CMakeLists.txt
#	bin/game/CMakeLists.txt
#	src/saveload/saveload.h
 2023-01-02 01:23:36 +00:00
Michael Lutz
150f05dc15 Change: Heading for 14 now. (#10302) 2023-01-01 22:52:23 +01:00
Jonathan G Rennison
1a5b485b41 Road stops: Use a struct for road stop tile data 2022-12-31 22:51:54 +00:00
Jonathan G Rennison
2c65b050e4 Saveload: Add SLEG_CONDVARVEC macros 2022-12-31 21:24:58 +00:00
Jonathan G Rennison
a1f6aaa58f Merge branch 'master' into jgrpp 
# Conflicts:
#	src/lang/korean.txt
#	src/saveload/afterload.cpp
#	src/saveload/ai_sl.cpp
#	src/saveload/game_sl.cpp
#	src/script/script_instance.cpp
 2022-12-31 18:17:24 +00:00
Loïc Guilloux
fe30f66570 Fix #9720: Delay start of GS/AI to after loading of savegame (#9745) 2022-12-28 05:02:26 +01:00
Jonathan G Rennison
64c210f770 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/build_vehicle_gui.cpp
#	src/engine.cpp
#	src/engine_func.h
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/newgrf.cpp
#	src/saveload/oldloader_sl.cpp
#	src/timetable_cmd.cpp
#	src/timetable_cmd.h
#	src/timetable_gui.cpp
 2022-12-28 01:46:29 +00:00
PeterN
961e66df30 Fix #10224: Don't fiddle with fast-forward when saving. (#10230) 
The original comment about saving with fast-forward on was written 18 years
ago, and predates lots of changes to how saveload work.
 2022-12-26 00:05:14 +01:00
Peter Nelson
cbf48c4dd9 Change: Add extra random seed to StartupEngines(). 
This means that calling reset_engines will rerandomise introduction dates
and reliability.

Probably not necessary.
 2022-12-25 16:41:58 +00:00
Peter Nelson
3485709f53 Add: Additional vehicle flags to control variants. 2022-12-25 16:41:58 +00:00
Jonathan G Rennison
3435e74c0c Merge branch 'master' into jgrpp 
# Conflicts:
#	.github/workflows/ci-build.yml
#	.github/workflows/release.yml
#	CMakeLists.txt
#	os/macosx/Info.plist.in
#	src/fileio.cpp
#	src/landscape.cpp
#	src/league_cmd.h
#	src/saveload/ai_sl.cpp
#	src/saveload/game_sl.cpp
#	src/saveload/league_sl.cpp
#	src/saveload/saveload.cpp
 2022-12-17 23:19:23 +00:00
Jonathan G Rennison
e0cb31ff07 Fix #10214: Header and footer missing from league table saveload 2022-12-16 21:07:36 +01:00
Jonathan G Rennison
3877bb31ef Changing day length or date no longer changes time in minutes 
Add offset variables for scaled date ticks.
Adjust offset when changing day length or date, such that scaled
date ticks remain the same.
Store _scaled_tick_counter and scaled date ticks offset in the savagame.
 2022-12-16 19:15:46 +00:00
Loïc Guilloux
4f9893cc98 Fix 55a1171: Restore skipping of "colour" character (#10244) 2022-12-16 01:56:25 +01:00
Loïc Guilloux
2848483810 Fix #10206: Disable scripts in intro game (#10241) 2022-12-15 21:43:07 +01:00
Jonathan G Rennison
5c2d5782a4 Fixes incorrect link graph edge travel times with non-unity day length 
Change vehicle last_loading_tick to be relative to _scaled_tick_counter
 2022-12-11 00:27:18 +00:00
Jonathan G Rennison
37a270e65c Add header and footer to league table saveload descriptor 
See: https://github.com/OpenTTD/OpenTTD/issues/10214
 2022-12-09 21:13:39 +00:00
Jonathan G Rennison
ce0dddc714 Saveload: Fix load and load check mixup with upstream chunks 
Fixes 690ef6cc
 2022-12-07 22:08:41 +00:00
Jonathan G Rennison
e647075870 Change LinkGraph::EdgeMatrix to a sparse storage format 
Use a btree_map instead of a SmallMatrix.
This avoids excessive storage requirements for large graphs,
and overly expensive edge matrix resize operations.
Remove next_edge iteration mechanism.
 2022-12-05 18:17:25 +00:00
Loïc Guilloux
13d2d11fa8 Fix #10216: Initialise RoadStop caches before using them and don't try to teleport crashed vehicles (#10217) 2022-12-05 12:46:46 +01:00
dP
c91033ac5e Feature: [GS] Scriptable league tables (#10001) 
(cherry picked from commit 5e14a20b3b)
 2022-12-03 22:28:49 +00:00
Jonathan G Rennison
690ef6cc22 Saveload: Add support for using upstream save/load for specific chunks 2022-12-03 22:28:49 +00:00
dP
5e14a20b3b Feature: [GS] Scriptable league tables (#10001) 2022-11-26 18:03:03 +01:00
Jonathan G Rennison
3d7e5d5369 Avoid unnecessary viewport redraws for unused tile loop house triggers 2022-11-24 02:38:10 +00:00
Jonathan G Rennison
1e769d050f Leave PLYP chunk unchanged when loading/saving server saves in non-MP 2022-11-17 00:40:12 +00:00
Jonathan G Rennison
dc03bac241 Saveload: Change SlLoadFromBuffer to take a template functor 2022-11-17 00:33:53 +00:00
Jonathan G Rennison
aa4501747f Merge branch 'master' into jgrpp 
# Conflicts:
#	src/base_station_base.h
#	src/lang/german.txt
#	src/saveload/station_sl.cpp
#	src/station.cpp
#	src/station_cmd.cpp
 2022-11-06 20:33:37 +00:00
Peter Nelson
22803f997b Codechange: Use std::vector for station speclist 
This removes manual memory allocation, although we still manage the list
size in roughly the same way.
 2022-11-06 16:50:42 +01:00
Jonathan G Rennison
0bf1c9bb9d Merge tag '13.0-beta1' into jgrpp 2022-11-05 19:12:42 +00:00
Nicolas Chappe
a43a1902bb Feature: [Linkgraph] Prioritize faster routes for passengers, mail and express cargo 
Passengers usually prefer fast paths to short paths.
Average travel times of links are updated in real-time for use in Dijkstra's algorithm,
and newer travel times weigh more, just like capacities.

(cherry picked from commit 977604ef08)
 2022-11-05 19:07:35 +00:00
Jonathan G Rennison
49bda05fb5 Set adjacent crossings setting to false when loading pre v300 trunk savegames 2022-11-03 00:57:47 +00:00
Jonathan G Rennison
aba8e88d8c Enable loading of upstream savegames up to version 302 2022-11-02 18:46:24 +00:00
Tyler Trahan
c19abebf8d Feature: Multi-track level crossings (#9931) 2022-11-01 16:51:23 -04:00
Nicolas Chappe
f8a7b76675 Fix #9665: [Linkgraph] Fix travel times of non-direct journeys 2022-10-29 18:39:03 +02:00
Jonathan G Rennison
a8361cd608 Allow overriding town settings on a per-town basis 
Add a setting for whether this is allowed for non-privileged
multiplayer clients
 2022-10-23 22:07:51 +01:00
Jonathan G Rennison
38c2fa3b66 Add a change counter value special order type 2022-10-13 20:09:20 +01:00
Jonathan G Rennison
0818ce4ae7 Merge branch 'master' into jgrpp (SLV_U64_TICK_COUNTER) 
# Conflicts:
#	src/date.cpp
#	src/date_func.h
#	src/newgrf.cpp
#	src/newgrf_animation_base.h
#	src/saveload/gamelog_sl.cpp
#	src/saveload/misc_sl.cpp
#	src/saveload/saveload.h
#	src/stdafx.h
 2022-10-03 19:58:31 +01:00
Jonathan G Rennison
12eb23f0ab Clear old tree counter in map array on load of old savegames 
See: https://github.com/OpenTTD/OpenTTD/pull/10018
 2022-10-01 23:05:07 +01:00
Jonathan G Rennison
9e24414033 In ReloadNewGRFData recompute prices before reiniting windows 
Avoid crash if land info window is open during reload
 2022-10-01 14:31:26 +01:00
dP
548f0496a9 Change: Make _tick_counter 64bit to avoid wrapping (#10035) 2022-09-21 12:42:29 +02:00
Jonathan G Rennison
bc3b928d34 Fix improved breakdowns being enabled after loading old/other savegame 2022-09-16 20:28:58 +01:00
Jonathan G Rennison
7c4c75d181 Add tracerestrict conditional on direction of order target from signal 2022-09-07 22:53:03 +01:00
Jonathan G Rennison
5a39734a1c Allow station cargo histories to record larger values than 64k 
See: #414
 2022-09-06 23:03:46 +01:00
Jonathan G Rennison
23fa7cd239 Improve handling of company sales 
Avoid conflicts between bankruptcy and manual company sale paths
 2022-09-02 18:13:47 +01:00
Jonathan G Rennison
22a1fdff5e Log error message to console in LoadWithFilter exception handler 
See: #412
 2022-08-27 21:55:14 +01:00
Jonathan G Rennison
aa49e17e39 Remove road vehicles during load which are uncorrectably invalid 2022-08-07 20:00:40 +01:00
Jonathan G Rennison
4e8a8a5e0a Add conditional order to test if last/next dispatch slot is first/last 2022-07-03 15:49:29 +01:00
Jonathan G Rennison
c6ae82b611 Fix 9ff161e4 boosting lookahead braking stats but not actual brake forces 2022-07-01 23:39:02 +01:00
Jonathan G Rennison
6a69a5495f Add tracerestrict action to set combined normal/shunt signal mode 
Add associated conditional to get reservation end tile
 2022-06-28 01:16:57 +01:00
Jonathan G Rennison
a451b76c45 Remove unused extern declaration 2022-06-26 16:27:33 +01:00