dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
48,920 Commits 1 Branch 0 Tags
d210bc4d145d21e920e0709ec09da9937851066c
Commit Graph

237 Commits

Author SHA1 Message Date
Jonathan G Rennison
d210bc4d14 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/lang/korean.txt
#	src/saveload/afterload.cpp

Recalculate docking tile cache due to 57553cd8
 2020-04-01 00:32:45 +01:00
Jonathan G Rennison
ba65a79d09 Enable allowing/disallowing supply to a station, per cargo 
Ctrl-click station cargo rating
 2020-03-22 13:49:22 +00:00
Jonathan G Rennison
09b13dd484 Add conditional orders for cargo load percentage and waiting cargo amount 
See: #90
 2020-01-18 20:32:42 +00:00
Jonathan G Rennison
4936b3ba51 Add support for loading ChillPP v8 savegames 2020-01-03 00:08:33 +00:00
Jonathan G Rennison
5dc1027c6b Add initial support for loading ChillPP v14.7 savegames 2020-01-01 23:14:00 +00:00
Jonathan G Rennison
ec0b43f231 Clear rail ageing data when loading JokerPP savegames 
See #123
 2019-12-29 01:53:52 +00:00
Jonathan G Rennison
6f7ed57fbd Fix loading of ORDX chunk from JokerPP savegames 
See #123
 2019-12-28 23:43:20 +00:00
Jonathan G Rennison
d56d4ea51f Add initial support for loading JokerPP savegames 
See #123
 2019-12-28 13:10:32 +00:00
Jonathan G Rennison
aa8aae9a62 Initial implementation of tracerestrict speed restriction feature 2019-12-06 21:15:07 +00:00
Jonathan G Rennison
cbdd9f84d8 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/console_gui.cpp
#	src/lang/korean.txt
#	src/video/sdl2_v.cpp
#	src/video/sdl2_v.h
#	src/window.cpp
#	src/window_gui.h
 2019-11-12 18:43:10 +00:00
Jonathan G Rennison
b6e9817edb Link graph: Explicitly flag invalidated flow stats instead of minimising their flows 
Entirely exclude invalidated flow stats from link stats

Delete invalidated flow stats if they stay invalid for 32 link graph jobs

This is to prevent large numbers of invalidated flow stats from
unduly influencing link statistics
 2019-10-20 07:46:21 +01:00
Jonathan G Rennison
2deadabc97 Saveload: Improve SpringPP savegame detection 
Trunk savegames will soon reach the range of versions used by SpringPP
 2019-10-13 13:03:12 +01:00
Jonathan G Rennison
1bbfd69657 Bump tracerestrict version due to 7332c0b6 2019-10-12 01:23:06 +01:00
Jonathan G Rennison
3b178b6f07 Scheduled dispatch: Add order backup support 2019-10-07 21:22:31 +01:00
Jonathan G Rennison
04ef407ddf Merge branch 'jgrpp' into jgrpp-nrt 
# Conflicts:
#	.ottdrev-vc
#	README.md
#	jgrpp-changelog.md
#	src/ship_cmd.cpp
 2019-08-24 10:41:08 +01:00
Jonathan G Rennison
a1d36b02f0 Network: Add state checksum which is check in network sync 2019-08-06 03:03:40 +01:00
Jonathan G Rennison
d3e0c3787f Merge branch 'master' into jgrpp-nrt 
Merge trunk multiple docks implementation

# Conflicts:
#	docs/landscape_grid.html
#	src/order_cmd.cpp
#	src/pathfinder/npf/npf.cpp
#	src/pathfinder/yapf/yapf_ship.cpp
#	src/rail_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/oldloader_sl.cpp
#	src/saveload/station_sl.cpp
#	src/script/api/script_order.cpp
#	src/ship_cmd.cpp
#	src/station.cpp
#	src/station_base.h
#	src/station_cmd.cpp
#	src/tunnelbridge_cmd.cpp
 2019-07-13 20:34:52 +01:00
Jonathan G Rennison
c2470a21af Fix town production and acceptance cache saveload/update handling 2019-05-26 13:35:33 +01:00
Jonathan G Rennison
829c635add Add road layout change counter, add to road veh path caches 
Update layout counter when non-leaf road bits are added or removed
 2019-05-26 11:35:18 +01:00
Jonathan G Rennison
5a9790a196 Store crash/desync logs in crash/desync savegame 
Add console command to dump loaded debug log
 2019-05-23 22:53:17 +01:00
Jonathan G Rennison
ec1e848a7f Add log of game events since last load and overall 
Add console command
Add to crashlog
 2019-05-18 10:17:59 +01:00
Jonathan G Rennison
1ee33c46ef Linkgraph: Allow overriding distribution mode on a per-cargo basis, in game 2019-05-01 20:57:59 +01:00
Jonathan G Rennison
f54f549632 Add SlXvCheckSpecialSavegameVersions constants to SaveLoadVersion enum 2019-04-28 13:21:05 +01:00
Jonathan G Rennison
a6ea1ea408 Allow articulated road vehicles to overtake other vehicles 
Add setting
 2019-04-27 13:56:49 +01:00
