Jonathan G Rennison
b96a2f7bd7
Merge branch 'signal_tunnels_bridges' into signal_tunnels_bridges-sx
2015-11-01 14:06:18 +00:00
Jonathan G Rennison
95a329a4b9
Fix signals on far side of bridge not being updated when adding/removing signals.
2015-11-01 14:05:50 +00:00
Jonathan G Rennison
b3e03e8cf9
Fix middle of bridge not being redrawn when adding removing signals.
2015-11-01 14:05:22 +00:00
Jonathan G Rennison
e07e4fdb8e
Merge branch 'master' into signal_tunnels_bridges
2015-11-01 14:02:13 +00:00
Jonathan G Rennison
4e3e4378b3
Merge branch 'vehicle_repair_costs-sx' into jgrpp
2015-11-01 11:30:37 +00:00
Jonathan G Rennison
98047b5d87
Merge branch 'departure-boards-sx' into jgrpp
2015-11-01 11:30:28 +00:00
Jonathan G Rennison
8fa7b8d8cb
Merge branch 'vehicle_repair_costs' into vehicle_repair_costs-sx
2015-11-01 11:28:32 +00:00
Jonathan G Rennison
def0347ea8
Fix compilation on MSVC due to ambiguous overload:
...
OverflowSafeInt<T,T_MAX,T_MIN>::operator /
2015-11-01 11:28:17 +00:00
Jonathan G Rennison
7dc91d0858
Merge branch 'departure-boards' into departure-boards-sx
2015-11-01 11:18:10 +00:00
Jonathan G Rennison
44d545d220
Merge branch 'master' into departure-boards
2015-11-01 11:17:14 +00:00
Jonathan G Rennison
3576488527
Fix departures_widget.h being missing from source.list
...
Fix whitespace issues.
2015-11-01 11:15:59 +00:00
Jonathan G Rennison
b47c8825e7
Merge branch 'auto_timetables-sx' into jgrpp
2015-11-01 01:56:16 +00:00
Jonathan G Rennison
fe598efde5
Merge branch 'auto_timetables' into auto_timetables-sx
2015-11-01 01:56:06 +00:00
Jonathan G Rennison
37140f0038
Fix distribution of shared order timetable start dates.
...
(Ctrl-click on start date in timetable GUI)
This is due to a scaling issue.
2015-11-01 01:55:46 +00:00
Jonathan G Rennison
8d19727c93
Merge branch 'save_ext' into jgrpp
...
Conflicts:
src/pathfinder/follow_track.hpp
2015-10-31 10:53:00 +00:00
Jonathan G Rennison
1234bdb07c
Fix compilation issue with MSVC due to ordering of noreturn and cdecl.
2015-10-31 10:51:58 +00:00
Jonathan G Rennison
a0b0641a8b
Merge branch 'master' into save_ext
2015-10-31 10:50:11 +00:00
Jonathan G Rennison
3b60379a42
Merge branch 'signal_tunnels_bridges-sx' into jgrpp
2015-10-31 01:31:48 +00:00
Jonathan G Rennison
5d774e5844
Merge branch 'signal_tunnels_bridges' into signal_tunnels_bridges-sx
2015-10-31 01:31:38 +00:00
Jonathan G Rennison
4759019cf5
Fix vehicles emitting smoke when stopped at a bridge signal.
2015-10-31 01:31:06 +00:00
Jonathan G Rennison
654afdc113
Fix removing signals from bridges not updating adjacent signals.
...
Fix minor whitespace/code issues.
2015-10-31 01:30:08 +00:00
Jonathan G Rennison
d65ddc8985
Merge branch 'auto_timetables-sx' into jgrpp
2015-10-30 23:02:20 +00:00
Jonathan G Rennison
61aad7ce2a
Change the default auto timetable separation rate to 40%.
...
This is to improve jam-resistance by default.
2015-10-30 23:01:59 +00:00
Jonathan G Rennison
bb2944381f
Merge branch 'vehicle_group_info' into jgrpp
2015-10-30 21:23:23 +00:00
Jonathan G Rennison
0dbbd19223
Merge branch 'enhanced_viewport_overlay' into jgrpp
2015-10-30 21:23:11 +00:00
Jonathan G Rennison
ff588acb69
Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx
2015-10-30 21:22:58 +00:00
Jonathan G Rennison
71a662ef84
Avoid closing nested templates with >> for backwards compatibility.
...
(cherry picked from commit bdf0216bf0
2015-10-30 21:22:37 +00:00
Jonathan G Rennison
129e14d817
Fix redrawing/clearing of vehicle route lines.
...
Fix new route lines not being (fully) added in a timely manner.
Fix old lines not being (fully) removed until a scroll/zoom.
Fix the screen invalidation algorithm assuming that the terrain is
perfectly flat at at near sea level. (Use of MarkTileDirtyByTile to
clear lines which do not follow tile height contours).
2015-10-30 21:05:33 +00:00
Jonathan G Rennison
248bd3b2f7
Vehicle group info: make margins around text symmetric.
2015-10-30 18:26:01 +00:00
frosch
ba955956cb
(svn r27428) -Fix: When selecting a refit cargo for orders, do not check whether the vehicle is in a depot or station, and do not ask whether the vehicle currently allows station-refitting. Also hide the refit cost for orders, it is not predictable.
2015-10-30 17:27:21 +00:00
frosch
0974f5489b
(svn r27428) -Fix: When selecting a refit cargo for orders, do not check whether the vehicle is in a depot or station, and do not ask whether the vehicle currently allows station-refitting. Also hide the refit cost for orders, it is not predictable.
2015-10-30 17:27:21 +00:00
frosch
ade25fff71
(svn r27427) -Fix: Use the NewGRF railtype sorting order in the infrastructure window.
2015-10-30 17:24:30 +00:00
frosch
2d636266f5
(svn r27427) -Fix: Use the NewGRF railtype sorting order in the infrastructure window.
2015-10-30 17:24:30 +00:00
frosch
0f8f738942
(svn r27426) -Change: Round loading percentage in loading indicators and conditional orders towards 50%, so that 0% and 100% mean completely empty or full.
2015-10-30 17:24:05 +00:00
frosch
312809228d
(svn r27426) -Change: Round loading percentage in loading indicators and conditional orders towards 50%, so that 0% and 100% mean completely empty or full.
2015-10-30 17:24:05 +00:00
frosch
c74ffeecd1
(svn r27425) -Fix [FS#5842]: Crash when switching to or taking over companies, when an order window of a vehicle of the new company was opened. Now close those windows.
2015-10-30 17:23:16 +00:00
frosch
44d1fc4253
(svn r27425) -Fix [FS#5842]: Crash when switching to or taking over companies, when an order window of a vehicle of the new company was opened. Now close those windows.
2015-10-30 17:23:16 +00:00
frosch
e51abf1796
(svn r27424) -Fix [FS#6374]: Towns did not connect roads to existing roads, unless they had only a single roadbit. Otoh, towns also tried to connect to single roadbit tiles such as tunnels and depots, even though they were not connectable in the direction of interest.
2015-10-30 17:19:01 +00:00
frosch
c0a301ae60
(svn r27424) -Fix [FS#6374]: Towns did not connect roads to existing roads, unless they had only a single roadbit. Otoh, towns also tried to connect to single roadbit tiles such as tunnels and depots, even though they were not connectable in the direction of interest.
2015-10-30 17:19:01 +00:00
frosch
34627862c6
(svn r27423) -Fix: When towns expanded single-bit roadtiles using a grid-layout, they used the layout position of the neighbouring tile.
2015-10-30 17:17:54 +00:00
frosch
ab7ebdcfd9
(svn r27423) -Fix: When towns expanded single-bit roadtiles using a grid-layout, they used the layout position of the neighbouring tile.
2015-10-30 17:17:54 +00:00
frosch
1e897531cb
(svn r27422) -Fix [FS#6341]: Aircraft picked the wrong airport entry point, if airports were rotated by 180 degree. (marcole)
2015-10-30 16:20:00 +00:00
frosch
05ed2001d4
(svn r27422) -Fix [FS#6341]: Aircraft picked the wrong airport entry point, if airports were rotated by 180 degree. (marcole)
2015-10-30 16:20:00 +00:00
frosch
7be7851b94
(svn r27421) -Fix [FS#6265]: Consider text and icon sizes when drawing the client list. (_dp_)
2015-10-30 16:19:33 +00:00
frosch
2c9117fbdd
(svn r27421) -Fix [FS#6265]: Consider text and icon sizes when drawing the client list. (_dp_)
2015-10-30 16:19:33 +00:00
frosch
49a18025f8
(svn r27420) -Fix [FS#6362]: GrowTownAtRoad sometimes returned false, even when a house was built. (_dp_)
2015-10-30 16:19:09 +00:00
frosch
d626962a38
(svn r27420) -Fix [FS#6362]: GrowTownAtRoad sometimes returned false, even when a house was built. (_dp_)
2015-10-30 16:19:09 +00:00
frosch
51787a3465
(svn r27419) -Fix [FS#6369]: CmdSellRailWagon did not revert all actions properly when no orderlist could be allocated. (Juanjo)
2015-10-30 16:18:39 +00:00
frosch
378653100b
(svn r27419) -Fix [FS#6369]: CmdSellRailWagon did not revert all actions properly when no orderlist could be allocated. (Juanjo)
2015-10-30 16:18:39 +00:00
frosch
147b53fbff
(svn r27418) -Fix [FS#6329] [FS#6379]: Desync due to incorrect storage of segments with different railtype in the YAPF cache. (JGR)
2015-10-30 16:18:03 +00:00
