Commit Graph

17761 Commits

Author SHA1 Message Date
Jonathan G Rennison
3a2a316588 Merge branch 'day_length' into jgrpp
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/vehicle_sl.cpp
2018-01-12 01:23:28 +00:00
Jonathan G Rennison
5db5581684 Merge branch 'save_ext' into jgrpp 2018-01-12 01:14:12 +00:00
Jonathan G Rennison
15fea054fb Add function pointer mode to SlXvFeatureTest 2018-01-12 01:13:49 +00:00
Jonathan G Rennison
7b567c9d26 Extend vehicle running ticks to 16 bits to avoid overflow at day length > 3 2018-01-12 00:03:15 +00:00
translators
0842742b91 (svn r27963) -Update from Eints:
norwegian (bokmal): 2 changes by Leifbk
2018-01-11 18:45:39 +00:00
translators
78d80a9968 (svn r27962) -Update from Eints:
spanish (mexican): 1 change by Absay
2018-01-09 18:45:38 +00:00
translators
96b3036d4c (svn r27960) -Update from Eints:
spanish (mexican): 2 changes by Absay
2018-01-06 18:45:38 +00:00
translators
ebd46cc303 (svn r27959) -Update from Eints:
spanish (mexican): 8 changes by Absay
2018-01-05 18:45:40 +00:00
Jonathan G Rennison
dda20d08c1 Merge branch 'improved_breakdowns' into jgrpp
Update German and Korean language strings

