817ce019ca
Fix use of nullptr which breaks compilation on legacy compilers.
9 years ago
31a5baf555
Merge branch 'improved_breakdowns-sx' into jgrpp
...
# Conflicts:
# src/saveload/extended_ver_sl.cpp
# src/settings.cpp
9 years ago
6890e0af35
Merge branch 'improved_breakdowns' into improved_breakdowns-sx
9 years ago
5b2dc8bcd8
Fix vehicle needs repair speed limits being incorrect in vehicle details.
9 years ago
fe2277dfbc
Merge branch 'improved_breakdowns' into improved_breakdowns-sx
...
# Conflicts:
# src/saveload/vehicle_sl.cpp
# src/table/settings.ini
9 years ago
e03d97eab6
Improved breakdowns: Fix string parameter count issues.
...
Fix whitespace.
9 years ago
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...
9 years ago
41e0d65d6a
Merge branch 'progsig-sx' into jgrpp
9 years ago
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.
9 years ago
9742300a1e
Fix some more whitespace/formatting issues.
9 years ago
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.
9 years ago
9c49ba43da
Merge branch 'infrastructure_sharing-sx' into jgrpp
9 years ago
248ac0e263
Merge branch 'save_ext' into infrastructure_sharing-sx
9 years ago
e5894b3948
Merge branch 'infrastructure_sharing' into infrastructure_sharing-sx
9 years ago
6992312702
Merge branch 'master' into infrastructure_sharing
9 years ago
d9466fa424
Merge branch 'auto_timetables-sx' into jgrpp
...
Fix day length scaling issue.
# Conflicts:
# src/timetable_cmd.cpp
9 years ago
b43c08857b
Merge branch 'auto_timetables' into auto_timetables-sx
...
# Conflicts:
# src/saveload/saveload.h
9 years ago
3512403610
Reformat _sl_xv_sub_chunk_infos array.
9 years ago
712d5e9c66
Fix set distributed timetable start not working when using minutes.
...
Remove WALLCLOCK_NETWORK_COMPATIBLE, it's a pain and not useful.
Whitespace fixes.
9 years ago
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.
9 years ago
7c8b4b9d6d
Remove duplicated timetable fields from vehicle struct.
9 years ago
c23ffb3a5c
Bump savegame version so that it is > trunk version.
9 years ago
5c31966090
Merge branch 'save_ext' into auto_timetables-sx
9 years ago
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.
9 years ago
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.
9 years ago
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.
9 years ago
2c9029703b
Add menu item to vehicle list to change order target.
...
Allow moving depot/station/waypoint orders to a different depot/etc.
9 years ago
4b894775af
(svn r27505) -Update from Eints:
...
portuguese: 2 changes by neuralshock
9 years ago
a6fd74d29a
Unreserve PBS block when company resetted.
...
(cherry picked from commit 281a84f3494713af9d86248b7c3a1998c41c30a0)
9 years ago
8c9e267edc
Now can be crashed with other company's train.
...
(cherry picked from commit 66ce7057df27aeb276270fe4bdc31f68dc69add3)
9 years ago
10b679bba5
Merge branch 'more_cond_orders-sx' into jgrpp
9 years ago
19a43fe986
Merge branch 'more_cond_orders' into more_cond_orders-sx
9 years ago
8abdbcece6
Fix operator precedence issue in cargo waiting conditional order.
9 years ago
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.
9 years ago
5149912498
Merge branch 'master' into more_cond_orders
9 years ago
b23f22f0f6
(svn r27504) -Update from Eints:
...
catalan: 3 changes by juanjo
9 years ago
3cc990d0f9
(svn r27503) -Update from Eints:
...
persian: 6 changes by Peymanpn
greek: 3 changes by Ferrum
9 years ago
9826c2481e
Merge branch 'order_occupancy-sx' into jgrpp
9 years ago
8adf5e23a4
Merge branch 'order_occupancy' into order_occupancy-sx
9 years ago
2955610575
Add order occupancy average.
...
Show overall average instead of % char in toggle button.
Add a sort mode.
9 years ago
da104bee01
(svn r27502) -Update from Eints:
...
greek: 54 changes by Ferrum
9 years ago
ff0c05f990
(svn r27501) -Update from Eints:
...
greek: 4 changes by Ferrum
9 years ago
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
82081c768a
Bump tracerestrict version due to long-reserve feature.
9 years ago
4fdc495eea
Merge branch 'tracerestrict' into tracerestrict-sx
9 years ago
a671f40fc8
Merge branch 'save_ext' into tracerestrict-sx
9 years ago
82cab7f31c
Tracerestrict: Import "Long Reserve" feature.
...
https://github.com/KeldorKatarn/OpenTTD_PatchPack
Minor code de-duplications.
9 years ago
27bdf2a8b6
Merge branch 'ship_collision_avoidance-sx' into jgrpp
...
Conflicts:
src/settings_type.h
src/table/settings.ini
9 years ago
b00b1125be
Add a dedicated setting to enable ship collision avoidance.
9 years ago
c74a8ad557
Merge branch 'ship_collision_avoidance' into ship_collision_avoidance-sx
9 years ago
Jonathan G Rennison
patch-import
translators
Yoonji Park