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

23363 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan G Rennison
7b56097f50 Merge branch 'master' into jgrpp 
# Conflicts:
#	config.lib
#	src/linkgraph/demands.cpp
#	src/linkgraph/mcf.cpp
#	src/linkgraph/refresh.cpp
#	src/linkgraph/refresh.h
#	src/smallmap_gui.cpp
 2016-07-24 10:16:55 +01:00
frosch
a2a69c1480 (svn r27623) -Fix (r27616) [FS#6492]: Missed two version checks, and messed one up. 2016-07-24 09:13:51 +00:00
frosch
cc18df4cb7 (svn r27622) -Change: In industry map view, give visible industry types the highest tile priority, and hidden industry types a lower one. This way filtered and highlighted industries are not hidden by overlapping tiles in zoomed-out smallmap. (adf88) 2016-07-22 21:44:54 +00:00
frosch
46aeed3817 (svn r27621) -Fix (r27620): Committed too early. 2016-07-22 21:38:49 +00:00
frosch
bd6799a9f8 (svn r27620) -Codechange: Inline GetEffectiveTileType (adf88) 2016-07-22 21:29:04 +00:00
frosch
2c403c8a80 (svn r27619) -Update: Baseset translations 2016-07-22 21:25:37 +00:00
Jonathan G Rennison
e29da8323c Merge branch 'enhanced_viewport_overlay-sx' into jgrpp 2016-07-20 01:54:38 +01:00
Jonathan G Rennison
c6d9a49a73 Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx 2016-07-20 01:54:30 +01:00
Jonathan G Rennison
8c4904a9e4 Update route markers/lines when drag/dropping vehicle orders. 2016-07-20 01:54:18 +01:00
translators
aa140bb928 (svn r27618) -Update from Eints: 
latvian: 19 changes by Parastais
 2016-07-18 17:45:36 +00:00
Jonathan G Rennison
3ea652c4b9 Merge branch 'tracerestrict-sx' into jgrpp 2016-07-18 00:48:12 +01:00
Jonathan G Rennison
8482fc6aef Merge branch 'tracerestrict' into tracerestrict-sx 2016-07-18 00:48:05 +01:00
Jonathan G Rennison
3d6cbb76b4 Allow value of "PBS entry signal" conditional to be a rail depot. 2016-07-18 00:47:52 +01:00
Jonathan G Rennison
e7dfc40a59 Merge branch 'template_train_replacement-sx' into jgrpp 2016-07-18 00:19:42 +01:00
Jonathan G Rennison
0d45eba6ce Merge branch 'template_train_replacement' into template_train_replacement-sx 2016-07-18 00:19:33 +01:00
Jonathan G Rennison
f245049f91 TBTR: Select most used rail-type by default, instead of first rail-type. 2016-07-18 00:19:19 +01:00
translators
c6ac52e71a (svn r27617) -Update from Eints: 
latvian: 6 changes by Parastais
 2016-07-17 17:45:36 +00:00
frosch
f7a7f141d3 (svn r27616) -Codechange [FS#6487]: [Build] Change the GCC version detection so that it works with two-digit and truncated versions. 2016-07-17 11:10:21 +00:00
translators
18bbe02337 (svn r27615) -Update from Eints: 
spanish: 7 changes by SilverSurferZzZ
 2016-07-12 17:45:35 +00:00
Jonathan G Rennison
cd0211095b Merge branch 'tracerestrict-sx' into jgrpp 2016-07-11 22:13:07 +01:00
Jonathan G Rennison
7a18f9eeeb Merge branch 'tracerestrict' into tracerestrict-sx 2016-07-11 22:12:51 +01:00
Jonathan G Rennison
58817c26e0 Fix reservation through multiple reserve-through signals after a junction. 2016-07-11 22:02:33 +01:00
fonsinchen
ff96590312 (svn r27614) -Codechange: Use a fixed array instead of a map for link refresher cargo capacities. (JGR) 2016-07-10 12:17:00 +00:00
fonsinchen
a81b7a24a6 (svn r27613) -Codechange: Use a flat vector instead of a map in FlowEdgeIterator. (JGR) 2016-07-10 12:03:23 +00:00
fonsinchen
6b2eed0a70 (svn r27612) -Codechange: Replace three uses of std::list with std::queue/vector. (JGR) 2016-07-10 11:57:16 +00:00
fonsinchen
8d5566651b (svn r27611) -Codechange: Cache the calculated value of CapacityAnnotation 2016-07-10 11:53:43 +00:00
Jonathan G Rennison
3ac94e97c8 Cache the result of GetImage() in Vehicle::UpdateViewport() where possible. 
Sprite number is not cached if callback is made, or a variable access
outside a whitelist occurs.
Invalidate cached sprite number when direction or cargo changes,
or vehicle is marked dirty.
 2016-07-08 19:07:25 +01:00
Jonathan G Rennison
9ae057b8bf Fix loading of SpringPP savegames. 
Was broken in jgrpp-0.13.1
 2016-07-08 00:35:37 +01:00
Jonathan G Rennison
d5ee260daf Update changed format code in translation. 2016-07-06 17:26:50 +01:00
Jonathan G Rennison
f0fee802a9 Merge branch 'tracerestrict-sx' into jgrpp 
# Conflicts:
#	src/lang/english.txt
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/table/settings.ini
#	src/vehicle_gui.cpp
 2016-07-05 22:34:50 +01:00
Jonathan G Rennison
ed33a62bcd Merge branch 'tracerestrict' into tracerestrict-sx 2016-07-05 22:19:34 +01:00
Jonathan G Rennison
0ab2abbc23 Add client setting to show train weight ratios in details header. 
Off by default.
 2016-07-05 21:54:43 +01:00
Jonathan G Rennison
8ec1b2200e Change tracerestrict weight ratio properties to use decimals, and the weight unit. 
Add {POWER_WEIGHT_RATIO} and {FORCE_WEIGHT_RATIO} string codes.
 2016-07-05 21:20:06 +01:00
translators
8f2461cdfb (svn r27610) -Update from Eints: 
korean: 1 change by telk5093
 2016-07-02 17:45:35 +00:00
Jonathan G Rennison
f3e0da1e63 Update project files. 2016-07-01 18:33:27 +01:00
Jonathan G Rennison
80e3af6bf5 Merge branch 'tracerestrict-sx' into jgrpp 
# Conflicts:
#	src/lang/english.txt
#	src/saveload/extended_ver_sl.cpp
#	src/tracerestrict.cpp
#	src/tracerestrict.h
#	src/tracerestrict_gui.cpp
 2016-06-30 20:25:22 +01:00
Jonathan G Rennison
71aa4c75cb Bump tracerestrict version due to weight/power/TE conditionals. 2016-06-30 20:17:45 +01:00
Jonathan G Rennison
e4b932d53a Merge branch 'tracerestrict' into tracerestrict-sx 2016-06-30 20:15:27 +01:00
Jonathan G Rennison
f942de699c Add power/weight and max TE/weight ratio tracerestrict conditionals. 
Minor refactorings.
 2016-06-30 19:31:45 +01:00
Jonathan G Rennison
91ba866852 Fix comment typo. 2016-06-30 18:55:26 +01:00
Jonathan G Rennison
b11d48b431 Update project files 2016-06-30 18:37:39 +01:00
Jonathan G Rennison
2c6f74a982 Move header definition for unit conversion functions to own header. 2016-06-30 18:28:42 +01:00
Jonathan G Rennison
b5531975da Add train weight, power, and max TE tracerestrict conditionals. 
Minor refactorings.
 2016-06-29 22:08:05 +01:00
rubidium
fe0d3761f7 (svn r27606) -Change/fix: GCC6 defaults to C++14, but our configure limits it to C++0x just because we want to use features from C++0x (which are also in C++14), so use the C++ standard that's the GCC6 default 2016-06-27 17:54:05 +00:00
rubidium
dd5e3d9f33 (svn r27605) -Fix: GCC 6 warning about misleading indentation 2016-06-27 17:52:30 +00:00
translators
932951982f (svn r27604) -Update from Eints: 
spanish: 3 changes by SilverSurferZzZ
 2016-06-24 17:45:37 +00:00
Jonathan G Rennison
929327ecaf Merge branch 'template_train_replacement-sx' into jgrpp 2016-06-21 18:56:47 +01:00
Jonathan G Rennison
84e467328f Merge branch 'template_train_replacement' into template_train_replacement-sx 2016-06-21 18:56:40 +01:00
Jonathan G Rennison
ff922f41da Fix NewGRF vehicle variables 4A, FE and FF crashing with virtual trains. 
This is due to attempts to look up the rail type of the current tile.
 2016-06-21 18:56:29 +01:00
translators
60d05aa27d (svn r27603) -Update from Eints: 
spanish: 12 changes by SilverSurferZzZ
 2016-06-19 17:45:36 +00:00