Commit Graph

23349 Commits

Author SHA1 Message Date
Jonathan G Rennison
781c34882e Version: Committing version data for tag: jgrpp-0.8.0 2015-11-24 22:10:29 +00:00
Jonathan G Rennison
5b1fe71552 Merge branch 'tracerestrict-sx' into jgrpp
Conflicts:
	src/rail_cmd.cpp
2015-11-24 20:30:19 +00:00
Jonathan G Rennison
8eac403224 Merge branch 'tracerestrict' into tracerestrict-sx 2015-11-24 20:28:08 +00:00
Jonathan G Rennison
4d484a858f Fix attempts to recolour signal sprites from GRFs. 2015-11-24 19:59:40 +00:00
translators
e94c79227b (svn r27456) -Update from WebTranslator v3.0:
korean - 7 changes by telk5093
spanish - 4 changes by SilverSurferZzZ
2015-11-24 18:45:15 +00:00
Jonathan G Rennison
9ee5aecbaf Merge branch 'enhanced_viewport_overlay-sx' into jgrpp 2015-11-24 01:06:51 +00:00
Jonathan G Rennison
9ed7fe22fb Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx 2015-11-24 01:06:41 +00:00
Jonathan G Rennison
1c3c413cfb Merge branch 'save_ext' into enhanced_viewport_overlay-sx 2015-11-24 01:06:35 +00:00
Jonathan G Rennison
dd5e6eaa28 Merge branch 'master' into save_ext 2015-11-24 01:06:16 +00:00
Jonathan G Rennison
9bd32e76bd Merge branch 'progsig-sx' into jgrpp
Conflicts:
	src/command.cpp
2015-11-24 01:04:02 +00:00
Jonathan G Rennison
769b8ae096 progsig: Fix remove and clone program functions being completely broken.
Remove function only removed instructions from the local machine, and
was therefore not MP safe.
Clone function failed to work correctly for non-trivial cases,
and sometimes caused an array out of bounds assertion.

These are replaced by a new commandproc which does each operation
as a single action, which is therefore MP safe.

Remove an unused struct field.
2015-11-24 01:03:09 +00:00
Jonathan G Rennison
f6a8f27501 Make server and all clients run desync checks if a client desyncs. 2015-11-23 19:47:59 +00:00
Jonathan G Rennison
69c89c4881 Check caches at desync level 1, every 500 ticks.
Also check aircraft cache.
2015-11-23 19:17:49 +00:00
translators
06fc9283f7 (svn r27455) -Update from WebTranslator v3.0:
spanish - 4 changes by SilverSurferZzZ
2015-11-23 18:45:08 +00:00
Jonathan G Rennison
aa00038c9c Do not write desync messages to the console on Windows.
Windows seems unable to handle direction change characters in consoles.
2015-11-23 18:34:57 +00:00
Jonathan G Rennison
52d3f075ea Fix over shift left undefined behaviour.
The maximum zoom level is now >= 8, so shifting a uint8 by a zoom
level results in undefined behaviour.
2015-11-22 23:31:51 +00:00
Jonathan G Rennison
d2cd74223e Fix another out of bound buffer read in viewport map mode.
Drawing of non-company tunnels/bridges.
Caught by AddressSanitizer.
2015-11-22 23:30:09 +00:00
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
translators
ca93b0ef79 (svn r27454) -Update from WebTranslator v3.0:
korean - 4 changes by telk5093
2015-11-22 18:45:10 +00:00
translators
d8b8f033d5 (svn r27453) -Update from WebTranslator v3.0:
italian - 1 changes by lorenzodv
2015-11-21 18:45:08 +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
translators
17e6f42f03 (svn r27452) -Update from WebTranslator v3.0:
russian - 1 changes by Lone_Wolf
2015-11-20 18:45:10 +00:00
alberth
e1a00bc244 (svn r27451) -Feature[FS#6241]: Move sprite 8 positions in sprite aligner with ctrl+click. (based on work by juzza1) 2015-11-20 10:04:28 +00:00
alberth
e32afcc4ea (svn r27450) -Feature[FS#6391](r27446): Lower the sell-chain button in the train depot GUI while dragging a vehicle over it. (Eearslya) 2015-11-20 09:25:27 +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