dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
53,405 Commits 1 Branch 0 Tags
bc3b928d345459f0965f7147d2dcb5d72d1a2374
Commit Graph

373 Commits

Author SHA1 Message Date
Jonathan G Rennison
dcbde21f18 Merge branch 'save_ext' into improved_breakdowns 
# Conflicts:
#	src/train_cmd.cpp
 2017-01-02 18:13:45 +00:00
Jonathan G Rennison
7f10d83a4a Merge branch 'template_train_replacement' into jgrpp 
# Conflicts:
#	src/linkgraph/linkgraphjob.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/train_cmd.cpp
#	src/vehicle_base.h
 2016-11-01 23:00:48 +00:00
frosch
ba566e9126 (svn r27668) -Feature: [NewGRF] Allow composing vehicles from multiple sprites. 2016-10-16 14:59:44 +00:00
frosch
117e73751c (svn r27668) -Feature: [NewGRF] Allow composing vehicles from multiple sprites. 2016-10-16 14:59:44 +00:00
frosch
f36539837e (svn r27666) -Codechange: Pass vehicle sprites around using a struct VehicleSpriteSeq. 2016-10-16 14:57:56 +00:00
frosch
d2393b4f6c (svn r27666) -Codechange: Pass vehicle sprites around using a struct VehicleSpriteSeq. 2016-10-16 14:57:56 +00:00
Jonathan G Rennison
55e98d1182 Merge branch 'cargo_type_order' into jgrpp 
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
 2016-10-11 19:02:03 +01:00
Jonathan G Rennison
4c74bda0af Fix extended order info not being saved for vehicle current order. 
This fixes desync and related issues when loading savegames where
extended order info is used.
 2016-10-11 19:01:16 +01:00
Jonathan G Rennison
a422cb6753 Use a deque instead of list for CargoPacketList and StationCargoPacketMap. 2016-09-13 22:58:00 +01:00
Jonathan G Rennison
d8a083b666 Allow timetable start dates to be set with full precision. 
This avoids rounding of start dates when using minutes and
day length > 1.
 2016-05-11 21:31:31 +01:00
Jonathan G Rennison
31a5baf555 Merge branch 'improved_breakdowns-sx' into jgrpp 
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
#	src/settings.cpp
 2016-02-02 23:09:29 +00:00
Jonathan G Rennison
fe2277dfbc Merge branch 'improved_breakdowns' into improved_breakdowns-sx 
# Conflicts:
#	src/saveload/vehicle_sl.cpp
#	src/table/settings.ini
 2016-01-31 23:40:17 +00:00
Jonathan G Rennison
5eed9865d6 Improved breakdowns: Various changes and fixes. 
* Revert breakdown_chance to (mostly) its original behaviour.
* Create a new breakdown_chance_factor to hold breakdown_chance
  from improved breakdowns logic.
* Revert airport crash probabilities back to original behaviour, with
  modified behaviour only during emergency landings.
* Low power breakdowns now only reduce the power of the engine which
  has broken down.
* Low power breakdowns no longer reduce speed directly.
* Add callback function to run whenever improved breakdowns setting
  is changed. Reset breakdown_chance_factor where required.
* More whitespace/formatting...
 2016-01-31 22:55:25 +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
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
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
ba8d8d99b8 Add support for loading SpringPP savegame versions 221 and 222. 
These correspond to versions from v2.1.108 and v2.1.147.
The oil rig airport type bug is fixed as of version 221.
The oil rig type has been moved, but this is not a problem as
the afterload code already remaps it to the correct value.
The cost scaling issue also seems to have been mostly fixed
as of version 221.
 2015-08-18 23:08:34 +01:00
Jonathan G Rennison
9716026809 Merge branch 'jgrpp' into save_ext_spp 2015-08-15 15:24:21 +01:00
Jonathan G Rennison
6b0e63e054 Merge branch 'improved_breakdowns-sx' into jgrpp 
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
 2015-08-09 23:59:58 +01:00
Jonathan G Rennison
15f3abf47d Fix typo in save/load ext feature enum name for improved breakdown. 2015-08-09 23:58:24 +01:00
Jonathan G Rennison
46103362c3 Fix for loading of SPP games games with aircraft. 2015-08-09 18:31:00 +01:00
Jonathan G Rennison
39608841f2 Initial support for loading savegames from SpringPP v2.0.102/103 
Savegame version 220

Bin all extra settings added in SpringPP.
Bin extra features: trip histories, more conditional orders/jump counter,
prev order time, snow-line chunk, town auto adv. campaign, etc.
Fix vehicle flags.
Fix bridges wrt height changes.
Handle 60-bit RIFF chunk sizes.
Doesn't deal with huge airports, loading games with these may
lead to undefined ehaviour.
PAX signals and traffic lights are ignored.
 2015-08-09 18:31:00 +01:00
