Commit Graph

22350 Commits

Author SHA1 Message Date
HackaLittleBit
80500f8f08 Rework z position 2018-02-04 12:47:36 +00:00
HackaLittleBit
64c8985cd7 Remove 90 degree comment 2018-02-04 12:47:03 +00:00
HackaLittleBit
e4a10e9313 Revert part of collision detection on aqueducts, on aqueducts collision detection will not be done. 2018-01-26 20:07:32 +00:00
HackaLittleBit
354ecfdf3a Handle ship collision detection on aquaducts. 2018-01-25 18:31:11 +00:00
HackaLittleBit
e2d3c95ae1 Enable ships to pass on both sides of other ships. 2018-01-25 18:27:07 +00:00
HackaLittleBit
828e9bece2 De-duplicate ship entry to exit direction map table 2018-01-25 18:22:53 +00:00
HackaLittleBit
c5888dad9f Changes to ship collision avoidance algorithm
* Change some names and create a seperate procedure for finding ships.
* Check if destiny tile is buoy. If so, distance checking continues.
* Remove water tile check. It was done before and coast can't have 3 way tracks.
* Add a check for map edges.
* Add speed adjustment related to distance between ships
* Do not detect ships on tiles with parallel tracks
2018-01-23 00:39:08 +00:00
Jonathan G Rennison
b00b1125be Add a dedicated setting to enable ship collision avoidance. 2016-01-19 22:37:23 +00:00
Jonathan G Rennison
c74a8ad557 Merge branch 'ship_collision_avoidance' into ship_collision_avoidance-sx 2016-01-19 22:22:10 +00:00
Jonathan G Rennison
804245202a Merge branch 'master' into save_ext 2016-01-19 22:21:52 +00:00
patch-import
917391102b Import ship collision-avoidance patch.
https://github.com/KeldorKatarn/OpenTTD_PatchPack
2016-01-19 22:01:16 +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
planetmaker
96aa437f85 (svn r27472) -Change [FS#6401] (r20219): On Haiku use the appropriate system variable to obtain the include dir (aarroyoc) 2015-12-15 20:43:39 +00:00
translators
ed7e09833e (svn r27471) -Update from WebTranslator v3.0:
czech - 1 changes by djst
2015-12-15 18:45:10 +00:00
translators
7338ed075f (svn r27470) -Update from WebTranslator v3.0:
turkish - 69 changes by wakeup
2015-12-11 18:45:09 +00:00
zuu
8660a2c2b1 (svn r27469) -Fix (r27468): Don't fetch all content info from content server when showing a online content window with exactly one type of content. 2015-12-10 19:58:33 +00:00
zuu
566d7de6af (svn r27468) -Fix (r27444): Game Scripts were not displayed in the content download window when opened from the AI/GS settings window. 2015-12-10 18:28:01 +00:00
translators
696626a8e9 (svn r27467) -Update from WebTranslator v3.0:
simplified_chinese - 1 changes by Gavin
turkish - 34 changes by wakeup
2015-12-09 18:45:14 +00:00
translators
ae767d30a4 (svn r27466) -Update from WebTranslator v3.0:
hungarian - 1 changes by IPG
spanish - 2 changes by SilverSurferZzZ
2015-12-04 18:45:14 +00:00
translators
ae1bb896e6 (svn r27465) -Update from WebTranslator v3.0:
spanish - 5 changes by SilverSurferZzZ
2015-12-03 18:45:08 +00:00
translators
1bf75b1abb (svn r27464) -Update from WebTranslator v3.0:
spanish - 8 changes by SilverSurferZzZ
2015-12-02 18:45:09 +00:00
frosch
e78a03d7b4 (svn r27463) -Merge: Documentation updates from 1.5 branch 2015-12-01 19:49:49 +00:00