Jonathan G Rennison
4608ed79bb
Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
2015-11-12 20:14:38 +00:00
Jonathan G Rennison
16c5a0a812
Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx
2015-11-12 20:14:23 +00:00
Jonathan G Rennison
5a0510e488
Fix dark/lighten colour mappings going to/from yellow flash cycle.
...
This is problematic for the green company in viewport map owner mode,
where it becomes flashing yellow for slopes and tunnels (if enabled).
2015-11-12 20:14:08 +00:00
Jonathan G Rennison
8cc6bddc24
Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
...
Conflicts:
src/misc.cpp
2015-11-11 19:20:36 +00:00
Jonathan G Rennison
2a8b66b7bf
Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx
2015-11-11 19:19:44 +00:00
Jonathan G Rennison
919057a5e6
Cache tunnel info in viewport map mode, to prevent render flicker.
...
If we see a tunnel during the usual tile scan, keep it in the cache
until it is explicitly evicted by a clear tunnel tile action, or
the cache is cleared at game init/load/shutdown.
Select colours at the drawing rather than the cache-building stage.
Bridges and tunnels are now stored/handled separately.
The process for bridges is mostly unchanged.
2015-11-11 19:18:32 +00:00
Jonathan G Rennison
3788228d8f
Slightly lower displayed height of bridges in viewport map mode.
2015-11-11 01:02:24 +00:00
Jonathan G Rennison
9990b1b837
Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
2015-11-03 00:06:15 +00:00
Jonathan G Rennison
33cc6916db
Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx
2015-11-03 00:06:01 +00:00
Jonathan G Rennison
2503704d38
Fix displayed height for bridge/tunnels in viewport map mode.
2015-11-03 00:01:42 +00:00
Jonathan G Rennison
8db96aa318
Version: Committing version data for tag: jgrpp-0.7.1
2015-11-01 22:56:44 +00:00
Jonathan G Rennison
a286096f63
Add readme and changelog to bundle/install target.
2015-11-01 22:54:24 +00:00
Jonathan G Rennison
072d428ed8
Merge remote-tracking branch 'auge8472/translate-de' into jgrpp
2015-11-01 21:59:15 +00:00
Jonathan G Rennison
b5695551a5
Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
2015-11-01 21:51:59 +00:00
Jonathan G Rennison
2c2f846e20
Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx
2015-11-01 21:51:25 +00:00
Jonathan G Rennison
aa9f44eaec
Fix flicker/render errors of bridge/tunnels in viewport map mode.
...
Fix bridges not being rendered when the region to be repainted
did not intersect with either of the bridge ends.
Fix flicker due to non-deterministic ordering of the two bridge/tunnel
ends (if the tile heights of the two ends are different).
2015-11-01 21:51:10 +00:00
Jonathan G Rennison
196b78af30
Merge branch 'zoning' into jgrpp
2015-11-01 16:08:06 +00:00
Jonathan G Rennison
c120b810d1
Mark dirty the catchment of a station on change as necessary for zoning.
...
If the zoning mode is station catchment, or unserved industry/building,
mark dirty the station catchment rectangle before removing, or after
adding, (a) station tile(s).
In the case of unserved industry mode, increase the refreshed catchment
radius by 10 tiles, to wholly include industries partially inside
the catchment area.
2015-11-01 16:07:55 +00:00
Jonathan G Rennison
169a979737
Merge branch 'signal_tunnels_bridges-sx' into jgrpp
...
Conflicts:
src/tunnelbridge.h
(Fixup zoom level changes).
2015-11-01 14:07:55 +00:00
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
bc2094d261
Update project files.
2015-11-01 11:31:11 +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
b457c67ac1
Update project info.
2015-11-01 11:17:39 +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