Jonathan G Rennison
20e2f363f1 Merge branch 'vehicle_repair_costs-sx' into jgrpp 
Conflicts:
	src/lang/english.txt
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/settings_type.h
 2015-08-04 23:59:12 +01:00
Jonathan G Rennison
6bb8d5087d Vehicle repair costs patch: implement save/load changes. 2015-08-04 23:56:37 +01:00
Jonathan G Rennison
0a7441e56c Merge branch 'save_ext' into vehicle_repair_costs-sx 
Conflicts:
	src/saveload/saveload.cpp
	src/settings_gui.cpp
 2015-08-04 23:56:05 +01:00
Jonathan G Rennison
938babfe7b Vehicle repair costs patch: whitespace fixes. 2015-08-04 23:39:02 +01:00
patch-import
7537ae2a7e Import vehicle repair costs patch 
Strip trailing whitespace

http://www.tt-forums.net/viewtopic.php?p=1093268#p1093268
 2015-08-04 23:38:35 +01:00
Jonathan G Rennison
ba4e5dd62f Merge branch 'auto_timetables-sx' into jgrpp 
Conflicts:
	src/lang/english.txt
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/settings_gui.cpp
	src/vehicle.cpp
 2015-08-04 22:08:59 +01:00
Jonathan G Rennison
2e45dac18a Auto timetables patch: save/load changes, document rationale for 
moving addition to VehicleFlags
 2015-08-04 22:07:02 +01:00
Jonathan G Rennison
0ebf8b6b0b Fixes to auto timetable patch: move new VehicleFlags to end, 
whitespace & style, fix lang strings.
 2015-08-04 21:29:19 +01:00
patch-import
80deb3c01d Import auto timetable separation patch 
http://www.tt-forums.net/viewtopic.php?p=1140899#p1140899
 2015-08-04 21:27:23 +01:00
Jonathan G Rennison
a8c2c394a5 Merge branch 'improved_breakdowns-sx' into jgrpp 
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/settings_type.h
 2015-08-02 23:43:19 +01:00
Jonathan G Rennison
e91d0e49dc Improved breakdowns: Update save/load code 2015-08-02 23:16:33 +01:00
Jonathan G Rennison
80d52eb20e Improved breakdowns patch: fix various issues 
* Whitespace/formatting
* Fix setting lang string
* Fix spelling of VRF_TO_HEAVY
 2015-08-02 23:00:39 +01:00
patch-import
9f5164b403 Import Improved Breakdowns patch 
Fix trailing whitespace

http://www.tt-forums.net/viewtopic.php?p=1146419#p1146419
 2015-08-02 22:58:52 +01:00
patch-import
45b5145396 Add group info patch 
Fix whitespace, add NOSAVE comment in vehicle struct

http://www.tt-forums.net/viewtopic.php?f=33&t=72855
 2015-08-02 12:35:18 +01:00
rubidium
3dfb423446 (svn r26872) -Change: give the disaster vehicles the same treatment as aircraft in r26866; make the ascend and descend if needed to cross high mountains (based on patch by ic111) 2014-09-21 11:12:42 +00:00
rubidium
51a1c712f2 (svn r26872) -Change: give the disaster vehicles the same treatment as aircraft in r26866; make the ascend and descend if needed to cross high mountains (based on patch by ic111) 2014-09-21 11:12:42 +00:00
rubidium
39ded38c01 (svn r26866) -Change: make aircraft ascend/descend when they are too close to the ground or too far away (based on patch by ic111) 2014-09-21 06:35:34 +00:00
rubidium
c0771b1657 (svn r26866) -Change: make aircraft ascend/descend when they are too close to the ground or too far away (based on patch by ic111) 2014-09-21 06:35:34 +00:00
rubidium
8ab4f746f2 (svn r26864) -Codechange: bring a bit more OO into the disaster vehicles 2014-09-20 15:46:44 +00:00
rubidium
9e0f4b3847 (svn r26864) -Codechange: bring a bit more OO into the disaster vehicles 2014-09-20 15:46:44 +00:00
rubidium
ac269a3f08 (svn r26863) -Codechange: move a number of Vehicle* functions into the Vehicle class 2014-09-20 15:31:26 +00:00
rubidium
6c2abf0930 (svn r26863) -Codechange: move a number of Vehicle* functions into the Vehicle class 2014-09-20 15:31:26 +00:00
rubidium
489f88fa02 (svn r26636) -Fix [FS#6026-ish]: (memory) size of variables saved for disaster vehicles was not correct in saveload description 2014-06-09 17:42:48 +00:00