Jonathan G Rennison
ecf5943954
Fix some undefined behaviour: signed overflow and over shift left.
...
Caught by UndefinedBehaviourSanitizer.
2015-11-22 23:16:09 +00:00
Jonathan G Rennison
8e3d9a520c
Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
2015-11-20 23:58:03 +00:00
Jonathan G Rennison
f8483614e9
Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx
2015-11-20 23:57:54 +00:00
Jonathan G Rennison
7b50fca535
Merge branch 'veh_gui_owner_colour' into jgrpp
2015-11-20 23:56:59 +00:00
Jonathan G Rennison
6075dd22e2
Show small square if vehicle owner does not match list owner.
...
No longer check the infrastructure sharing setting.
Add a separate setting to control company colour squares (default on).
2015-11-20 23:55:02 +00:00
Jonathan G Rennison
e91b84753b
Fix performance regression rendering vehicle route overlays.
...
Performance issue was triggered when orders were modified whilst
the route was displayed and the game was in multiplayer mode.
2015-11-20 23:13:22 +00:00
patch-import
0823f58ddc
Original patch from McZapkie
2015-11-19 19:27:10 +00:00
Jonathan G Rennison
7ff6ad1e36
Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
2015-11-18 23:33:10 +00:00
Jonathan G Rennison
ea3198cc25
Merge branch 'save_ext' into enhanced_viewport_overlay-sx
2015-11-18 23:33:00 +00:00
Jonathan G Rennison
9914ba7e63
Merge branch 'master' into save_ext
2015-11-18 23:32:48 +00:00
Jonathan G Rennison
0ee812b5a9
Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx
2015-11-18 23:31:35 +00:00
Jonathan G Rennison
6939bc7d87
Fix string type mismatch in German translation text.
2015-11-18 18:39:06 +00:00
Jonathan G Rennison
4b77beb3f9
Merge remote-tracking branch 'auge8472/translate-de' into jgrpp
2015-11-18 18:36:56 +00:00
translators
05812cd61b
(svn r27449) -Update from WebTranslator v3.0:
...
spanish - 2 changes by SilverSurferZzZ
2015-11-18 17:45:09 +00:00
Jonathan G Rennison
f770dd1ed9
Fix out of bound buffer read for non-company tunnels in viewport map mode.
...
Caught by AddressSanitizer.
2015-11-18 00:04:56 +00:00
Jonathan G Rennison
f8e1cf0dec
Fix out of bound buffer read for non-company tunnels in viewport map mode.
...
Caught by AddressSanitizer.
2015-11-17 22:20:14 +00:00
Jonathan G Rennison
73367d7209
build: include win32/win64 in output bundle name for mingw target.
2015-11-17 18:56:57 +00:00
translators
420eb83065
(svn r27448) -Update from WebTranslator v3.0:
...
spanish - 1 changes by SilverSurferZzZ
2015-11-16 17:45:09 +00:00
translators
7db053813b
(svn r27447) -Update from WebTranslator v3.0:
...
spanish - 2 changes by SilverSurferZzZ
2015-11-15 17:45:11 +00:00
frosch
1a0723579b
(svn r27446) -Feature: Lower the sell-vehicle button in the depot GUI while dragging a vehicle over it. (Eearslya)
2015-11-14 22:54:52 +00:00
translators
15b7e8faf1
(svn r27445) -Update from WebTranslator v3.0:
...
spanish - 1 changes by SilverSurferZzZ
2015-11-14 17:45:11 +00:00
zuu
0cff11130d
(svn r27444) -Add: When viewing online content of a particular type, hide content of other types unless they have been (auto)selected for download.
2015-11-14 15:57:15 +00:00
zuu
90b340e689
(svn r27443) -Fix: Negoation in comment was wrong.
2015-11-14 13:06:26 +00:00
translators
4dcda474fc
(svn r27442) -Update from WebTranslator v3.0:
...
spanish - 3 changes by SilverSurferZzZ
2015-11-13 17:45:09 +00:00
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
translators
a55e6b6d5a
(svn r27441) -Update from WebTranslator v3.0:
...
spanish - 3 changes by SilverSurferZzZ
2015-11-10 17:45:08 +00:00
translators
12229d80fe
(svn r27440) -Update from WebTranslator v3.0:
...
spanish - 2 changes by SilverSurferZzZ
2015-11-09 17:45:07 +00:00
translators
7ce96b4d47
(svn r27439) -Update from WebTranslator v3.0:
...
spanish - 7 changes by SilverSurferZzZ
2015-11-08 17:45:08 +00:00
Heiko August
063c125f20
translate-de: add translation of setting textes for adjacent level crossings patch
2015-11-08 18:33:34 +01:00
Heiko August
7595e54329
Merge remote-tracking branch 'upstream/jgrpp' into jgrpp
2015-11-08 14:51:39 +01:00
frosch
515fb701c2
(svn r27438) -Fix (r27346) [FS#6387]: The build object hotkey no longer checked whether there were any objects defined.
2015-11-07 15:07:18 +00:00
translators
19e0cb8c50
(svn r27437) -Update from WebTranslator v3.0:
...
spanish - 3 changes by SilverSurferZzZ
2015-11-06 17:45:09 +00:00
translators
591c3e2c81
(svn r27436) -Update from WebTranslator v3.0:
...
spanish - 1 changes by SilverSurferZzZ
2015-11-05 17:45:08 +00:00
translators
246e85088d
(svn r27435) -Update from WebTranslator v3.0:
...
spanish - 5 changes by SilverSurferZzZ
2015-11-04 17:45:08 +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