dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,924 Commits 1 Branch 0 Tags
712d5e9c662d7bf61b87a863565bd4d6ca3ac908
Commit Graph

848 Commits

Author SHA1 Message Date
Jonathan G Rennison
712d5e9c66 Fix set distributed timetable start not working when using minutes. 
Remove WALLCLOCK_NETWORK_COMPATIBLE, it's a pain and not useful.
Whitespace fixes.
 2016-01-30 16:02:05 +00:00
Jonathan G Rennison
78cf5ca682 Add setting for linkgraph times to be in non daylength scaled days. 
Savegame format change for link graph jobs.
Change link graph scheduler to support more than one operation
per day, on _date_fract ticks other than SPAWN_JOIN_TICK.
 2016-01-29 00:26:47 +00:00
Jonathan G Rennison
73e8c32a5d Merge branch 'tracerestrict-sx' into jgrpp 
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/tracerestrict.h
	src/tracerestrict_gui.cpp
	src/train_cmd.cpp
 2016-01-20 22:19:15 +00:00
Jonathan G Rennison
82081c768a Bump tracerestrict version due to long-reserve feature. 2016-01-20 22:03:21 +00:00
Jonathan G Rennison
a671f40fc8 Merge branch 'save_ext' into tracerestrict-sx 2016-01-20 22:02:14 +00:00
Jonathan G Rennison
b43962f0bd Merge branch 'improved_breakdowns-sx' into jgrpp 
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/saveload/vehicle_sl.cpp
	src/settings_type.h
 2016-01-18 23:09:17 +00:00
Jonathan G Rennison
1678415aff Merge branch 'improved_breakdowns' into improved_breakdowns-sx 
Update feature version.
 2016-01-18 23:05:11 +00:00
Jonathan G Rennison
5e924262f4 Fix speed reduction after critical breakdowns. 
Previous code set vcache.cached_max_speed directly (and incorrectly),
which did not survive across save/load or network joins.
Instead add a struct Train field to store the number
of critical breakdowns since last service and do the speed reduction
properly in Train::ConsistChanged.
Slightly tweak algorithm for speed reduction.
 2016-01-18 18:27:51 +00:00
Jonathan G Rennison
b51dd34fe4 Merge branch 'lifetime_profit-sx' into jgrpp 
Conflicts:
	src/saveload/afterload.cpp
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/vehicle_gui.cpp
 2016-01-01 15:04:54 +00:00
Jonathan G Rennison
07d24962cd Save/load changes for veh lifetime profit patch. 2016-01-01 14:53:00 +00:00
Jonathan G Rennison
d3e95f1c65 Merge branch 'lifetime_profit' into lifetime_profit-sx 
Conflicts:
	src/saveload/saveload.cpp
 2016-01-01 14:52:52 +00:00
patch-import
71be17729e Import vehicle lifetime profit patch v3 
http://www.tt-forums.net/viewtopic.php?p=1161735#p1161735
 2016-01-01 13:35:29 +00:00
Jonathan G Rennison
7673436d3a Trace restrict: add train ownership conditional. 
Infra sharing whitespace fix.
 2015-12-15 20:30:20 +00:00
Jonathan G Rennison
a3768d3a29 Label threads with a descriptive name where supported (pthreads). 2015-11-26 17:48:47 +00:00
Jonathan G Rennison
8d19727c93 Merge branch 'save_ext' into jgrpp 
Conflicts:
	src/pathfinder/follow_track.hpp
 2015-10-31 10:53:00 +00:00
Jonathan G Rennison
1234bdb07c Fix compilation issue with MSVC due to ordering of noreturn and cdecl. 2015-10-31 10:51:58 +00:00
Jonathan G Rennison
2e6b4cc961 Merge branch 'reverse_at_waypoint' into jgrpp 
Conflicts:
	src/order_gui.cpp
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/train_cmd.cpp
 2015-10-29 00:59:42 +00:00
Jonathan G Rennison
7bcd090a0f Add reverse at waypoint orders. 
The train will reverse when its tail is within the waypoint tile.
This is useful for reversing on train en-route, without creating
dedicated reversing sidings or platforms.
 2015-10-28 23:50:22 +00:00
Jonathan G Rennison
b48a01f233 Merge branch 'auto_timetables-sx' into jgrpp 
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/settings_gui.cpp
	src/settings_type.h
 2015-10-25 21:50:14 +00:00
Jonathan G Rennison
60a677692e Merge branch 'order_occupancy-sx' into jgrpp 
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/settings_gui.cpp
	src/table/company_settings.ini
 2015-10-25 21:47:07 +00:00
Jonathan G Rennison
26d32269a3 Make auto TT separation rate a company setting. 
Move auto TT by default setting to PLYX chunk.
 2015-10-25 21:41:25 +00:00
Jonathan G Rennison
a380573c32 Merge branch 'save_ext' into auto_timetables-sx 2015-10-25 21:41:20 +00:00
Jonathan G Rennison
6d263226d8 Move order occupancy smoothness to company settings. 2015-10-25 21:37:27 +00:00
Jonathan G Rennison
8001d86350 Merge branch 'save_ext' into order_occupancy-sx 2015-10-25 21:36:21 +00:00
Jonathan G Rennison
e606a847c6 Add an un-ordered chunk for extra company settings: PLYX. 
This is similar to the PATX chunk.
Minor refactoring to enable some code sharing between two chunks.
Fix MakeSettingsPatxList always regenerating cache.
Update documentation of PATX chunk structure.
 2015-10-25 21:35:40 +00:00
