151394b8ff
Merge remote-tracking branch 'release/1.9' into 1.9
2019-07-09 17:53:04 +03:00
0fa41c7493
Fix #7491 : Send company update admin message when bankruptcy counter changes.
2019-05-28 10:20:32 +01:00
6dc675ac3c
Merge remote-tracking branch 'release/1.9' into 1.9
2019-04-23 18:25:14 +03:00
3ba683874b
Merge remote-tracking branch 'origin/master' into HEAD
2019-04-23 18:16:24 +03:00
abc0325ef1
Fix #7439 : don't overwrite CompanyRemoveReason with ClientID ( #7465 )
2019-04-08 20:06:02 +01:00
2fb4575f5f
Fix f58fa80e: Wrong company performance rating when money exceeds INT_MAX. ( #7382 )
...
Company performance rating calculation does not take into account the companies' money when those exceeds INT_MAX.
2019-03-24 15:24:21 +01:00
780593ae60
Fix #6633 : Cargo monitor industry delivery now accounts for which IndustryID the cargo was delivered to
2019-03-02 18:14:45 +01:00
456e67ac1c
Change: Owner of vehicle with exclusive transport rights may now load cargo from neutral stations ( #7256 )
2019-02-21 21:23:37 +00:00
8e7fe3973f
Add: CompanyCtrlAction enum for CMD_COMPANY_CTRL actions
2019-02-04 21:08:36 +01:00
48fb575502
Fix 11ab3c4ea2: Vehicles could not be refitted to cargo IDs higher than 32.
2019-01-29 17:57:28 +00:00
810887af30
Fix #6498 : Use int64 for all company rating calculations
2018-11-25 00:48:34 +01:00
e66cec8f86
Add: NewGRF support for 16-in-16-out industries
2018-11-03 21:43:54 +01:00
8859381d30
Add: Industries can produce and accept up to 16 different cargoes
2018-11-03 21:43:54 +01:00
f5b1115039
Doc: Lots and lots of doxymentation fixes
2018-10-31 12:35:54 +01:00
5f86e1a390
Codechange: Silence -Wclass-memaccess warnings with GCC8
2018-06-27 22:54:46 +02:00
66e3334f0e
Merge upstream branch 1.8
2018-05-31 22:59:50 +03:00
2b933a1b3b
(svn r27862) [1.7] -Backport from trunk:
...
- Fix: Failed to load lzo compressed savegames sometimes [FS#6450] (r27793)
- Fix: [Win32] Mark OpenTTD as DPI-aware to avoid OS window scaling that breaks mouse input [FS#6366] (r27791, r27790)
- Fix: [NewGRF] Get vehicle load amount after executing new cargo trigger [FS#6536] (r27788)
- Fix: AI configuration changed incorrect parameter when some parameters are hidden [FS#6479] (r27787, r27786)
- Fix: Buoys not always drawn after being placed depending on zoom level [FS#6508] (r27785)
- Fix: Allow rail conversion even if ship is on tile [FS#6505] (r27784)
2018-05-31 22:05:28 +03:00
4cebebcf68
Change: Add CargoTypes type for cargo masks. ( #6790 )
2018-05-21 22:08:39 +01:00
db54db00df
(svn r27981) -Change [FS#6679]: Check companies for bankruptcy before subtracting reoccuring monthly costs. (Samu)
2018-03-11 12:46:05 +00:00
b4b98e5165
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
2017-08-13 18:38:42 +00:00
b4cc822085
Merge svn r27779
...
Conflicts:
src/autoreplace_gui.cpp
src/economy.cpp
src/fios_gui.cpp
src/lang/spanish_MX.txt
src/network/network_gui.cpp
src/rev.cpp.in
src/road_gui.cpp
src/toolbar_gui.cpp
src/window.cpp
2017-03-17 23:14:41 +02:00
d31f9a83e7
(svn r27788) -Fix [FS#6536]: Get vehicle load amount after executing new cargo trigger.
2017-03-13 07:37:05 +00:00
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
b0c56f3432
(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
a66e0ff1f4
(svn r27584) -Codechange: Add some assertions about Vehicle::cargo_payment.
2016-05-29 13:33:20 +00:00
dac94c7cbc
(svn r27584) -Codechange: Add some assertions about Vehicle::cargo_payment.
2016-05-29 13:33:20 +00:00
595727c438
Fix for vehicles unable to fully load
2016-04-08 21:45:29 +03:00
dbdf6273a3
Lazy fix for crash https://bugs.openttd.org/task/6437
2016-04-08 21:45:28 +03:00
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
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
eccbe842b3
(svn r27281) -Codechange: Do not shadow local variables with other local variables in sub-scopes.
2015-05-11 16:53:05 +00:00
e686add63a
(svn r27281) -Codechange: Do not shadow local variables with other local variables in sub-scopes.
2015-05-11 16:53:05 +00:00
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
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
7306fe015d
(svn r26917) -Revert (r26857): It broke improved loading.
2014-09-24 20:55:47 +00:00
d6fc217136
(svn r26917) -Revert (r26857): It broke improved loading.
2014-09-24 20:55:47 +00:00
e353f22dc1
(svn r26857) -Fix [FS#6110]: Reserve cargo after refitting and only if necessary.
2014-09-20 09:41:25 +00:00
c4902c4150
(svn r26857) -Fix [FS#6110]: Reserve cargo after refitting and only if necessary.
2014-09-20 09:41:25 +00:00
672b14a7c6
(svn r26847) -Fix [FS#6110]: Don't assign a next hop when returning cargo
2014-09-18 17:49:19 +00:00
dfbcd8869d
(svn r26847) -Fix [FS#6110]: Don't assign a next hop when returning cargo
2014-09-18 17:49:19 +00:00
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
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
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
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
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
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
b8381b6b25
(svn r26549) -Change: better estimation for link capacities during full load
2014-05-01 14:50:52 +00:00
11d98f043e
(svn r26549) -Change: better estimation for link capacities during full load
2014-05-01 14:50:52 +00:00
d5bd72296b
(svn r26548) -Codechange: move updating of load_unload_ticks out of LoadUnloadVehicle
2014-05-01 14:49:44 +00:00
b5566ae6ec
(svn r26548) -Codechange: move updating of load_unload_ticks out of LoadUnloadVehicle
2014-05-01 14:49:44 +00:00
Sergii Pylypenko