dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,017 Commits 1 Branch 0 Tags
5d42d0798899dd365fdb47628dce2dd55b7718e6
Commit Graph

23017 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan G Rennison
9eb07b4a77 Merge branch 'auto_timetables' into auto_timetables-sx 2015-11-30 22:31:08 +00:00
Jonathan G Rennison
d2b87485fb When clearing auto timetables, mark times as undefined rather than 0. 
Fix unautomate timetable having reversed ctrl key behaviour,
update tooltip string with ctrl behaviour.
Minor comment/whitespace fixes.
 2015-11-30 22:28:38 +00:00
Jonathan G Rennison
a7e9c9ce65 Fix ClearSeparation() not being called when auto-separation disabled. 
This can causes crashes if auto-separation is re-enabled as the
next/prev separation ptrs can end up dangling.
 2015-11-30 22:28:20 +00:00
Jonathan G Rennison
d05f67cf5a Merge branch 'master' into auto_timetables 2015-11-30 22:26:29 +00:00
translators
9808cfdf5e (svn r27459) -Update from WebTranslator v3.0: 
basque - 43 changes by Thadah
spanish - 3 changes by SilverSurferZzZ
 2015-11-30 18:45:13 +00:00
Jonathan G Rennison
58b6bf16c3 Linkgraph: Enable MCF custom allocator only for GCC 4.9+ 
Earlier compilers don't use std::allocator_traits to query allocators.
 2015-11-29 19:10:16 +00:00
Jonathan G Rennison
af93385f41 Merge pull request #3 from auge8472/translate-de 
Translate de; improved breakdowns, adjacent level crossings
 2015-11-29 15:38:54 +00:00
Heiko August
d485f548f0 translate-de: add translation for improved breakdowns 2015-11-29 16:02:01 +01:00
Heiko August
e59a789fff translate-de: fix wrong template string 2015-11-29 14:27:46 +01:00
Jonathan G Rennison
e22e1df939 Store annotation and node ID in set key, to reduce ptr derefs on sort. 
Store the set iterator in the node, for faster erasing during forks.

Use a custom pool allocator to store set nodes contiguously.
 2015-11-27 01:02:55 +00:00
Jonathan G Rennison
4534812b4f Use a fixed array instead of a map for link refresher cargo capacities. 2015-11-26 18:59:31 +00:00
translators
bf61d7a797 (svn r27458) -Update from WebTranslator v3.0: 
basque - 20 changes by Thadah
 2015-11-26 18:45:10 +00:00
Jonathan G Rennison
0fb79a8f15 Use a flat vector instead of a map in FlowEdgeIterator. 
This reduced the cost of Dijkstra<CapacityAnnotation> by approx. 25%,
in a test profiling.
 2015-11-26 18:23:10 +00:00
Jonathan G Rennison
a3768d3a29 Label threads with a descriptive name where supported (pthreads). 2015-11-26 17:48:47 +00:00
Jonathan G Rennison
3a28be7841 Linkgraph: Replace three uses of std::list with std::deque/vector. 2015-11-26 01:02:52 +00:00
Jonathan G Rennison
564744d427 Cache the calculated value of CapacityAnnotation. 
This is because CapacityAnnotation::Comparator::operator()
was appearing at the top of profiler output due to regenerating
the annotation value on every comparison when performing a set operation.
 2015-11-25 23:05:55 +00:00
Jonathan G Rennison
352a3229cd Do not update/redraw windows and viewports in dedicated mode. 
This has a quite significant performance cost when the result will
only be thrown away by the null blitter anyway.
No longer call UpdateWindows in main loop, which renders
dirty windows and viewports.
No longer update vehicle sprites IDs or mark dirty vehicles in viewports.
This saved >50% of server CPU time in a test game.
 2015-11-25 22:36:57 +00:00
translators
786838d277 (svn r27457) -Update from WebTranslator v3.0: 
croatian - 1 changes by VoyagerOne
spanish - 2 changes by SilverSurferZzZ
 2015-11-25 18:45:12 +00:00
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