dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,088 Commits 1 Branch 0 Tags
41a06e698fd1ebbf83968e2617cd076ac25c9ad5
Commit Graph

16674 Commits

Author SHA1 Message Date
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
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
Jonathan G Rennison
b5b06351ac Tracerestrict: Fix GUI issue with picker button raise/lower states. 
When a picker button was selected, clicking on a different picker button
would cause both buttons to be raised, instead of just the previous.
 2016-01-14 19:12:54 +00:00
Jonathan G Rennison
d2e8d205b9 Tracerestrict: Fix copying an unrestricted signal making an empty program. 2016-01-14 19:09:34 +00:00
translators
16fb5bf9bb (svn r27498) -Update from Eints: 
greek: 11 changes by Ferrum
 2016-01-14 18:45:35 +00:00
frosch
36e66a17dc (svn r27497) -Change: [NewGRF] Allow static NewGRF to enable the second rocky tile set. 2016-01-13 21:55:50 +00:00
Jonathan G Rennison
085476bb2a Merge branch 'master' into jgrpp 2016-01-13 21:02:03 +00:00
translators
3b1696f13a (svn r27495) -Update from Eints: 
greek: 37 changes by Ferrum
lithuanian: 1 change by BlinK_
 2016-01-13 18:45:36 +00:00
translators
d046a02c7d (svn r27494) -Update from Eints: 
frisian: 61 changes by gjannema
afrikaans: 1 change by telanus
 2016-01-12 18:45:36 +00:00
translators
e45f9d32c1 (svn r27493) -Update from Eints: 
greek: 10 changes by Ferrum
 2016-01-11 18:45:35 +00:00
translators
f5359a70be (svn r27492) -Update from Eints: 
catalan: 48 changes by juanjo
greek: 2 changes by Jubilee
 2016-01-10 18:45:35 +00:00
translators
9c6655a37c (svn r27491) -Update from Eints: 
croatian: 1 change by VoyagerOne
 2016-01-09 18:45:38 +00:00
translators
45adb8f172 (svn r27490) -Update from Eints: 
chinese (simplified): 1 change by siu238X
 2016-01-08 18:45:37 +00:00
Jonathan G Rennison
ea677cf2bf Merge branch 'improved_breakdowns-sx' into jgrpp 2016-01-08 18:26:57 +00:00
Jonathan G Rennison
417f51db8a Merge branch 'improved_breakdowns' into improved_breakdowns-sx 2016-01-08 18:26:52 +00:00
Jonathan G Rennison
155987a4aa Fix override being used on gcc 4.3 to 4.6. 2016-01-08 17:01:37 +00:00
Jonathan G Rennison
b652d1c42a Limit low speed breakdowns to lower of 1/4 max speed or 28km/h. 2016-01-07 23:04:12 +00:00
Jonathan G Rennison
548ea31e83 Fix compilation on gcc before 4.7 due to use of atomic builtins. 2016-01-07 22:45:11 +00:00
translators
5102ba54ea (svn r27489) -Update from Eints: 
vietnamese: 1 change by nglekhoi
 2016-01-06 18:45:35 +00:00
Jonathan G Rennison
c3948ef5e9 Merge branch 'tracerestrict-sx' into jgrpp 2016-01-04 18:40:26 +00:00
Jonathan G Rennison
7d5df6b0db Merge branch 'tracerestrict' into tracerestrict-sx 2016-01-04 18:40:17 +00:00
Jonathan G Rennison
20a015e9d3 Fix actions_used_flags not being set when cloning tracerestrict programs. 
This resulted in newly copied or unshared programs not being evaluated.
 2016-01-04 18:40:06 +00:00
Jonathan G Rennison
23ddba38a5 Fix cargo dest overlay not being updated after a zoom change. 2016-01-03 20:04:53 +00:00
translators
e1df8edf66 (svn r27488) -Update from Eints: 
catalan: 19 changes by juanjo
 2016-01-03 18:45:37 +00:00
