Commit Graph

22367 Commits

Author SHA1 Message Date
Jonathan G Rennison
f3b1059930 Fix order removal due to shared-infra company deletion.
Order totals were not updated correctly, implicit orders not handled
properly, etc.
Create generic function for vehicle order filtering.
Use for station deletion and infra sharing company deletion.
2017-02-22 20:58:24 +00:00
Jonathan G Rennison
11e4bcee40 Slightly decrease proximity required for trains to crash.
This is to fix trains of different companies being able to crash when
two stations or line-ends are directly against each other.
2017-01-24 19:47:13 +00:00
Jonathan G Rennison
15dc498c79 Fix wrong calculation of infra sharing track deletion train repayment.
Head pointer was being used for vehicle value on iteration of
train vehicles.
2016-10-24 18:29:02 +01:00
Jonathan G Rennison
16de93413e Merge branch 'infrastructure_sharing' into infrastructure_sharing-sx 2016-04-28 22:23:12 +01: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
Jonathan G Rennison
1818a83e63 Add setting to control whether trains can crash with other companies'. 2016-02-25 22:08:27 +00:00
Jonathan G Rennison
66bac3808e Merge branch 'infrastructure_sharing' into infrastructure_sharing-sx 2016-02-25 19:49:58 +00:00
Jonathan G Rennison
495aa729df Fix VehicleCargoList::Truncate when not all cargo is MTA_KEEP. 2016-02-25 18:39:04 +00:00
Jonathan G Rennison
5bc5d43ffb Add checks to prevent coupling free wagon chains of different owners. 2016-02-13 16:51:35 +00:00
Jonathan G Rennison
a27bdbb3e2 Add company settings to enable competitors' to buy/renew in own depots. 2016-02-13 16:51:19 +00:00
Jonathan G Rennison
248ac0e263 Merge branch 'save_ext' into infrastructure_sharing-sx 2016-01-31 11:45:19 +00:00
Jonathan G Rennison
e5894b3948 Merge branch 'infrastructure_sharing' into infrastructure_sharing-sx 2016-01-31 11:45:08 +00:00
Jonathan G Rennison
6992312702 Merge branch 'master' into infrastructure_sharing 2016-01-31 11:44:54 +00:00
translators
4b894775af (svn r27505) -Update from Eints:
portuguese: 2 changes by neuralshock
2016-01-26 18:45:36 +00:00
Yoonji Park
a6fd74d29a Unreserve PBS block when company resetted.
(cherry picked from commit 281a84f3494713af9d86248b7c3a1998c41c30a0)
2016-01-25 23:41:57 +00:00
Yoonji Park
8c9e267edc Now can be crashed with other company's train.
(cherry picked from commit 66ce7057df27aeb276270fe4bdc31f68dc69add3)
2016-01-25 23:41:28 +00:00
translators
b23f22f0f6 (svn r27504) -Update from Eints:
catalan: 3 changes by juanjo
2016-01-25 18:45:36 +00:00
translators
3cc990d0f9 (svn r27503) -Update from Eints:
persian: 6 changes by Peymanpn
greek: 3 changes by Ferrum
2016-01-24 18:45:36 +00:00
translators
da104bee01 (svn r27502) -Update from Eints:
greek: 54 changes by Ferrum
2016-01-23 18:45:37 +00:00
translators
ff0c05f990 (svn r27501) -Update from Eints:
greek: 4 changes by Ferrum
2016-01-22 18:45:38 +00:00
Jonathan G Rennison
804245202a Merge branch 'master' into save_ext 2016-01-19 22:21:52 +00:00
translators
25bda8a417 (svn r27500) -Update from Eints:
frisian: 16 changes by gjannema
2016-01-18 18:45:36 +00:00
translators
4459e01f79 (svn r27499) -Update from Eints:
korean: 34 changes by telk5093
catalan: 10 changes by juanjo
2016-01-17 18:45:36 +00:00
translators
16fb5bf9bb (svn r27498) -Update from Eints:
greek: 11 changes by Ferrum
2016-01-14 18:45:35 +00:00
frosch
36e66a17dc (svn r27497) -Change: [NewGRF] Allow static NewGRF to enable the second rocky tile set. 2016-01-13 21:55:50 +00:00
frosch
265c8d090f (svn r27496) -Update: Baseset translations 2016-01-13 21:33:40 +00:00
translators
3b1696f13a (svn r27495) -Update from Eints:
greek: 37 changes by Ferrum
lithuanian: 1 change by BlinK_
2016-01-13 18:45:36 +00:00
translators
d046a02c7d (svn r27494) -Update from Eints:
frisian: 61 changes by gjannema
afrikaans: 1 change by telanus
2016-01-12 18:45:36 +00:00
translators
e45f9d32c1 (svn r27493) -Update from Eints:
greek: 10 changes by Ferrum
2016-01-11 18:45:35 +00:00
translators
f5359a70be (svn r27492) -Update from Eints:
catalan: 48 changes by juanjo
greek: 2 changes by Jubilee
2016-01-10 18:45:35 +00:00
translators
9c6655a37c (svn r27491) -Update from Eints:
croatian: 1 change by VoyagerOne
2016-01-09 18:45:38 +00:00
translators
45adb8f172 (svn r27490) -Update from Eints:
chinese (simplified): 1 change by siu238X
2016-01-08 18:45:37 +00:00
translators
5102ba54ea (svn r27489) -Update from Eints:
vietnamese: 1 change by nglekhoi
2016-01-06 18:45:35 +00:00
translators
e1df8edf66 (svn r27488) -Update from Eints:
catalan: 19 changes by juanjo
2016-01-03 18:45:37 +00:00
translators
ee00bef5a9 (svn r27487) -Update from Eints:
spanish: 1 change by SilverSurferZzZ
serbian: 57 changes by stravagante
catalan: 23 changes by juanjo
2016-01-02 18:45:38 +00:00
translators
60733359fa (svn r27486) -Update from Eints:
serbian: 86 changes by stravagante
catalan: 77 changes by juanjo
german: 1 change by mini1025
russian: 1 change by Lone_Wolf
latin: 1 change by Supercheese
2016-01-01 18:45:37 +00:00
Jonathan G Rennison
e6cce973ae Merge branch 'master' into save_ext 2016-01-01 14:25:36 +00:00
translators
137ecd5377 (svn r27485) -Update from Eints:
croatian: 114 changes by UnderwaterHesus
2015-12-31 18:45:36 +00:00
translators
7ab291af95 (svn r27484) -Update from Eints:
croatian: 4 changes by UnderwaterHesus
english (us): 1 change by Supercheese
serbian: 21 changes by stravagante
latin: 1 change by Supercheese
2015-12-30 18:45:36 +00:00
translators
864c6360eb (svn r27483) -Update from Eints:
norwegian (bokmal): 1 change by cuthbert
esperanto: 1 change by LaPingvino
2015-12-29 18:45:36 +00:00
translators
8e5487c347 (svn r27482) -Update from Eints:
irish: 23 changes by tem
2015-12-28 18:45:35 +00:00
michi_cc
4445809dd9 (svn r27481) -Fix: [Win32] Stdin/out/err need to be re-assigned differently if the runtime lib of MSVC2015 is used. 2015-12-28 13:16:41 +00:00
translators
12915a202f (svn r27480) -Update from Eints:
irish: 12 changes by tem
greek: 1 change by frosch
swedish: 1 change by Zuu
2015-12-27 19:45:37 +00:00
frosch
cc3fcf7d61 (svn r27479) -Fix: Remove genders from non-default cases. 2015-12-27 13:16:37 +00:00
translators
e9d4e9b896 (svn r27478) -Update from Eints:
german: 8 changes by translators, 2 changes by frosch
arabic (egypt): 36 changes by translators
afrikaans: 4 changes by translators
hungarian: 1 change by translators
english (us): 1 change by translators
frisian: 2 changes by translators
norwegian (bokmal): 5 changes by translators
norwegian (nynorsk): 1 change by translators
lithuanian: 5 changes by translators
slovenian: 4 changes by translators
russian: 1 change by translators
ukrainian: 2 changes by translators
welsh: 3 changes by translators
french: 5 changes by glx
english (au): 1 change by translators
irish: 1 change by translators
tamil: 1 change by translators
belarusian: 2 changes by translators
bulgarian: 1 change by translators
italian: 1 change by translators
scottish gaelic: 1 change by translators
romanian: 2 changes by translators
urdu: 5 changes by translators
turkish: 11 changes by translators
portuguese: 1 change by translators
latvian: 2 changes by translators
esperanto: 1 change by translators
dutch: 3 changes by translators
serbian: 1 change by translators
spanish: 1 change by translators
czech: 4 changes by translators
indonesian: 2 changes by translators
latin: 1 change by translators
catalan: 2 changes by translators
hebrew: 9 changes by translators
greek: 5 changes by translators
polish: 1 change by translators
chinese (traditional): 1 change by translators
slovak: 1 change by translators
icelandic: 2 changes by translators
portuguese (brazilian): 4 changes by translators
danish: 2 changes by translators
vietnamese: 6 changes by translators
malay: 2 changes by translators
galician: 4 changes by translators
croatian: 1 change by translators
korean: 4 changes by translators
finnish: 1 change by translators
chinese (simplified): 1 change by translators
estonian: 3 changes by translators
persian: 4 changes by translators
thai: 6 changes by translators
swedish: 1 change by translators
luxembourgish: 3 changes by translators
japanese: 5 changes by translators
basque: 2 changes by translators
2015-12-27 11:40:23 +00:00
translators
ff0f720e82 (svn r27477) -Update from WebTranslator v3.0:
greek - 76 changes by Ferrum
polish - 1 changes by ampersand
2015-12-24 18:45:14 +00:00
translators
82a412031b (svn r27476) -Update from WebTranslator v3.0:
german - 2 changes by mini1025
2015-12-23 18:45:08 +00:00
translators
7c7565e33c (svn r27475) -Update from WebTranslator v3.0:
slovak - 1 changes by Milsa
spanish - 3 changes by SilverSurferZzZ
2015-12-22 18:45:13 +00:00
translators
afe19055bb (svn r27474) -Update from WebTranslator v3.0:
irish - 21 changes by tem
2015-12-20 18:45:10 +00:00
translators
1ebc92faec (svn r27473) -Update from WebTranslator v3.0:
welsh - 1 changes by kazzie
2015-12-19 18:45:08 +00:00