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

17520 Commits

Author SHA1 Message Date
frosch
00b422712e (svn r27687) -Fix: RailtypeInfo::alternate_labels leaked when reloading NewGRF. (adf88) 2016-12-10 13:26:29 +00:00
Jonathan G Rennison
478ff2538e Merge branch 'master' into jgrpp 
# Conflicts:
#	src/lang/english.txt
#	src/lang/korean.txt
 2016-12-09 23:42:54 +00:00
frosch
4753097c3d (svn r27686) -Change: List railtype of rail tiles explicitly in the tile info window. 2016-12-09 21:27:22 +00:00
frosch
f294258b18 (svn r27685) -Change: Preemptively invalidate translation changes of next commit for eints. 2016-12-09 21:26:37 +00:00
translators
cf04ca5db3 (svn r27684) -Update from Eints: 
italian: 1 change by lorenzodv
 2016-12-09 18:45:36 +00:00
Jonathan G Rennison
58381a3ea2 Merge branch 'master' into jgrpp 2016-12-09 00:01:03 +00:00
Jonathan G Rennison
20a090b077 Show warning dialog if NewGRFs use too many string IDs. 
Show when reloading/changing NewGRF config, or starting new game.
 2016-12-08 23:48:53 +00:00
frosch
da76191afc (svn r27683) -Change: Rearrange the autoreplace GUI for trains, and do not filter it by railtype by default. 2016-12-08 20:21:39 +00:00
kiwitreekor
a30e15d683 Korean Translation Update 2016-12-06 20:18:10 +00:00
Jonathan G Rennison
8630512810 Merge branch 'master' into jgrpp 2016-12-05 19:24:57 +00:00
fonsinchen
cdbb864725 (svn r27682) -Fix: Don't check if links are alive for manually routed cargo 2016-12-04 19:59:17 +00:00
fonsinchen
aa26edfa48 (svn r27681) -Fix: When deleting stale links, iterate through order lists before iterating through vehicles 2016-12-04 19:53:38 +00:00
Jonathan G Rennison
eae7334ac0 Lang: Korean: Adjust a string/string2 and trailing whitespace. 2016-12-01 21:38:10 +00:00
kiwitreekor
dc192be09d Add files via upload 2016-12-01 23:42:27 +09:00
Jonathan G Rennison
55e57fd07d Add shift-clicking on vehicle depot button to select specific depot. 2016-11-28 20:17:53 +00:00
Jonathan G Rennison
1b5c3b4027 Merge branch 'master' into jgrpp 2016-11-26 22:36:46 +00:00
Jonathan G Rennison
1e8de54944 Merge branch 'tracerestrict-sx' into jgrpp 2016-11-26 16:26:43 +00:00
Jonathan G Rennison
15787545a0 Merge branch 'tracerestrict' into tracerestrict-sx 2016-11-26 16:26:36 +00:00
Jonathan G Rennison
78b7223272 Make tracerestrict GUI mouse-wheel scrollable. 2016-11-26 16:26:24 +00:00
Jonathan G Rennison
375dbdbfe1 Linkgraph: Allow job threads to be aborted early when clearing schedule. 2016-11-26 00:33:50 +00:00
Jonathan G Rennison
d08d1cbd67 Linkgraph: Avoid attempting to merge/apply job when cleaning schedule. 
This can cause crashes when switching savegame.
Move job merge/apply out of destructor into separate function.
 2016-11-26 00:15:01 +00:00
Jonathan G Rennison
e1a841aa05 Fix loading of signals on bridges/tunnels from SpringPP savegames. 
Reg/green states were incorrect.
 2016-11-25 23:42:26 +00:00
Jonathan G Rennison
ddae95addb Rescale town cargo adj setting by 10x, for finer adjustment. 
Use DECIMAL1 instead of an integer.
 2016-11-25 23:24:41 +00:00
Jonathan G Rennison
842728bd17 Settings GUI: Add support for DECIMAL1 settings. 2016-11-25 23:14:11 +00:00
Jonathan G Rennison
f5212b27e4 Add a DECIMAL1 string code, which is DECIMAL with a fixed param of 1. 2016-11-25 23:12:23 +00:00
Jonathan G Rennison
fa261207ae Link graph GUI: Fix poor contrast in graph legend window cargo labels. 
Select foreground colour depending on brightness of background.
 2016-11-21 23:08:13 +00:00
