dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,920 Commits 1 Branch 0 Tags
2c9029703bd0fd98deff496b2687c9766031fa1e
Commit Graph

3651 Commits

Author SHA1 Message Date
Jonathan G Rennison
2c9029703b Add menu item to vehicle list to change order target. 
Allow moving depot/station/waypoint orders to a different depot/etc.
 2016-01-27 20:02:35 +00:00
Jonathan G Rennison
10b679bba5 Merge branch 'more_cond_orders-sx' into jgrpp 2016-01-25 23:29:31 +00:00
patch-import
c5f9d8b6de Import reduced tree patch 
http://www.tt-forums.net/viewtopic.php?p=890778#p890778

Update to recent trunk, use extended savegame framework.
Add setting help text, tweak setting name.
Pre-calculate tree growth probabilities.
 2016-01-25 23:27:11 +00:00
Jonathan G Rennison
5149912498 Merge branch 'master' into more_cond_orders 2016-01-25 23:14:20 +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
Jonathan G Rennison
9826c2481e Merge branch 'order_occupancy-sx' into jgrpp 2016-01-24 02:52:05 +00:00
Jonathan G Rennison
8adf5e23a4 Merge branch 'order_occupancy' into order_occupancy-sx 2016-01-24 02:51:51 +00:00
Jonathan G Rennison
2955610575 Add order occupancy average. 
Show overall average instead of % char in toggle button.
Add a sort mode.
 2016-01-24 02:51:40 +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
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
 2016-01-20 22:19:15 +00:00
Jonathan G Rennison
4fdc495eea Merge branch 'tracerestrict' into tracerestrict-sx 2016-01-20 22:02:20 +00:00
Jonathan G Rennison
a671f40fc8 Merge branch 'save_ext' into tracerestrict-sx 2016-01-20 22:02:14 +00:00
patch-import
82cab7f31c Tracerestrict: Import "Long Reserve" feature. 
https://github.com/KeldorKatarn/OpenTTD_PatchPack

Minor code de-duplications.
 2016-01-20 21:49:53 +00:00
Jonathan G Rennison
27bdf2a8b6 Merge branch 'ship_collision_avoidance-sx' into jgrpp 
Conflicts:
	src/settings_type.h
	src/table/settings.ini
 2016-01-19 22:38:32 +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
cbf1ece361 Merge branch 'group_collapse' into jgrpp 2016-01-19 21:16:25 +00:00
Jonathan G Rennison
b0b366898f Group collapsing is now per-window, remove C++11 dependance. 
Change from a std::map to a SmallVector.
 2016-01-19 19:01:51 +00:00
keldorkatarn
7673cadc0e Added buttons to collapse or expand ALL groups. 
(cherry picked from commit bb6b96e8663b5cb3da87d8473e70e373a36b3997)
 2016-01-19 18:36:30 +00:00
keldorkatarn
34304a130c Groups can now be collapsed and re-expanded. 
(cherry picked from commit 9e8d5600557e2d115338a9b173f940065248ed27)
 2016-01-19 18:35:40 +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
Jonathan G Rennison
085476bb2a Merge branch 'master' into jgrpp 2016-01-13 21:02:03 +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
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
 2016-01-01 15:04:54 +00:00
Jonathan G Rennison
179e6df800 Change lifetime profit display string to avoid breaking translations. 2016-01-01 14:46:21 +00:00
patch-import
71be17729e Import vehicle lifetime profit patch v3 
http://www.tt-forums.net/viewtopic.php?p=1161735#p1161735
 2016-01-01 13:35:29 +00:00
Jonathan G Rennison
87df28f3a2 Merge branch 'master' into jgrpp 2016-01-01 13:11:26 +00:00
Jonathan G Rennison
b9091a0f6c Merge branch 'zoning' into jgrpp 
Conflicts:
	src/station_gui.cpp
	src/zoning_cmd.cpp
 2016-01-01 13:09:11 +00:00
Jonathan G Rennison
7f84a1c501 Zoning: Add mode to show station catchment only where station window open. 2016-01-01 12:17:11 +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
Jonathan G Rennison
33ffa10fe5 Merge pull request #5 from auge8472/translate-de 2015-12-28 23:28:51 +00:00
translators
8e5487c347 (svn r27482) -Update from Eints: 
irish: 23 changes by tem
 2015-12-28 18:45:35 +00:00
Heiko August
5a93462de7 translate-de: fix: forgotten strings of improved breakdown patch 2015-12-28 18:20:38 +01:00
Heiko August
41b7fb80b5 translate-de: settings for building rivers in a running game 2015-12-28 15:52:04 +01: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