# Conflicts:
#	src/saveload/extended_ver_sl.cpp
2018-01-04 19:47:46 +00:00
Jonathan G Rennison
0a80aec634 Implement critical breakdown speed reduction for road vehicles 2018-01-04 19:18:24 +00:00
Jonathan G Rennison
beda7ebb39 Set minimum speed for train critical breakdown reduction. 2018-01-04 19:05:18 +00:00
translators
ae5bbfb4b6 (svn r27958) -Update from Eints:
spanish (mexican): 26 changes by Absay
2018-01-04 18:45:39 +00:00
translators
66ccd9f71b (svn r27957) -Update from Eints:
spanish (mexican): 3 changes by Absay
2018-01-03 18:45:37 +00:00
translators
f9ae0c5045 (svn r27956) -Update from Eints:
spanish (mexican): 16 changes by Absay
2017-12-31 18:45:41 +00:00
Jonathan G Rennison
4b392b66db Fix DeleteVisibleTrain being called on virtual trains
Add assertion to check for this case
2017-12-31 14:29:15 +00:00
Jonathan G Rennison
1c04653518 Add scope info logging to DeleteVisibleTrain 2017-12-31 14:23:33 +00:00
translators
bfd9e30c30 (svn r27955) -Update from Eints:
french: 2 changes by glx
2017-12-28 18:45:40 +00:00
frosch
6b11ab49d2 (svn r27954) -Cleanup [FS#6644]: Remove unused function (M3Henry) 2017-12-27 22:07:59 +00:00
frosch
b394dd8468 (svn r27953) -Cleanup: Adjust other languages for r27952 2017-12-27 21:55:30 +00:00
frosch
150ef3999c (svn r27952) -Change: Reword texts in industry view, when stockpiling is used. 2017-12-27 21:54:52 +00:00
translators
2b23f11b47 (svn r27951) -Update from Eints:
spanish (mexican): 6 changes by Absay
2017-12-26 18:45:39 +00:00
frosch
54040bd31a (svn r27950) -Merge: Documentation updates from 1.7 branch 2017-12-24 12:18:36 +00:00
translators
61c2f6ff9d (svn r27947) -Update from Eints:
spanish (mexican): 1 change by Absay
2017-12-22 18:45:39 +00:00
translators
cd71c1af3a (svn r27946) -Update from Eints:
spanish (mexican): 1 change by Absay
2017-12-21 18:45:38 +00:00
translators
3db395700d (svn r27945) -Update from Eints:
spanish (mexican): 3 changes by Absay
2017-12-20 18:45:39 +00:00
Jonathan G Rennison
9a5986fa70 Fix handling of current timetable order index when deleting/inserting orders 2017-12-18 23:19:50 +00:00
Jonathan G Rennison
c4897f92df Timetable GUI: Add warnings for conditional order timetabling. 2017-12-18 01:47:22 +00:00
Jonathan G Rennison
218085c535 Timetable: Implement autofill/automate for taken conditional orders.
Fix wrong timetable values being set after using skip or send to depot.
Add timetabled flag for conditional order branch taken travel time.
2017-12-18 01:26:27 +00:00
translators
de4b1e80f6 (svn r27944) -Update from Eints:
spanish (mexican): 1 change by Absay
2017-12-14 18:45:41 +00:00
Jonathan G Rennison
102c55bc57 Fix assertion failure when trams do a short turnaround in a tunnel mouth 2017-12-13 20:44:12 +00:00
frosch
b34418ae60 (svn r27938) -Fix (r27899): When scrolling in the train depot, also scroll the tile separators. 2017-12-10 13:48:49 +00:00
frosch
c2cddb4cc4 (svn r27937) -Change: When train depots have a horizontal scrollbar, allow scrolling 1 tile beyond the longest train, so you can actually attach a wagon at the end. 2017-12-10 13:48:06 +00:00
frosch
432edcd4a5 (svn r27936) -Fix: When moving wagons in the depot, the drag highlight did not exactly match the length of the dragged wagon chain. 2017-12-10 13:45:53 +00:00
Jonathan G Rennison
740e4543c3 Merge branch 'master' into jgrpp
# Conflicts:
#	src/industry_cmd.cpp
2017-12-10 12:41:58 +00:00
michi_cc
5116bb5ad1 (svn r27935) -Fix [FS#6629]: [Win32] Right mouse scrolling didn't work properly with the Windows 10 Fall Creators Update. 2017-12-09 19:21:45 +00:00
michi_cc
43aa179586 (svn r27934) -Fix (r27900): Warning about unsigned unary minus. 2017-12-09 19:21:41 +00:00
translators
3d1dd164f0 (svn r27933) -Update from Eints:
croatian: 26 changes by UnderwaterHesus
portuguese (brazilian): 54 changes by Tucalipe
2017-12-09 18:45:38 +00:00
frosch
3f819029f4 (svn r27932) -Fix (r0) [FS#6639]: Forest, candyfloss forest and battery farm skipped the first animation frame. 2017-11-25 16:50:28 +00:00
translators
a391bc99e7 (svn r27931) -Update from Eints:
portuguese: 7 changes by neuralshock
2017-11-18 18:45:38 +00:00
translators
52394ae548 (svn r27930) -Update from Eints:
chinese (simplified): 2 changes by yfdyh000
2017-11-02 18:45:39 +00:00
Jonathan G Rennison
a69a0b1557 Fix not being able to build water industries when removing water is disabled 2017-10-30 01:04:42 +00:00
frosch
6cc55abaf9 (svn r27929) -Cleanup: Remove unused Industry::random_triggers 2017-10-25 15:38:19 +00:00
frosch
ffdcbb8f21 (svn r27928) -Fix: [NewGRF] While executing random triggers, var 5F should include the new triggers.
-Fix: [NewGRF] Reset used random triggers only after all A123 chains have been resolved, so that all RA2 in all chains can test the shard triggers. This also includes multiple RA2 in the same A123 chain.
-Fix: [NewGRF] Industry random triggers are stored per tile, even when randomising the shared random bits of the parent industry.
2017-10-25 15:38:14 +00:00
Jonathan G Rennison
1defb8aafd Add "Freight" type to vehicle list cargo type filter 2017-10-17 23:08:23 +01:00
Jonathan G Rennison
71c133e203 Merge branch 'master' into jgrpp 2017-10-17 22:51:35 +01:00
Jonathan G Rennison
097cf9b0b1 Add UI setting to control whether cargo filter drop down is shown 2017-10-17 00:16:10 +01:00
Jonathan G Rennison
f3c95dd9a7 Add cargo filter support to vehicle list and tracerestrict slot windows
Refactor out common code
2017-10-16 22:51:07 +01:00
Jonathan G Rennison
8d1d69d598 Fix display text for filter veh list by cargo type drop down
Simplify init
2017-10-16 20:00:44 +01:00
Jonathan G Rennison
d4de9de61d Fix filtering by cargo type = none in vehicle list 2017-10-16 19:44:37 +01:00
patch-import
b1613a24f0 Import: Filter vehicles in company vehicles lists by cargo patch
https://www.tt-forums.net/viewtopic.php?p=1193133#p1193133
2017-10-16 19:36:29 +01:00