Commit Graph

24136 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
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
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
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
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
Jonathan G Rennison
fe682e565f Version: Committing version data for tag: jgrpp-0.22.1 2017-12-10 12:47:05 +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
Jonathan G Rennison
fd5f8d237b
Merge pull request #28 from auge8472/readme
added Kruemelchen to the list of german translators
2017-11-07 14:02:55 +00:00
Heiko August
56d5521a51 added Kruemelchen to the list of german translators 2017-11-05 17:39:05 +01: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
90ff178401 Version: Committing version data for tag: jgrpp-0.22.0 2017-10-17 23:27:26 +01: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
translators
461b43e649 (svn r27927) -Update from Eints:
french: 6 changes by glx
2017-10-13 17:45:40 +00:00
translators
81c1e14edd (svn r27926) -Update from Eints:
slovenian: 2 changes by Necrolyte
polish: 12 changes by McZapkie
hebrew: 34 changes by dnd_man
2017-10-12 17:45:42 +00:00
Jonathan G Rennison
86a9438070 Fix AirportSpec->rotation not being duplicated/freed correctly
Fixes crashes when resetting GRF data
2017-10-12 01:50:28 +01:00
Jonathan G Rennison
5282394b04 Do not attempt to perform viewport scrolling in game bootstrap mode.
Do not increase date in bootstrap mode
2017-10-11 08:44:58 +01:00
translators
2fcb215abb (svn r27925) -Update from Eints:
malay: 5 changes by rionix88
2017-10-09 17:45:39 +00:00
Jonathan G Rennison
3f83546dfc Linkgraph: Fix numeric overflow in cost estimate/duration multiplier.
Bump cost estimate type to 64 bits
2017-10-05 18:27:22 +01:00
Jonathan G Rennison
a93cc441a9 Merge branch 'cpp-11' into jgrpp 2017-10-05 18:20:54 +01:00
Jonathan G Rennison
2b38268e2f Add printf format codes for 64-bit unsigned integers 2017-10-05 18:20:29 +01:00
Jonathan G Rennison
6f5dc695fa Add templated versions of CeilDiv and Ceil maths functions 2017-10-05 18:16:44 +01:00
Jonathan G Rennison
124d9a753e Merge branch 'master' into cpp-11
# Conflicts:
#	src/stdafx.h
2017-10-05 18:16:37 +01:00
Jonathan G Rennison
39701cf5df Merge branch 'master' into cpp-11 2017-10-05 18:15:32 +01:00
translators
0502a9c332 (svn r27924) -Update from Eints:
hebrew: 5 changes by Metheny
2017-10-04 17:45:38 +00:00
Jonathan G Rennison
f03de4bcc1 Fix not being allowed to build docks, ship depots, when removing water is disabled 2017-10-03 21:43:15 +01:00
translators
278400042d (svn r27923) -Update from Eints:
polish: 15 changes by McZapkie
2017-10-01 17:45:39 +00:00
Jonathan G Rennison
3d629b0dea Fix timetabled full-load order warning being shown for non station orders 2017-10-01 16:41:36 +01:00
translators
ac5074fb53 (svn r27922) -Update from Eints:
polish: 12 changes by McZapkie
2017-09-28 17:45:40 +00:00