dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
46,888 Commits 1 Branch 0 Tags
035f5622b91d6e640b4b8934bcd36a4d883ef9e5
Commit Graph

46888 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Jonathan G Rennison
cbf1ece361 Merge branch 'group_collapse' into jgrpp 2016-01-19 21:16:25 +00:00
Jonathan G Rennison
3e8f370b4c Only enable collapse & (un)collapse all buttons where useful. 
Disable collapse button for leaf groups.
Disable (un)collapse all button when all non-leaf groups already
(un)collapsed.
 2016-01-19 21:15:48 +00:00
Jonathan G Rennison
e04fdeb4ec Add icon for collapsed groups. 2016-01-19 21:14:08 +00:00
Jonathan G Rennison
b24f540ac4 Fix distribution of shared order timetable start dates. 
(Ctrl-click on start date in timetable GUI)
This is due to a scaling issue.

(cherry picked from commit 37140f0038)
 2016-01-19 19:32:53 +00:00
Jonathan G Rennison
64f408dd32 Merge branch 'auto_timetables-sx' into jgrpp 2016-01-19 19:32:37 +00:00
Jonathan G Rennison
4d368c24ed Merge branch 'auto_timetables' into auto_timetables-sx 2016-01-19 19:29:26 +00:00
Jonathan G Rennison
2d3a75e3c0 Revert "Fix distribution of shared order timetable start dates." 
This reverts commit 37140f0038.

This is in the wrong branch.
 2016-01-19 19:28:32 +00:00
Jonathan G Rennison
84c604cb94 Fix auto timetable not being unset when sharing orders. 
Copy auto timetable when copying orders.
Clear autofill timetable when sharing, or copying automated orders.
 2016-01-19 19:25:11 +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
Jonathan G Rennison
1ce3e776b0 Version: Committing version data for tag: jgrpp-0.10.2 2016-01-19 01:05:21 +00:00
Jonathan G Rennison
b43962f0bd Merge branch 'improved_breakdowns-sx' into jgrpp 
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/saveload/vehicle_sl.cpp
	src/settings_type.h
 2016-01-18 23:09:17 +00:00
Jonathan G Rennison
1678415aff Merge branch 'improved_breakdowns' into improved_breakdowns-sx 
Update feature version.
 2016-01-18 23:05:11 +00:00
translators
25bda8a417 (svn r27500) -Update from Eints: 
frisian: 16 changes by gjannema
 2016-01-18 18:45:36 +00:00
translators
cb359e731c (svn r27500) -Update from Eints: 
frisian: 16 changes by gjannema
 2016-01-18 18:45:36 +00:00
Jonathan G Rennison
5e924262f4 Fix speed reduction after critical breakdowns. 
Previous code set vcache.cached_max_speed directly (and incorrectly),
which did not survive across save/load or network joins.
Instead add a struct Train field to store the number
of critical breakdowns since last service and do the speed reduction
properly in Train::ConsistChanged.
Slightly tweak algorithm for speed reduction.
 2016-01-18 18:27:51 +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
f00f6e6894 (svn r27499) -Update from Eints: 
korean: 34 changes by telk5093
catalan: 10 changes by juanjo
 2016-01-17 18:45:36 +00:00
Jonathan G Rennison
7169b1ff4c Version: Committing version data for tag: jgrpp-0.10.1 2016-01-15 19:12:26 +00:00
Jonathan G Rennison
0c29f9f9a0 Merge branch 'tracerestrict-sx' into jgrpp 2016-01-15 19:06:23 +00:00
Jonathan G Rennison
feeae4a200 Merge branch 'tracerestrict' into tracerestrict-sx 2016-01-15 19:06:12 +00:00
Jonathan G Rennison
ee38db6cde Fix font height cache being incorrect for FreeType fonts. 2016-01-15 18:38:48 +00:00
Jonathan G Rennison
b5b06351ac Tracerestrict: Fix GUI issue with picker button raise/lower states. 
When a picker button was selected, clicking on a different picker button
would cause both buttons to be raised, instead of just the previous.
 2016-01-14 19:12:54 +00:00
Jonathan G Rennison
d2e8d205b9 Tracerestrict: Fix copying an unrestricted signal making an empty program. 2016-01-14 19:09:34 +00:00
translators
16fb5bf9bb (svn r27498) -Update from Eints: 
greek: 11 changes by Ferrum
 2016-01-14 18:45:35 +00:00
translators
9cb644a2b9 (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
df82dcdf35 (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
frosch
00ce319efa (svn r27496) -Update: Baseset translations 2016-01-13 21:33:40 +00:00
Jonathan G Rennison
27e0937eef Version: Committing version data for tag: jgrpp-0.10.0 2016-01-13 21:29:13 +00:00
Jonathan G Rennison
3139ff4eaf Trim unnecessary info on bugfixes and debug features from the readme. 2016-01-13 21:24:14 +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
28191b0d97 (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
38b3b1aabb (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
69e1483c46 (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
72e24c6cff (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
17a1789088 (svn r27491) -Update from Eints: 
croatian: 1 change by VoyagerOne
 2016-01-09 18:45:38 +00:00