Commit Graph

435 Commits

Author SHA1 Message Date
Jonathan G Rennison
4c6dc11c16 Merge branch 'infrastructure_sharing-sx' into jgrpp
Conflicts:
	src/lang/english.txt
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/signal.cpp
	src/table/settings.ini
	src/vehicle.cpp
2015-08-06 23:11:49 +01:00
Jonathan G Rennison
a4ad4130a6 Merge branch 'master' into infrastructure_sharing
Conflicts:
	src/aircraft_cmd.cpp
	src/economy.cpp
	src/lang/english.txt
	src/order_gui.cpp
	src/roadveh_cmd.cpp
	src/saveload/saveload.cpp
	src/settings.cpp
	src/settings_gui.cpp
	src/train_cmd.cpp
2015-08-06 22:55:09 +01:00
patch-import
ee791055f9 Import infrastructure sharing patch
Strip trailing whitespace
Remove a leftover line form settings.ini

http://www.tt-forums.net/viewtopic.php?p=1008843#p1008843
2015-08-06 22:24:28 +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
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
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
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
rubidium
034735a54c (svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL) 2014-04-25 15:40:32 +00:00
rubidium
9ed12b0f07 (svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL) 2014-04-25 15:40:32 +00:00
rubidium
2be4215f43 (svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values 2014-04-23 20:13:33 +00:00
rubidium
0463dbdc9e (svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values 2014-04-23 20:13:33 +00:00
frosch
eb6974179d (svn r26317) -Fix [FS#5897]: Check whether NewGRF change vehicle capacity when they are not supposed to, and truncate cargo appropiately if they are allowed to. 2014-02-07 23:48:56 +00:00
frosch
41b7a04a68 (svn r26317) -Fix [FS#5897]: Check whether NewGRF change vehicle capacity when they are not supposed to, and truncate cargo appropiately if they are allowed to. 2014-02-07 23:48:56 +00:00
zuu
c0005afb06 (svn r25865) -Codechange: Refactor detecting of depot vehicle type of a tile to a new function, GetDepotVehicleType (cirdan, LordAro) 2013-10-13 20:11:05 +00:00
zuu
cef1c47f18 (svn r25865) -Codechange: Refactor detecting of depot vehicle type of a tile to a new function, GetDepotVehicleType (cirdan, LordAro) 2013-10-13 20:11:05 +00:00
frosch
34c9d8b77c (svn r25698) -Fix [FS#5700]: Autoreplace/renew also refits free wagons. 2013-08-06 21:01:14 +00:00
frosch
fbe6b92b1d (svn r25698) -Fix [FS#5700]: Autoreplace/renew also refits free wagons. 2013-08-06 21:01:14 +00:00
frosch
206616bf37 (svn r25648) -Change [FS#5669]: [NewGRF] Invalidate vehicle recolour palette during (un)loading. 2013-08-04 14:02:27 +00:00
frosch
5bda07c10c (svn r25648) -Change [FS#5669]: [NewGRF] Invalidate vehicle recolour palette during (un)loading. 2013-08-04 14:02:27 +00:00
rubidium
6b746167e4 (svn r25259) -Codechange: track capacities and usage of links 2013-05-19 14:22:04 +00:00
rubidium
3947453277 (svn r25259) -Codechange: track capacities and usage of links 2013-05-19 14:22:04 +00:00
frosch
f8d4f1f639 (svn r25040) -Add: a mode to CmdRefitVehicle to preserve the current subtype, also when refitting multiple vehicles. 2013-02-24 16:40:32 +00:00
frosch
205543f727 (svn r25040) -Add: a mode to CmdRefitVehicle to preserve the current subtype, also when refitting multiple vehicles. 2013-02-24 16:40:32 +00:00
rubidium
84ca041564 (svn r25008) -Codechange: Make CargoList::Truncate behave similarly to CargoList::MoveTo, i.e. pass the amount to truncate (fonsinchen) 2013-02-17 14:10:15 +00:00
rubidium
2795ed5b09 (svn r25008) -Codechange: Make CargoList::Truncate behave similarly to CargoList::MoveTo, i.e. pass the amount to truncate (fonsinchen) 2013-02-17 14:10:15 +00:00
rubidium
58ec317c5a (svn r24998) -Fix [FS#5137]: Set vehicle's service interval is percent flag appropriately on creation (peter1138) 2013-02-14 17:24:55 +00:00
rubidium
ced17303c2 (svn r24998) -Fix [FS#5137]: Set vehicle's service interval is percent flag appropriately on creation (peter1138) 2013-02-14 17:24:55 +00:00
rubidium
8539c04192 (svn r24995) -Codechange: Add flags to vehicle service interval for custom & ispercent (peter1138) 2013-02-14 17:06:49 +00:00
rubidium
369a6f9d1b (svn r24995) -Codechange: Add flags to vehicle service interval for custom & ispercent (peter1138) 2013-02-14 17:06:49 +00:00
rubidium
2c67dc3d9f (svn r24994) -Codechange: Replace access to service_interval with accessors (peter1138) 2013-02-14 17:04:01 +00:00
rubidium
c77cd1f409 (svn r24994) -Codechange: Replace access to service_interval with accessors (peter1138) 2013-02-14 17:04:01 +00:00
frosch
18a0faf57a (svn r24567) -Fix [FS#5261]: Non-train vehicle lists were not resorted when vehicles were renamed. (Juanjo) 2012-10-01 19:38:57 +00:00
frosch
6018a0190e (svn r24567) -Fix [FS#5261]: Non-train vehicle lists were not resorted when vehicles were renamed. (Juanjo) 2012-10-01 19:38:57 +00:00
frosch
358a2bd6ed (svn r24384) -Fix [FS#5188-ish]: Make IsInDepot() functions behave consistent across vehicle types and add IsChainInDepot instead, if that is what shall be checked. 2012-07-07 15:39:46 +00:00
frosch
08a8c3a773 (svn r24384) -Fix [FS#5188-ish]: Make IsInDepot() functions behave consistent across vehicle types and add IsChainInDepot instead, if that is what shall be checked. 2012-07-07 15:39:46 +00:00
frosch
df9a6d24a0 (svn r24382) -Fix: Call Vehicle::IsStoppedInDepot only for the first vehicle in a chain (i.e. primary vehicle or free wagon). 2012-07-07 15:35:28 +00:00
frosch
22632d5e9a (svn r24382) -Fix: Call Vehicle::IsStoppedInDepot only for the first vehicle in a chain (i.e. primary vehicle or free wagon). 2012-07-07 15:35:28 +00:00
frosch
46068abb1a (svn r23848) -Fix: Even if A == B, A can make more sense than B. 2012-01-24 22:30:57 +00:00
frosch
6dc33ed4b5 (svn r23848) -Fix: Even if A == B, A can make more sense than B. 2012-01-24 22:30:57 +00:00
rubidium
274f446b2c (svn r23783) -Cleanup: remove ancient but not needed command flag 2012-01-09 22:21:45 +00:00
rubidium
1a0fe0e8c6 (svn r23783) -Cleanup: remove ancient but not needed command flag 2012-01-09 22:21:45 +00:00
frosch
9317aad5ee (svn r23745) -Fix (r23087): If autorefit fails, count the vehicle capacity nevertheless, if it is already carrying the right thing. 2012-01-03 23:08:15 +00:00
frosch
00ec5da361 (svn r23745) -Fix (r23087): If autorefit fails, count the vehicle capacity nevertheless, if it is already carrying the right thing. 2012-01-03 23:08:15 +00:00
frosch
8b7143ef88 (svn r23743) -Fix [FS#4906]: Call CB 15E for all vehicles before actually executing any refit. 2012-01-03 22:04:12 +00:00
frosch
f5ebbc96e9 (svn r23743) -Fix [FS#4906]: Call CB 15E for all vehicles before actually executing any refit. 2012-01-03 22:04:12 +00:00
rubidium
d5eeab43b7 (svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files 2012-01-03 21:32:51 +00:00
rubidium
6d6be50ae0 (svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files 2012-01-03 21:32:51 +00:00
frosch
fdacbee8c4 (svn r23581) -Fix (r23518) [FS#4890]: Cloning of vehicles crashed. 2011-12-17 21:22:10 +00:00
frosch
fba9c756c7 (svn r23581) -Fix (r23518) [FS#4890]: Cloning of vehicles crashed. 2011-12-17 21:22:10 +00:00
rubidium
6b404d35b8 (svn r23540) -Codechange: unify and document vehicle widgets 2011-12-16 16:58:55 +00:00