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

22952 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan G Rennison
cd298f4722 Version: Committing version data for tag: jgrpp-0.11.0 2016-02-04 02:06:43 +00:00
Jonathan G Rennison
dd94ed7b1f Merge branch 'tracerestrict-sx' into jgrpp 2016-02-04 01:47:43 +00:00
Jonathan G Rennison
4b5c8b77b3 Merge branch 'tracerestrict' into tracerestrict-sx 2016-02-04 01:47:11 +00:00
Jonathan G Rennison
817ce019ca Fix use of nullptr which breaks compilation on legacy compilers. 2016-02-04 01:46:23 +00:00
Jonathan G Rennison
31a5baf555 Merge branch 'improved_breakdowns-sx' into jgrpp 
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
#	src/settings.cpp
 2016-02-02 23:09:29 +00:00
Jonathan G Rennison
6890e0af35 Merge branch 'improved_breakdowns' into improved_breakdowns-sx 2016-02-01 00:21:57 +00:00
Jonathan G Rennison
5b2dc8bcd8 Fix vehicle needs repair speed limits being incorrect in vehicle details. 2016-02-01 00:21:51 +00:00
Jonathan G Rennison
fe2277dfbc Merge branch 'improved_breakdowns' into improved_breakdowns-sx 
# Conflicts:
#	src/saveload/vehicle_sl.cpp
#	src/table/settings.ini
 2016-01-31 23:40:17 +00:00
Jonathan G Rennison
e03d97eab6 Improved breakdowns: Fix string parameter count issues. 
Fix whitespace.
 2016-01-31 23:24:17 +00:00
Jonathan G Rennison
5eed9865d6 Improved breakdowns: Various changes and fixes. 
* Revert breakdown_chance to (mostly) its original behaviour.
* Create a new breakdown_chance_factor to hold breakdown_chance
  from improved breakdowns logic.
* Revert airport crash probabilities back to original behaviour, with
  modified behaviour only during emergency landings.
* Low power breakdowns now only reduce the power of the engine which
  has broken down.
* Low power breakdowns no longer reduce speed directly.
* Add callback function to run whenever improved breakdowns setting
  is changed. Reset breakdown_chance_factor where required.
* More whitespace/formatting...
 2016-01-31 22:55:25 +00:00
Jonathan G Rennison
41e0d65d6a Merge branch 'progsig-sx' into jgrpp 2016-01-31 20:56:22 +00:00
Jonathan G Rennison
1e9433e0ff progsig: Fix signal dependency being left dangling after cycling side. 
If the target of a programmable signal dependency was cycled to the
other side, the dependency was not cleared.
As the dependency was then no longer valid, it was not cleared by the
programmable signal.
Deleting the programmable signal and then the target signal resulted
in a crash.
 2016-01-31 20:56:11 +00:00
Jonathan G Rennison
9742300a1e Fix some more whitespace/formatting issues. 2016-01-31 15:22:46 +00:00
Jonathan G Rennison
61ff4f5d97 Limit linkgraph recalc interval to minimum of 2 ticks. 
The interval could otherwise fall to 1 tick at very high day lengths,
and low number of days interval, with recalc not scaled by day length
enabled.
 2016-01-31 12:22:03 +00:00
Jonathan G Rennison
9c49ba43da Merge branch 'infrastructure_sharing-sx' into jgrpp 2016-01-31 11:46:00 +00:00
Jonathan G Rennison
248ac0e263 Merge branch 'save_ext' into infrastructure_sharing-sx 2016-01-31 11:45:19 +00:00
Jonathan G Rennison
e5894b3948 Merge branch 'infrastructure_sharing' into infrastructure_sharing-sx 2016-01-31 11:45:08 +00:00
Jonathan G Rennison
6992312702 Merge branch 'master' into infrastructure_sharing 2016-01-31 11:44:54 +00:00
Jonathan G Rennison
d9466fa424 Merge branch 'auto_timetables-sx' into jgrpp 
Fix day length scaling issue.

# Conflicts:
#	src/timetable_cmd.cpp
 2016-01-30 16:23:38 +00:00
Jonathan G Rennison
b43c08857b Merge branch 'auto_timetables' into auto_timetables-sx 
# Conflicts:
#	src/saveload/saveload.h
 2016-01-30 16:05:56 +00:00
Jonathan G Rennison
3512403610 Reformat _sl_xv_sub_chunk_infos array. 2016-01-30 16:02:05 +00:00
Jonathan G Rennison
712d5e9c66 Fix set distributed timetable start not working when using minutes. 
Remove WALLCLOCK_NETWORK_COMPATIBLE, it's a pain and not useful.
Whitespace fixes.
 2016-01-30 16:02:05 +00:00
Jonathan G Rennison
c877e10272 Avoid set distributed timetable start setting start dates in the past. 
Adjust start dates for vehicles before the base one forward by one
timetable duration if they would start before the present date.

Whitespace/format fixes.
 2016-01-30 15:20:48 +00:00
Jonathan G Rennison
7c8b4b9d6d Remove duplicated timetable fields from vehicle struct. 2016-01-30 15:20:48 +00:00
Jonathan G Rennison
c23ffb3a5c Bump savegame version so that it is > trunk version. 2016-01-30 15:19:46 +00:00
Jonathan G Rennison
5c31966090 Merge branch 'save_ext' into auto_timetables-sx 2016-01-30 13:44:22 +00:00
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