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

141 Commits

Author SHA1 Message Date
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
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
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
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
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
frosch
34c9d8b77c (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
rubidium
6b746167e4 (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
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
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
8539c04192 (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
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
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
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
46068abb1a (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
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
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
rubidium
d5eeab43b7 (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
rubidium
6b404d35b8 (svn r23540) -Codechange: unify and document vehicle widgets 2011-12-16 16:58:55 +00:00
michi_cc
f7f3e5226f (svn r23518) -Fix (r23124): [NewGRF] The refit cost callback wasn't called if only the subtype differed. 2011-12-14 22:38:15 +00:00
michi_cc
957b643ae6 (svn r23504) -Feature: Aircraft range. 2011-12-13 00:43:35 +00:00
frosch
e83fa1da5b (svn r23487) -Change/Fix: Make autoreplace, autorenew, cloning and autorefit check all articulated parts of a vehicle to find a shared cargo subtype. 2011-12-10 21:09:21 +00:00
frosch
3178814a00 (svn r23173) -Codechange: Rename GetVehicleCapacity() to Engine::DetermineCapacity(). 2011-11-09 16:38:50 +00:00
frosch
6365d92776 (svn r23142) -Change: [NewGRF v8] Unify the return values of callbacks returning D0xx texts. 2011-11-08 17:24:43 +00:00
michi_cc
767f5d39dd (svn r23127) -Fix [FS#4819] (r23086): Don't crash when refitting default vehicles. 2011-11-06 22:14:55 +00:00
michi_cc
4be7812fdc (svn r23124) -Change: [NewGRF] Interpret the result of the refit cost callback as a signed value. 2011-11-06 15:33:23 +00:00
michi_cc
1497efbd5d (svn r23112) -Codechange: Check if vehicle chain lengths stays constant when auto-refitting. 2011-11-04 15:04:29 +00:00
michi_cc
886bd3c4c7 (svn r23087) -Feature: Auto-refitting of vehicles during loading at a station when the vehicle allows it. 2011-11-04 00:38:51 +00:00
michi_cc
ffca761cad (svn r23086) -Feature: [NewGRF] Callback to change refit cost depending on old and new cargo type. 2011-11-04 00:35:05 +00:00
frosch
ad38f27242 (svn r23075) -Codechange: Add GetGRF() and GetGRFID() methods to Engine and Vehicle to simplify code. 2011-11-01 00:23:41 +00:00
frosch
e57ba5d0ae (svn r23074) -Codechange: Add Vehicle::GetEngine() to simplify code. 2011-11-01 00:21:08 +00:00
frosch
37301ea23d (svn r22985) -Feature: Display autoreplace status in group GUI. 2011-10-03 17:26:37 +00:00
frosch
f406385319 (svn r22981) -Add: GroupStatistics for the ALL_GROUP. 2011-10-03 17:23:41 +00:00
frosch
f43290d6af (svn r22980) -Add: GroupStatistics for DEFAULT_GROUP. 2011-10-03 17:22:56 +00:00
rubidium
8c335b8db6 (svn r22845) -Fix [FS#4745]: perform stricter checks on some commands (monoid) 2011-08-26 16:39:02 +00:00
michi_cc
d25840978c (svn r22713) -Feature: [NewGRF] Per vehicle custom cargo ageing period. 2011-08-03 20:55:08 +00:00
peter1138
6660278d5a (svn r22337) -Fix: Overly specific error message 2011-04-17 17:28:33 +00:00
rubidium
8183922813 (svn r22021) -Fix (r22019): ofcourse make doesn't notice files are gone, so it doesn't recompile everything that needs to be recompiled... 2011-02-07 22:49:38 +00:00
frosch
7b2ab9ba83 (svn r21926) -Fix [FS#4450](r21924): v != w. 2011-01-29 23:42:40 +00:00
terkhen
0e51dab6a6 (svn r21924) -Codechange: Unify some parts of the articulated vehicle code. 
-Cleanup: Avoid conversions to Train and RoadVehicle that are no longer required.
 2011-01-29 17:30:25 +00:00
frosch
ad6c92bc12 (svn r21904) -Fix: Include the capacity of non-refittable vehicles in the refitted-capacity, if their cargo matches. 2011-01-23 18:31:04 +00:00
frosch
aab0eff930 (svn r21902) -Fix: Do not count articulated parts when passing the number of vehicles to refit to the command. That may exceed 8 bits. 2011-01-23 14:58:54 +00:00
frosch
8411b28dcf (svn r21901) -Codechange: Save some bits in p2 of CmdRefitVehicle. 2011-01-23 13:25:26 +00:00
terkhen
44a10ac857 (svn r21858) -Codechange: Give more similar names to ArticulatedPart functions. 2011-01-19 18:41:53 +00:00
terkhen
d3dd1b0e2f (svn r21561) -Change: Allow to specify the number of vehicles to refit in the refit vehicle command. 2010-12-21 13:52:10 +00:00