dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,376 Commits 1 Branch 0 Tags
201294c16e84328d47fb096397f2fa9a46ead685
Commit Graph

23376 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan G Rennison
78cf5ca682 Add setting for linkgraph times to be in non daylength scaled days. 
Savegame format change for link graph jobs.
Change link graph scheduler to support more than one operation
per day, on _date_fract ticks other than SPAWN_JOIN_TICK.
 2016-01-29 00:26:47 +00:00
Jonathan G Rennison
3896952136 Join more than one link graph job at once where possible. 
This can occur when the link graph recalculation times are changed.
In particular, if the duration or interval are reduced, the new jobs
will be delayed until the completion of the previous long job,
and then remain backlogged thereafter as jobs are dequeued at the same
rate as they are queued.
 2016-01-28 19:32:21 +00:00
patch-import
2e04f211df Import remove all trees in scenario editor patch. 
http://www.tt-forums.net/viewtopic.php?f=33&t=49326

Update to current current version.
Use CMD_LANDSCAPE_CLEAR instead of CMD_CLEAR_AREA.
Whitespace, misc fixes.
 2016-01-28 00:09:14 +00:00
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
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
Jonathan G Rennison
10b679bba5 Merge branch 'more_cond_orders-sx' into jgrpp 2016-01-25 23:29:31 +00:00
Jonathan G Rennison
19a43fe986 Merge branch 'more_cond_orders' into more_cond_orders-sx 2016-01-25 23:29:24 +00:00
Jonathan G Rennison
8abdbcece6 Fix operator precedence issue in cargo waiting conditional order. 2016-01-25 23:29:15 +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
82081c768a Bump tracerestrict version due to long-reserve feature. 2016-01-20 22:03:21 +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
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
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
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