Jonathan G Rennison
f9d4213a3a Merge branch 'vehicle_group_info' into jgrpp 2016-01-03 15:22:50 +00:00
Jonathan G Rennison
b45e721faa Fix group info when GUI/font is scaled. 2016-01-03 15:22:40 +00:00
Jonathan G Rennison
30d8cb2d4c Fix font height cache when changing GUI scaling. 2016-01-03 14:52:30 +00:00
translators
ee00bef5a9 (svn r27487) -Update from Eints: 
spanish: 1 change by SilverSurferZzZ
serbian: 57 changes by stravagante
catalan: 23 changes by juanjo
 2016-01-02 18:45:38 +00:00
Jonathan G Rennison
726b5cb4f6 Speed up filtering of which viewport labels should be displayed. 
Add an inline, fast, inaccurate check to catch most off-screen labels,
before the relatively slow and expensive checks.
 2016-01-01 21:53:58 +00:00
Jonathan G Rennison
5aad0b51a3 Cache font heights in a static fixed array. 
This is to avoid significant per-call overhead to get font heights,
as this is performed very frequently.
 2016-01-01 21:47:34 +00:00
translators
60733359fa (svn r27486) -Update from Eints: 
serbian: 86 changes by stravagante
catalan: 77 changes by juanjo
german: 1 change by mini1025
russian: 1 change by Lone_Wolf
latin: 1 change by Supercheese
 2016-01-01 18:45:37 +00:00
Jonathan G Rennison
b51dd34fe4 Merge branch 'lifetime_profit-sx' into jgrpp 
Conflicts:
	src/saveload/afterload.cpp
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/vehicle_gui.cpp
 2016-01-01 15:04:54 +00:00
Jonathan G Rennison
07d24962cd Save/load changes for veh lifetime profit patch. 2016-01-01 14:53:00 +00:00
Jonathan G Rennison
d3e95f1c65 Merge branch 'lifetime_profit' into lifetime_profit-sx 
Conflicts:
	src/saveload/saveload.cpp
 2016-01-01 14:52:52 +00:00
Jonathan G Rennison
179e6df800 Change lifetime profit display string to avoid breaking translations. 2016-01-01 14:46:21 +00:00
Jonathan G Rennison
e6cce973ae Merge branch 'master' into save_ext 2016-01-01 14:25:36 +00:00
Jonathan G Rennison
e6afc6f048 Display current lifetime profit, instead of the yearly-updated value. 2016-01-01 13:37:43 +00:00
patch-import
71be17729e Import vehicle lifetime profit patch v3 
http://www.tt-forums.net/viewtopic.php?p=1161735#p1161735
 2016-01-01 13:35:29 +00:00
Jonathan G Rennison
87df28f3a2 Merge branch 'master' into jgrpp 2016-01-01 13:11:26 +00:00
Jonathan G Rennison
b9091a0f6c Merge branch 'zoning' into jgrpp 
Conflicts:
	src/station_gui.cpp
	src/zoning_cmd.cpp
 2016-01-01 13:09:11 +00:00
Jonathan G Rennison
7f84a1c501 Zoning: Add mode to show station catchment only where station window open. 2016-01-01 12:17:11 +00:00
translators
137ecd5377 (svn r27485) -Update from Eints: 
croatian: 114 changes by UnderwaterHesus
 2015-12-31 18:45:36 +00:00
translators
7ab291af95 (svn r27484) -Update from Eints: 
croatian: 4 changes by UnderwaterHesus
english (us): 1 change by Supercheese
serbian: 21 changes by stravagante
latin: 1 change by Supercheese
 2015-12-30 18:45:36 +00:00
Jonathan G Rennison
efa27abde5 Merge branch 'measurement_tool' into jgrpp 2015-12-30 15:05:18 +00:00
Jonathan G Rennison
95eb2dbd32 Change default measurement tool hotkey to shift-R. 
This is to avoid clashing with the rail remove hotkey.
 2015-12-30 15:05:10 +00:00