Jonathan G Rennison
55057110a5 Linkgraph GUI: Add hover tool-tips to graph legend window. 2016-11-21 22:38:04 +00:00
Jonathan G Rennison
37a58fd11d Add setting to increase station catchment radius. 
Update acceptance and refresh screen when catchment settings change.
 2016-11-20 01:49:10 +00:00
translators
fd7852cbdf (svn r27680) -Update from Eints: 
romanian: 1 change by kneekoo
 2016-11-12 18:45:38 +00:00
Jonathan G Rennison
10ae23d3b9 Merge branch 'departure-boards' into jgrpp 
VehicleListIdentifier API changes.

# Conflicts:
#	src/departures.cpp
#	src/vehicle_gui.cpp
 2016-11-11 18:46:15 +00:00
Jonathan G Rennison
31b2a39d02 Merge branch 'save_ext' into departure-boards 
Adjust calls to GenerateVehicleSortList due to API change.
 2016-11-11 18:37:52 +00:00
Jonathan G Rennison
dbd99707b6 Merge branch 'master' into save_ext 2016-11-11 18:27:24 +00:00
translators
4ea93bc8ef (svn r27679) -Update from Eints: 
romanian: 10 changes by kneekoo
 2016-11-09 18:45:35 +00:00
translators
7e2e63094b (svn r27678) -Update from Eints: 
romanian: 20 changes by kneekoo
 2016-11-08 18:45:38 +00:00
frosch
9d8c04b0cc (svn r27677) -Codechange: Remove implicit VehicleListIdentifier from uint32 constructor, to make conversions more explicit. 2016-11-05 19:16:59 +00:00
frosch
616c02c42e (svn r27676) -Codechange: Rename catenary functions, so that they refer unambiguously to either RoadCatenary or RailCatenary. 2016-11-05 11:53:03 +00:00
Jonathan G Rennison
1cede8431f Linkgraph: Support running multiple jobs per spawned thread. 2016-11-01 23:02:15 +00:00
Jonathan G Rennison
84e61b690a Linkgraph: Changes to job scheduling algorithm. 
This is to improve responsiveness of link graph updates, whilst
avoiding being blocked waiting for updates to complete.
Previously, large numbers of cheap jobs resulted in poor responsiveness
as it took a long time for jobs to cycle round.

Add 'linkgraph' debug category.
 2016-11-01 23:02:15 +00:00
Jonathan G Rennison
7f10d83a4a Merge branch 'template_train_replacement' into jgrpp 
# Conflicts:
#	src/linkgraph/linkgraphjob.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/train_cmd.cpp
#	src/vehicle_base.h
 2016-11-01 23:00:48 +00:00
Jonathan G Rennison
92254acf8d TBTR: Savegame and API changes to support multiple sprites per vehicle. 2016-11-01 20:27:30 +00:00
Jonathan G Rennison
d204062300 Merge branch 'master' into template_train_replacement 2016-11-01 19:43:35 +00:00
michi_cc
4436f96f9f (svn r27675) -Fix [FS#6502]: [OSX] Building with 10.11 or 10.12 SDKs. 2016-10-31 19:29:01 +00:00
michi_cc
221c84be66 (svn r27674) -Fix (r27673): Mingw... 2016-10-30 19:27:07 +00:00
michi_cc
36cbb54a9d (svn r27673) -Add: [Win32] Thread names for windows debuggers. 2016-10-30 18:22:55 +00:00
frosch
a08df612be (svn r27672) -Doc [FS#6489]: Fix comment. (Yho) 2016-10-30 18:04:20 +00:00
frosch
77b790cd5a (svn r27671) -Codechange: Replace magic numbers in the toolbar with the already existing WID_TN_xxx. (Wolf01) 2016-10-30 17:36:57 +00:00
frosch
3f75b8bca2 (svn r27670) -Add: [FS#6471] Assign descriptive names to (GNU pthread) threads. (JGR) 2016-10-30 17:29:33 +00:00
Jonathan G Rennison
de26cf78e5 Merge branch 'infrastructure_sharing' into jgrpp 2016-10-24 18:29:09 +01:00
Jonathan G Rennison
15dc498c79 Fix wrong calculation of infra sharing track deletion train repayment. 
Head pointer was being used for vehicle value on iteration of
train vehicles.
 2016-10-24 18:29:02 +01:00
translators
f8f2c9d3a5 (svn r27669) -Update from Eints: 
thai: 11 changes by angelix
 2016-10-19 17:45:35 +00:00