Commit Graph

24172 Commits

Author SHA1 Message Date
Jonathan G Rennison
a71a6ecec2 Fix Pop() method of SmallStack/StationIDStack.
Fixes 8deac54c
2017-01-02 19:28:22 +00:00
Jonathan G Rennison
51d4a6b14d Merge branch 'improved_breakdowns' into jgrpp 2017-01-02 19:28:11 +00:00
Jonathan G Rennison
5ba666883b Fix double/inconsistent updating of variables when servicing vehicle. 2017-01-02 19:27:39 +00:00
Jonathan G Rennison
dcbde21f18 Merge branch 'save_ext' into improved_breakdowns
# Conflicts:
#	src/train_cmd.cpp
2017-01-02 18:13:45 +00:00
translators
12d17ed62b (svn r27719) -Update from Eints:
polish: 25 changes by nouwak
2016-12-31 18:45:36 +00:00
translators
a8496153d6 (svn r27718) -Update from Eints:
spanish (mexican): 25 changes by Absay
2016-12-30 18:45:38 +00:00
translators
151956d471 (svn r27717) -Update from Eints:
spanish: 2 changes by SilverSurferZzZ
2016-12-29 18:45:38 +00:00
Jonathan G Rennison
5e30d389af Merge branch 'signal_tunnels_bridges' into jgrpp 2016-12-28 15:07:11 +00:00
Jonathan G Rennison
08062096ab Make back of bridge/tunnel PBS exit a line-end safe waiting point. 2016-12-28 15:07:03 +00:00
Jonathan G Rennison
074555e41d Merge branch 'save_ext' into signal_tunnels_bridges 2016-12-28 15:06:08 +00:00
translators
9bbc6e7ab5 (svn r27716) -Update from Eints:
catalan: 1 change by juanjo
2016-12-27 18:45:39 +00:00
translators
db6e65f4f3 (svn r27715) -Update from Eints:
spanish: 2 changes by SilverSurferZzZ
2016-12-26 18:45:38 +00:00
Jonathan G Rennison
5c7f36ef4b Merge branch 'enhanced_viewport_overlay' into jgrpp
Further fixes for viewport lines/marker for multiplayer clients.