Jonathan G Rennison
674732cd68 Merge: Codechange: Use null pointer literal instead of the NULL macro 2019-04-11 18:14:13 +01:00
Jonathan G Rennison
718554d255 Set tree water class for old savegames for chunnel support 2019-03-04 01:19:12 +00:00
Jonathan G Rennison
b11f1a233f Fix type mismatch in _sl_version extern declaration 2019-02-05 18:03:28 +00:00
Jonathan G Rennison
2142452305 Merge branch 'save_ext' into jgrpp 
# Conflicts:
#	Makefile.src.in
#	findversion.sh
#	projects/determineversion.vbs
#	src/gamelog.cpp
#	src/gamelog_internal.h
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/network/core/config.h
#	src/network/network.cpp
#	src/network/network_udp.cpp
#	src/rev.h
#	src/saveload/afterload.cpp
#	src/saveload/company_sl.cpp
#	src/saveload/depot_sl.cpp
#	src/saveload/gamelog_sl.cpp
#	src/saveload/misc_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/station_sl.cpp
#	src/saveload/town_sl.cpp
#	src/saveload/vehicle_sl.cpp
#	src/table/settings.ini
#	src/viewport.cpp
 2019-02-04 18:32:44 +00:00
Jonathan G Rennison
46b5b0155c Merge branch 'cpp-11' into save_ext 
# Conflicts:
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
 2019-02-04 18:24:38 +00:00
Jonathan G Rennison
c41463b259 Merge branch 'save_ext' into jgrpp 2019-01-31 18:11:51 +00:00
Jonathan G Rennison
02e2627765 Extend documentation in extended_ver_sl.cpp 
Correct typo
 2019-01-31 18:11:31 +00:00
Jonathan G Rennison
5f0258b0c5 Fix minor formatting issue in SlXvIsChunkDiscardable 2019-01-31 18:10:57 +00:00
Jonathan G Rennison
094160ede3 Merge remote-tracking branch 'damfr/save-unique-id' into jgrpp 
# Conflicts:
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
 2019-01-22 18:42:01 +00:00
Jonathan G Rennison
e15601e12f Cache whether a train may have a depot or bridge speed restriction 2019-01-19 21:22:32 +00:00
Jonathan G Rennison
d87ac8ec7e Improve performance of train breakdown detection 2019-01-19 04:39:16 +00:00
Jonathan G Rennison
0e7519f33e Merge branch 'more_cond_orders-sx' into jgrpp 
# Conflicts:
#	config.lib
#	projects/openttd_vs100.vcxproj
#	projects/openttd_vs100.vcxproj.filters
#	projects/openttd_vs80.vcproj
#	projects/openttd_vs90.vcproj
#	src/order_gui.cpp
#	src/order_type.h
#	src/saveload/afterload.cpp
#	src/saveload/extended_ver_sl.cpp
 2019-01-06 22:35:57 +00:00
Jonathan G Rennison
635c7ca2d5 Merge branch 'save_ext' into more_cond_orders-sx 
# Conflicts:
#	src/lang/english.txt
#	src/order_type.h
 2019-01-06 22:19:41 +00:00
Jonathan G Rennison
65b9a103ad Initial implementation of two rail types per tile 2018-12-21 03:27:58 +00:00
Jonathan G Rennison
cd41683b9b Add tracerestrict feature reverse behind signal 2018-12-09 01:13:27 +00:00
Jonathan G Rennison
a315d39067 Merge branch 'tracerestrict-sx' into jgrpp 
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
#	src/tracerestrict.h
 2018-12-05 20:15:53 +00:00
Jonathan G Rennison
cae0b21534 Trace restrict: Bump size of item type field 
Reserve value for TRIT_REVERSE
 2018-12-05 20:14:21 +00:00
Jonathan G Rennison
46b1ea81e4 Add company rate limit for land area purchasing 2018-11-23 18:47:36 +00:00
Jonathan G Rennison
83a063f51c Add train is in slot conditional order 2018-11-05 04:21:08 +00:00
Jonathan G Rennison
0e3986c39c Extend timetable wait/travel times from 16 to 32 bits wide 2018-10-22 19:12:38 +01:00
Jonathan G Rennison
ee00a28717 Merge branch 'template_train_replacement' into jgrpp 
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
 2018-10-18 23:57:20 +01:00
Jonathan G Rennison
c4f5c8e789 TBTR: Add option to replace only old vehicles 2018-10-18 23:54:40 +01:00
Jonathan G Rennison
3e50336079 Add trace restrict train status conditional 2018-08-21 19:22:35 +01:00
Jonathan G Rennison
d8b9e2953e Merge branch 'enhanced_viewport_overlay' into jgrpp 
# Conflicts:
#	src/command.cpp
#	src/saveload/extended_ver_sl.cpp
 2018-08-16 05:49:07 +01:00
keldorkatarn
98da7019d6 Plans: Make it possible to give plans a name. 
(cherry picked from commit d9b553f130a6eda36e2eea217785f829d3d8624e)
 2018-08-16 05:30:56 +01:00
Jonathan G Rennison
6578d94e63 Add support for timetabled wait times at waypoints 2018-08-14 12:35:05 +01:00