Jonathan G Rennison
66cd454c37 Merge branch 'day_length-sx' into jgrpp 2015-09-27 23:18:33 +01:00
Jonathan G Rennison
cce270d780 Merge branch 'day_length' into day_length-sx 2015-09-27 23:12:23 +01:00
Jonathan G Rennison
f03cd98d04 Check/print tick skip counter in desync and random logging. 2015-09-27 23:12:00 +01:00
Jonathan G Rennison
361b8b4540 Merge branch 'extra_large_maps-sx' into jgrpp 
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
 2015-09-12 14:19:26 +01:00
Jonathan G Rennison
421b9034e2 Add an extended version feature for map sizes > 8kx8k. 
This is to prevent earlier versions from trying to load the savegame
and aborting.
 2015-09-12 14:17:37 +01:00
Jonathan G Rennison
72dadf7c6b Merge branch 'save_ext' into extra_large_maps-sx 2015-09-12 14:15:47 +01:00
Jonathan G Rennison
d6395b97a7 Enable extended feature versions for saving to be set at run time. 2015-09-12 14:15:32 +01:00
Jonathan G Rennison
f27ca88596 Show error message instead of aborting when loading an invalid map size. 2015-09-12 13:33:35 +01:00
Jonathan G Rennison
8b994e255d Merge branch 'extra_large_maps-sx' into jgrpp 
Conflicts:
	src/saveload/saveload.cpp
 2015-09-11 22:50:35 +01:00
Jonathan G Rennison
86dea90c4f save_ext: Initial support for save/load of RIFF chunk sizes > 28 bits. 
Add a chunk extension header with a flag for increased RIFF size.
 2015-09-11 22:37:36 +01:00
Jonathan G Rennison
ec08a32c94 Perform SpringPP airport checks before calling AfterLoadVehicles. 
This is because AfterLoadVehicles may indirectly check airport
properties via the NewGRF code.

Defer missing GRF error message output until the end of AfterLoadGame
to avoid obscuring any earlier errors.
 2015-09-06 19:48:43 +01:00
Jonathan G Rennison
e9dc82c801 Merge branch 'auto_timetables-sx' into jgrpp 
Conflicts:
	src/saveload/extended_ver_sl.cpp
 2015-09-03 23:30:13 +01:00
Jonathan G Rennison
42370dc28d Add company setting to auto-enable auto timetables for new vehicles. 
Default: off.
 2015-09-03 23:27:26 +01:00
Jonathan G Rennison
5108a71240 SpringPP load: remove wait for cargo orders. 2015-09-02 21:25:33 +01:00
Jonathan G Rennison
3dec3242cc Merge branch 'tracerestrict-sx' into jgrpp 
Conflicts:
	src/saveload/extended_ver_sl.cpp
 2015-09-02 21:09:25 +01:00
Jonathan G Rennison
c751bba17c Bump SLXI tracerestrict version due to reserve through new feature. 2015-09-02 21:07:08 +01:00
Jonathan G Rennison
8f4c216b3f Merge branch 'tracerestrict' into tracerestrict-sx 2015-09-02 21:03:14 +01:00
Jonathan G Rennison
73b69c5594 Validate type of all instructions, log validation failures at load. 
The validator now checks that the type of conditional instructions
is known.
On a validation failure, the load code now outputs a corrupt savegame
message, with the validation error message and a program dump,
instead of using an assertion.
 2015-09-02 20:51:30 +01:00
Jonathan G Rennison
2edfccd187 SpringPP load: Fix loading when day-length > 1 
Adjust value of _date_fract.
 2015-08-31 19:42:34 +01:00
Jonathan G Rennison
44a41ba13e Fix traffic light removal not deleting animated tile. 2015-08-31 09:58:42 +01:00
Jonathan G Rennison
bbc131ce47 Merge branch 'jgrpp' into save_ext_spp 
Conflicts:
	src/saveload/order_sl.cpp
 2015-08-26 23:26:18 +01:00
Jonathan G Rennison
8357b911e5 Merge branch 'more_cond_orders-sx' into jgrpp 
Conflicts:
	src/order_base.h
	src/order_gui.cpp
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
 2015-08-26 23:24:41 +01:00
Jonathan G Rennison
77bcd5f2c2 More conditional orders: Extended save/load changes. 2015-08-26 23:15:33 +01:00
Jonathan G Rennison
0372bfcda7 Merge branch 'save_ext' into more_cond_orders-sx 
Conflicts:
	src/saveload/saveload.cpp
 2015-08-26 23:08:51 +01:00
Jonathan G Rennison
ffdd845b1c Merge branch 'master' into more_cond_orders 
Conflicts:
	src/order_base.h
	src/order_gui.cpp
	src/saveload/saveload.cpp
	src/saveload/saveload.h
 2015-08-26 22:51:47 +01:00