# Conflicts:
#	src/lang/russian.txt
2016-12-26 15:38:56 +00:00
Jonathan G Rennison
509da024cc Fix viewport order lines/markers for multiplayer clients. 2016-12-26 15:35:11 +00:00
Jonathan G Rennison
0d1e08ed75 Merge branch 'save_ext' into enhanced_viewport_overlay
# Conflicts:
#	src/clear_cmd.cpp
2016-12-26 15:35:01 +00:00
Jonathan G Rennison
56f173e15e Merge branch 'master' into save_ext 2016-12-26 15:26:08 +00:00
translators
1c7e978b09 (svn r27714) -Update from Eints:
catalan: 2 changes by juanjo
russian: 1 change by Lone_Wolf
2016-12-25 18:45:37 +00:00
frosch
d1c64315cd (svn r27713) -Fix [FS#6527]: Setup clipping areas for individual widgets when drawing. (adf88) 2016-12-25 17:57:47 +00:00
frosch
dbe969087d (svn r27712) -Codechange: Reduce recursions in DrawOverlappedWindow by limiting the area to the window bounds first. (adf88) 2016-12-25 17:56:57 +00:00
frosch
60a79b599e (svn r27711) -Doc: Fontsizes (adf88) 2016-12-25 17:55:10 +00:00
frosch
14dba9764b (svn r27710) -Change: Limit waypoint area by maximum station spread already when dragging. (adf88) 2016-12-25 14:59:53 +00:00
frosch
d8a316d7c5 (svn r27709) -Fix-ish: Silence some warnings. (adf88) 2016-12-25 13:26:15 +00:00
translators
c917ed2112 (svn r27708) -Update from Eints:
catalan: 26 changes by juanjo
russian: 9 changes by Lone_Wolf
2016-12-24 18:45:38 +00:00
frosch
2be42dadea (svn r27707) -Fix: Make the result of NewGRF's CARGO_NAME string code reliably print 'Nothing', if an invalid type is provided. 2016-12-23 22:13:38 +00:00
frosch
9145e5d2b5 (svn r27706) -Feature: [NewGRF] String command 9A 1E to print the name of a cargo type. 2016-12-23 13:38:50 +00:00
frosch
124f386fd1 (svn r27705) -Doc: Add the hex codes to the SCC_NEWGRF_ enum entries. 2016-12-22 20:47:40 +00:00
translators
2507487877 (svn r27704) -Update from Eints:
welsh: 29 changes by kazzie
spanish: 2 changes by SilverSurferZzZ
russian: 13 changes by Lone_Wolf
2016-12-22 18:45:38 +00:00
frosch
ab3d5305a5 (svn r27703) -Change [FS#6532]: [gcc] Wnarrowing and Wfree-nonheap-object do no longer trigger in gcc 4.9.2, so reenable them. 2016-12-22 12:59:46 +00:00
translators
6de1225894 (svn r27702) -Update from Eints:
russian: 16 changes by Lone_Wolf
2016-12-21 18:45:40 +00:00
translators
ca65ea003d (svn r27701) -Update from Eints:
russian: 37 changes by Lone_Wolf
2016-12-20 18:45:37 +00:00
frosch
1522558cf7 (svn r27700) -Codechange: Simplify railtype date introduction. A check that is safe to run every day before the last railtype has been introduced, is also safe to run after the last railtype has been introduced. 2016-12-20 12:35:36 +00:00
translators
be21109989 (svn r27699) -Update from Eints:
russian: 1 change by Lone_Wolf
2016-12-19 18:45:38 +00:00
translators
2171a56c15 (svn r27698) -Update from Eints:
spanish: 3 changes by SilverSurferZzZ
russian: 3 changes by Lone_Wolf
2016-12-18 18:45:38 +00:00
Jonathan G Rennison
66751457ad Fix train crash on bridge/tunnel with signals leaving red signals.
Update signals on far end of bridge/tunnel.
If clearing the crash results in a clear bridge/tunnel, set all
bridge/tunnel signals green.
2016-12-18 18:09:48 +00:00
Jonathan G Rennison
09188e30f9 Exclude virtual/template vehicles from vehicle ageing and news messages. 2016-12-18 00:47:11 +00:00
Jonathan G Rennison
f80bebae7c Scope info: Log whether vehicle pointer is a virtual vehicle. 2016-12-18 00:47:11 +00:00
translators
37b6bd5702 (svn r27697) -Update from Eints:
urdu: 9 changes by siphr
spanish: 3 changes by SilverSurferZzZ
2016-12-17 18:45:36 +00:00
translators
5d5d020103 (svn r27696) -Update from Eints:
urdu: 11 changes by siphr
spanish: 6 changes by SilverSurferZzZ
russian: 10 changes by Lone_Wolf
2016-12-16 18:45:36 +00:00
translators
8a41b36cd8 (svn r27695) -Update from Eints:
spanish: 4 changes by SilverSurferZzZ
french: 26 changes by glx
2016-12-14 18:45:37 +00:00
translators
1808557b45 (svn r27694) -Update from Eints:
spanish: 4 changes by SilverSurferZzZ
2016-12-13 18:45:35 +00:00
Jonathan G Rennison
cea0d42548 Merge branch 'master' into jgrpp 2016-12-12 19:21:33 +00:00
translators
01059a7f75 (svn r27693) -Update from Eints:
korean: 2 changes by telk5093
spanish: 21 changes by SilverSurferZzZ
russian: 14 changes by Lone_Wolf
2016-12-12 18:45:37 +00:00
translators
3f78d271b2 (svn r27692) -Update from Eints:
croatian: 25 changes by VoyagerOne
english (us): 2 changes by Supercheese
russian: 1 change by Lone_Wolf
latin: 25 changes by Supercheese
2016-12-11 18:45:39 +00:00
translators
7c7913c986 (svn r27691) -Update from Eints:
italian: 9 changes by lorenzodv
2016-12-10 18:45:38 +00:00
frosch
4e2ecbb5a1 (svn r27690) -Fix: Old compilers do not zero-initialise POD members when explicitly calling implicitly created default constructors. 2016-12-10 15:49:25 +00:00
frosch
1db921bedb (svn r27689) -Fix: MSVC warnings. 2016-12-10 14:33:58 +00:00
frosch
0360e61dae (svn r27688) -Fix-ish: Initialise new railtypes with the original railtype data, though strictly NewGRF could only have modified 'label' and 'alternate_labels' at the time AllocateRailType is called, which are reset anyway. 2016-12-10 13:28:47 +00:00
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