Commit Graph

3643 Commits (9826c2481ebafb22ae88018d7900d852be6cee28)

Author SHA1 Message Date
Jonathan G Rennison 9826c2481e Merge branch 'order_occupancy-sx' into jgrpp 9 years ago
Jonathan G Rennison 8adf5e23a4 Merge branch 'order_occupancy' into order_occupancy-sx 9 years ago
Jonathan G Rennison 2955610575 Add order occupancy average.
Show overall average instead of % char in toggle button.
Add a sort mode.
9 years ago
Jonathan G Rennison 73e8c32a5d Merge branch 'tracerestrict-sx' into jgrpp
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/tracerestrict.h
	src/tracerestrict_gui.cpp
	src/train_cmd.cpp
9 years ago
Jonathan G Rennison 4fdc495eea Merge branch 'tracerestrict' into tracerestrict-sx 9 years ago
Jonathan G Rennison a671f40fc8 Merge branch 'save_ext' into tracerestrict-sx 9 years ago
patch-import 82cab7f31c Tracerestrict: Import "Long Reserve" feature.
https://github.com/KeldorKatarn/OpenTTD_PatchPack

Minor code de-duplications.
9 years ago
Jonathan G Rennison 27bdf2a8b6 Merge branch 'ship_collision_avoidance-sx' into jgrpp
Conflicts:
	src/settings_type.h
	src/table/settings.ini
9 years ago
Jonathan G Rennison b00b1125be Add a dedicated setting to enable ship collision avoidance. 9 years ago
Jonathan G Rennison cbf1ece361 Merge branch 'group_collapse' into jgrpp 9 years ago
Jonathan G Rennison b0b366898f Group collapsing is now per-window, remove C++11 dependance.
Change from a std::map to a SmallVector.
9 years ago
keldorkatarn 7673cadc0e Added buttons to collapse or expand ALL groups.
(cherry picked from commit bb6b96e8663b5cb3da87d8473e70e373a36b3997)
9 years ago
keldorkatarn 34304a130c Groups can now be collapsed and re-expanded.
(cherry picked from commit 9e8d5600557e2d115338a9b173f940065248ed27)
9 years ago
translators 25bda8a417 (svn r27500) -Update from Eints:
frisian: 16 changes by gjannema
9 years ago
translators 4459e01f79 (svn r27499) -Update from Eints:
korean: 34 changes by telk5093
catalan: 10 changes by juanjo
9 years ago
translators 16fb5bf9bb (svn r27498) -Update from Eints:
greek: 11 changes by Ferrum
9 years ago
Jonathan G Rennison 085476bb2a Merge branch 'master' into jgrpp 9 years ago
translators 3b1696f13a (svn r27495) -Update from Eints:
greek: 37 changes by Ferrum
lithuanian: 1 change by BlinK_
9 years ago
translators d046a02c7d (svn r27494) -Update from Eints:
frisian: 61 changes by gjannema
afrikaans: 1 change by telanus
9 years ago
translators e45f9d32c1 (svn r27493) -Update from Eints:
greek: 10 changes by Ferrum
9 years ago
translators f5359a70be (svn r27492) -Update from Eints:
catalan: 48 changes by juanjo
greek: 2 changes by Jubilee
9 years ago
translators 9c6655a37c (svn r27491) -Update from Eints:
croatian: 1 change by VoyagerOne
9 years ago
translators 45adb8f172 (svn r27490) -Update from Eints:
chinese (simplified): 1 change by siu238X
9 years ago
translators 5102ba54ea (svn r27489) -Update from Eints:
vietnamese: 1 change by nglekhoi
9 years ago
translators e1df8edf66 (svn r27488) -Update from Eints:
catalan: 19 changes by juanjo
9 years ago
translators ee00bef5a9 (svn r27487) -Update from Eints:
spanish: 1 change by SilverSurferZzZ
serbian: 57 changes by stravagante
catalan: 23 changes by juanjo
9 years ago
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
9 years ago
Jonathan G Rennison b51dd34fe4 Merge branch 'lifetime_profit-sx' into jgrpp
Conflicts:
	src/saveload/afterload.cpp
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/vehicle_gui.cpp
9 years ago
Jonathan G Rennison 179e6df800 Change lifetime profit display string to avoid breaking translations. 9 years ago
patch-import 71be17729e Import vehicle lifetime profit patch v3
http://www.tt-forums.net/viewtopic.php?p=1161735#p1161735
9 years ago
Jonathan G Rennison 87df28f3a2 Merge branch 'master' into jgrpp 9 years ago
Jonathan G Rennison b9091a0f6c Merge branch 'zoning' into jgrpp
Conflicts:
	src/station_gui.cpp
	src/zoning_cmd.cpp
9 years ago
Jonathan G Rennison 7f84a1c501 Zoning: Add mode to show station catchment only where station window open. 9 years ago
translators 137ecd5377 (svn r27485) -Update from Eints:
croatian: 114 changes by UnderwaterHesus
9 years ago
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
9 years ago
translators 864c6360eb (svn r27483) -Update from Eints:
norwegian (bokmal): 1 change by cuthbert
esperanto: 1 change by LaPingvino
9 years ago
Jonathan G Rennison 33ffa10fe5 Merge pull request #5 from auge8472/translate-de 9 years ago
translators 8e5487c347 (svn r27482) -Update from Eints:
irish: 23 changes by tem
9 years ago
Heiko August 5a93462de7 translate-de: fix: forgotten strings of improved breakdown patch 9 years ago
Heiko August 41b7fb80b5 translate-de: settings for building rivers in a running game 9 years ago
translators 12915a202f (svn r27480) -Update from Eints:
irish: 12 changes by tem
greek: 1 change by frosch
swedish: 1 change by Zuu
9 years ago
frosch cc3fcf7d61 (svn r27479) -Fix: Remove genders from non-default cases. 9 years ago
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
9 years ago
translators ff0f720e82 (svn r27477) -Update from WebTranslator v3.0:
greek - 76 changes by Ferrum
polish - 1 changes by ampersand
9 years ago
translators 82a412031b (svn r27476) -Update from WebTranslator v3.0:
german - 2 changes by mini1025
9 years ago
translators 7c7565e33c (svn r27475) -Update from WebTranslator v3.0:
slovak - 1 changes by Milsa
spanish - 3 changes by SilverSurferZzZ
9 years ago
translators afe19055bb (svn r27474) -Update from WebTranslator v3.0:
irish - 21 changes by tem
9 years ago
translators 1ebc92faec (svn r27473) -Update from WebTranslator v3.0:
welsh - 1 changes by kazzie
9 years ago
Jonathan G Rennison db2f08f86e Merge branch 'master' into jgrpp 9 years ago
Jonathan G Rennison 7673436d3a Trace restrict: add train ownership conditional.
Infra sharing whitespace fix.
9 years ago