Jonathan G Rennison
|
093bd804cd
|
Merge branch 'save_ext' into infrastructure_sharing
|
2018-01-26 18:18:46 +00:00 |
|
frosch
|
a47fb85cd8
|
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
|
2017-08-13 18:38:42 +00:00 |
|
peter1138
|
a77044f185
|
(svn r27788) -Fix [FS#6536]: Get vehicle load amount after executing new cargo trigger.
|
2017-03-13 07:37:05 +00:00 |
|
frosch
|
0b2f8c13a2
|
(svn r27585) -Fix [FS#6437]: Enforce a non-zero load amount for all vehicles, so that vehicles can process their cargo reservations.
|
2016-05-29 13:35:17 +00:00 |
|
frosch
|
a66e0ff1f4
|
(svn r27584) -Codechange: Add some assertions about Vehicle::cargo_payment.
|
2016-05-29 13:33:20 +00:00 |
|
Jonathan G Rennison
|
781bf73c6d
|
Fix incorrect calculation of final delivery payment.
Calculation was incorrect for partial packet delivery after a transfer.
|
2016-04-28 19:39:06 +01:00 |
|
Yoonji Park
|
a6fd74d29a
|
Unreserve PBS block when company resetted.
(cherry picked from commit 281a84f3494713af9d86248b7c3a1998c41c30a0)
|
2016-01-25 23:41:57 +00: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 |
|
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
|
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
|
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
|
7306fe015d
|
(svn r26917) -Revert (r26857): It broke improved loading.
|
2014-09-24 20:55:47 +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
|
672b14a7c6
|
(svn r26847) -Fix [FS#6110]: Don't assign a next hop when returning cargo
|
2014-09-18 17:49:19 +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
|
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
|
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
|
b8381b6b25
|
(svn r26549) -Change: better estimation for link capacities during full load
|
2014-05-01 14:50:52 +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
|
c81a6070cb
|
(svn r26547) -Codechange: Collect order travel and wait times independent of timetables
|
2014-05-01 14:49:16 +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
|
ba66343558
|
(svn r26483) -Fix: Allow single-vehicle consists to station-refit in a meaningful way.
|
2014-04-23 20:22:27 +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
|
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
|
06548d7b05
|
(svn r26236) -Fix: Don't overreserve after autorefit, but do reserve mail for aircraft
|
2014-01-12 17:44:55 +00:00 |
|
fonsinchen
|
feaeb497e7
|
(svn r26188) -Codechange: Move station refitting to a separate function.
|
2013-12-30 14:50:45 +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
|
fb281ce23c
|
(svn r25903) -Codechange: Refactor RefreshNextHopsStats into an own class LinkRefresher.
|
2013-10-22 18:34:10 +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
|
ae5e88e186
|
(svn r25565) -Codechange: Rewrite order prediction logic to introduce proper refit prediction
|
2013-07-06 17:01:31 +00:00 |
|
frosch
|
9e70d14a38
|
(svn r25497) -Fix (r25479): byte is not unit
|
2013-06-28 19:20:45 +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 |
|
fonsinchen
|
f022550df9
|
(svn r25361) -Feature: distribute cargo according to plan given by linkgraph
|
2013-06-09 13:03:48 +00:00 |
|
zuu
|
65129db43c
|
(svn r25342) -Add: StoryPage data structures and GS API
|
2013-06-09 12:19:09 +00:00 |
|
fonsinchen
|
5ecf43a57f
|
(svn r25330) -Fix [FS#5583]: return some reserved cargo if vehicle is overloaded by station stopping acceptance for cargo scheduled to be delivered
|
2013-06-07 22:22:52 +00:00 |
|
rubidium
|
6b746167e4
|
(svn r25259) -Codechange: track capacities and usage of links
|
2013-05-19 14:22:04 +00:00 |
|
frosch
|
c5d7445704
|
(svn r25185) -Fix [FS#5508]: Remove ambivalent functions CargoList::Empty() and Count(), and replace them with VehicleCargoList::StoredCount(), TotalCount(), StationCargoList::AvailableCount() and TotalCount(). (fonsinchen)
|
2013-04-13 13:42:08 +00:00 |
|
rubidium
|
adfbc32cec
|
(svn r25156) -Fix [FS#5495, FS#5497]: if a vehicle had some cargo, and it would try to unload without actually unloading, the vehicle would just not load any cargo at the station (fonsinchen)
|
2013-04-06 18:57:18 +00:00 |
|
frosch
|
972c4560dc
|
(svn r25041) -Remove [FS#3764-ish]: ordered refit with subtypes, since the cases where it worked were corner cases rather than the general case.
|
2013-02-24 16:41:51 +00:00 |
|
rubidium
|
7dd2354a13
|
(svn r25012) -Codechange: persistently keep 'reserved' cargo (for full-load improved loading) instead of calculating if for every cycle
|
2013-02-17 14:54:50 +00:00 |
|
rubidium
|
c62cbe04a4
|
(svn r25011) -Codechange: allow vehicle transfer and profit text effects to be shown at the same time (fonsinchen)
|
2013-02-17 14:50:54 +00:00 |
|
rubidium
|
4301d77d65
|
(svn r25009) -Codechange: refactor bits of cargo packet (lists) to reduce duplicated code (fonsinchen)
|
2013-02-17 14:17:06 +00:00 |
|
zuu
|
86c9cb9b8a
|
(svn r24986) -Change: Cleanup goals and cargo monitors of companies when they go bankrupt or are taken over.
|
2013-02-10 19:49:04 +00:00 |
|
rubidium
|
0f53f270c1
|
(svn r24968) -Fix [FS#5379]: company window was not updated when shared were enabled/disabled
|
2013-02-04 20:29:38 +00:00 |
|
rubidium
|
6dc631f5b4
|
(svn r24963) -Fix [FS#5435]: Do not stop loading if there are reservations left (fonsinchen)
|
2013-02-03 12:58:57 +00:00 |
|
rubidium
|
d17af458c1
|
(svn r24962) -Fix [FS#5438]: Reserve all capacity while unloading to avoid 'stealing' cargo, i.e. loading cargo onto a second vehicle when the first can't be fully filled yet (fonsinchen)
|
2013-02-03 10:06:34 +00:00 |
|
planetmaker
|
63a180aff1
|
(svn r24927) -Cleanup [FS#5440]: No need to check a positive value to be larger than 0
|
2013-01-20 16:17:24 +00:00 |
|
peter1138
|
1e10e91fde
|
(svn r24905) -Feature(ish): Implement station randomisation triggers.
|
2013-01-11 07:39:25 +00:00 |
|
peter1138
|
0d417a0323
|
(svn r24904) -Fix (r22746): "Train loads/unloads cargo" station animation triggers on individual platform
|
2013-01-10 22:56:49 +00:00 |
|