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 |
|
frosch
|
32cb62a242
|
(svn r27282) -Fix [FS#6254]: Enforce the company's default service intervals when purchasing another company. (Johnnei)
|
2015-05-11 16:58:09 +00:00 |
|
frosch
|
a7849377dd
|
(svn r27282) -Fix [FS#6254]: Enforce the company's default service intervals when purchasing another company. (Johnnei)
|
2015-05-11 16:58:09 +00:00 |
|
frosch
|
e686add63a
|
(svn r27281) -Codechange: Do not shadow local variables with other local variables in sub-scopes.
|
2015-05-11 16:53:05 +00:00 |
|
frosch
|
eccbe842b3
|
(svn r27281) -Codechange: Do not shadow local variables with other local variables in sub-scopes.
|
2015-05-11 16:53:05 +00:00 |
|
fonsinchen
|
75cb16a7d7
|
(svn r26918) -Fix [FS#6110]: Reserve cargo only after unloading finished or if the vehicle has the desired cargo already
|
2014-09-24 20:56:52 +00:00 |
|
fonsinchen
|
1b8186ea8e
|
(svn r26918) -Fix [FS#6110]: Reserve cargo only after unloading finished or if the vehicle has the desired cargo already
|
2014-09-24 20:56:52 +00:00 |
|
fonsinchen
|
d6fc217136
|
(svn r26917) -Revert (r26857): It broke improved loading.
|
2014-09-24 20:55:47 +00:00 |
|
fonsinchen
|
7306fe015d
|
(svn r26917) -Revert (r26857): It broke improved loading.
|
2014-09-24 20:55:47 +00:00 |
|
fonsinchen
|
c4902c4150
|
(svn r26857) -Fix [FS#6110]: Reserve cargo after refitting and only if necessary.
|
2014-09-20 09:41:25 +00:00 |
|
fonsinchen
|
e353f22dc1
|
(svn r26857) -Fix [FS#6110]: Reserve cargo after refitting and only if necessary.
|
2014-09-20 09:41:25 +00:00 |
|
fonsinchen
|
dfbcd8869d
|
(svn r26847) -Fix [FS#6110]: Don't assign a next hop when returning cargo
|
2014-09-18 17:49:19 +00:00 |
|
fonsinchen
|
672b14a7c6
|
(svn r26847) -Fix [FS#6110]: Don't assign a next hop when returning cargo
|
2014-09-18 17:49:19 +00:00 |
|
fonsinchen
|
3648e95265
|
(svn r26586) -Fix [FS#5995]: Consider multiheaded trains in station refits (and clean up a bit)
|
2014-05-13 19:16:04 +00:00 |
|
fonsinchen
|
b2e322a3fc
|
(svn r26586) -Fix [FS#5995]: Consider multiheaded trains in station refits (and clean up a bit)
|
2014-05-13 19:16:04 +00:00 |
|
rubidium
|
b590a64718
|
(svn r26581) -Fix [FS#5989]: transfering cargo to a station doesn't give that station a rating and thus the cargo does not decay... until the first pickup happens
For cargo drops from industries/houses, the station gets a rating too so why not when cargo is dropped at the station from a train?
|
2014-05-11 18:31:38 +00:00 |
|
rubidium
|
81c2d75048
|
(svn r26581) -Fix [FS#5989]: transfering cargo to a station doesn't give that station a rating and thus the cargo does not decay... until the first pickup happens
For cargo drops from industries/houses, the station gets a rating too so why not when cargo is dropped at the station from a train?
|
2014-05-11 18:31:38 +00:00 |
|
rubidium
|
89c25b955e
|
(svn r26580) -Codechange: s/GES_PICKUP/GES_RATING/ (it has nothing to do with actual pickup), s/acceptance_pickup/status/ (the enum isn't called GoodEntryStatus for a reason; it's not only acceptance and pickup anymore)
|
2014-05-11 18:02:11 +00:00 |
|
rubidium
|
fb9dbf30fa
|
(svn r26580) -Codechange: s/GES_PICKUP/GES_RATING/ (it has nothing to do with actual pickup), s/acceptance_pickup/status/ (the enum isn't called GoodEntryStatus for a reason; it's not only acceptance and pickup anymore)
|
2014-05-11 18:02:11 +00:00 |
|
fonsinchen
|
11d98f043e
|
(svn r26549) -Change: better estimation for link capacities during full load
|
2014-05-01 14:50:52 +00:00 |
|
fonsinchen
|
b8381b6b25
|
(svn r26549) -Change: better estimation for link capacities during full load
|
2014-05-01 14:50:52 +00:00 |
|
fonsinchen
|
b5566ae6ec
|
(svn r26548) -Codechange: move updating of load_unload_ticks out of LoadUnloadVehicle
|
2014-05-01 14:49:44 +00:00 |
|
fonsinchen
|
d5bd72296b
|
(svn r26548) -Codechange: move updating of load_unload_ticks out of LoadUnloadVehicle
|
2014-05-01 14:49:44 +00:00 |
|
fonsinchen
|
3ee31a8f89
|
(svn r26547) -Codechange: Collect order travel and wait times independent of timetables
|
2014-05-01 14:49:16 +00:00 |
|
fonsinchen
|
c81a6070cb
|
(svn r26547) -Codechange: Collect order travel and wait times independent of timetables
|
2014-05-01 14:49:16 +00:00 |
|
fonsinchen
|
c915d9fa55
|
(svn r26546) -Codechange: Make order wait_time, travel_time and max_speed private
|
2014-05-01 14:48:44 +00:00 |
|
fonsinchen
|
d49dad9f9c
|
(svn r26546) -Codechange: Make order wait_time, travel_time and max_speed private
|
2014-05-01 14:48:44 +00:00 |
|
fonsinchen
|
49f27eb247
|
(svn r26483) -Fix: Allow single-vehicle consists to station-refit in a meaningful way.
|
2014-04-23 20:22:27 +00:00 |
|
fonsinchen
|
ba66343558
|
(svn r26483) -Fix: Allow single-vehicle consists to station-refit in a meaningful way.
|
2014-04-23 20:22:27 +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 |
|
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 |
|
fonsinchen
|
88787412b6
|
(svn r26327) -Fix [FS#5901]: Take care of next_station when reassigning from MTA_DELIVER to MTA_TRANSFER.
|
2014-02-09 21:10:25 +00:00 |
|
fonsinchen
|
fbd6707afc
|
(svn r26327) -Fix [FS#5901]: Take care of next_station when reassigning from MTA_DELIVER to MTA_TRANSFER.
|
2014-02-09 21:10:25 +00:00 |
|
fonsinchen
|
9ad173c9cc
|
(svn r26236) -Fix: Don't overreserve after autorefit, but do reserve mail for aircraft
|
2014-01-12 17:44:55 +00:00 |
|
fonsinchen
|
06548d7b05
|
(svn r26236) -Fix: Don't overreserve after autorefit, but do reserve mail for aircraft
|
2014-01-12 17:44:55 +00:00 |
|
fonsinchen
|
ecdd796a86
|
(svn r26188) -Codechange: Move station refitting to a separate function.
|
2013-12-30 14:50:45 +00:00 |
|
fonsinchen
|
feaeb497e7
|
(svn r26188) -Codechange: Move station refitting to a separate function.
|
2013-12-30 14:50:45 +00:00 |
|
fonsinchen
|
63b43ed914
|
(svn r26187) -Fix: allow refitting at station if cargo has already been reserved.
|
2013-12-30 14:50:09 +00:00 |
|
fonsinchen
|
7d5640166f
|
(svn r26187) -Fix: allow refitting at station if cargo has already been reserved.
|
2013-12-30 14:50:09 +00:00 |
|
fonsinchen
|
6e1cc80926
|
(svn r25903) -Codechange: Refactor RefreshNextHopsStats into an own class LinkRefresher.
|
2013-10-22 18:34:10 +00:00 |
|
fonsinchen
|
fb281ce23c
|
(svn r25903) -Codechange: Refactor RefreshNextHopsStats into an own class LinkRefresher.
|
2013-10-22 18:34:10 +00:00 |
|
fonsinchen
|
54db96be43
|
(svn r25891) -Feature: Use smallstack to allow for multiple next hops when loading and unloading.
|
2013-10-20 13:47:58 +00:00 |
|
fonsinchen
|
fff00b6460
|
(svn r25891) -Feature: Use smallstack to allow for multiple next hops when loading and unloading.
|
2013-10-20 13:47:58 +00:00 |
|
fonsinchen
|
b09c4043ec
|
(svn r25565) -Codechange: Rewrite order prediction logic to introduce proper refit prediction
|
2013-07-06 17:01:31 +00:00 |
|
fonsinchen
|
ae5e88e186
|
(svn r25565) -Codechange: Rewrite order prediction logic to introduce proper refit prediction
|
2013-07-06 17:01:31 +00:00 |
|
frosch
|
934f4decba
|
(svn r25497) -Fix (r25479): byte is not unit
|
2013-06-28 19:20:45 +00:00 |
|
frosch
|
9e70d14a38
|
(svn r25497) -Fix (r25479): byte is not unit
|
2013-06-28 19:20:45 +00:00 |
|
frosch
|
7c9f0545b4
|
(svn r25479) -Fix (r23861): [NewGRF] When cargo NewGRF define a mulitplier to modify vehicle capacities, use the same multiplier to modify loading speed.
|
2013-06-26 20:38:32 +00:00 |
|
frosch
|
8cbb0ffa2b
|
(svn r25479) -Fix (r23861): [NewGRF] When cargo NewGRF define a mulitplier to modify vehicle capacities, use the same multiplier to modify loading speed.
|
2013-06-26 20:38:32 +00:00 |
|