Commit Graph

22788 Commits (6a780ffde28a04a153e90dea86c7891c693ce949)
 

Author SHA1 Message Date
Jonathan G Rennison 6a780ffde2 Version detection: re-order SVN and Hg after git and .ottdrev-vc 9 years ago
Jonathan G Rennison 69f3844d2e Merge branch 'tracerestrict-sx' into jgrpp
Conflicts:
	src/lang/english.txt
	src/settings_gui.cpp
	src/settings_type.h
	src/table/settings.ini
9 years ago
Jonathan G Rennison 07aba3eb84 Merge branch 'tracerestrict' into tracerestrict-sx 9 years ago
Jonathan G Rennison a93714a720 Add setting to show restricted electric signals using the default sprites.
This is to improve visual distinctiveness of restricted signals when
using signal GRFs.
This defaults to off.
9 years ago
Jonathan G Rennison 8edf5e0a34 Special case OpenGFX as a "base" set to allow recolouring signals. 9 years ago
Jonathan G Rennison ad3255f347 Version: Committing version data for tag: jgrpp-0.8.1 9 years ago
Jonathan G Rennison 14bf956cec Merge branch 'master' into jgrpp 9 years ago
Jonathan G Rennison 99cbd64756 Fix version detection using .ottdrev-vc 9 years ago
translators ae767d30a4 (svn r27466) -Update from WebTranslator v3.0:
hungarian - 1 changes by IPG
spanish - 2 changes by SilverSurferZzZ
9 years ago
Jonathan G Rennison c6cbe7f1a9 Merge branch 'departure-boards-sx' into jgrpp 9 years ago
Jonathan G Rennison 0fbd6741a8 Merge branch 'departure-boards' into departure-boards-sx 9 years ago
Jonathan G Rennison 0529250e50 Fix crash when a station is deleted with the departure boards window open. 9 years ago
translators ae1bb896e6 (svn r27465) -Update from WebTranslator v3.0:
spanish - 5 changes by SilverSurferZzZ
9 years ago
translators 1bf75b1abb (svn r27464) -Update from WebTranslator v3.0:
spanish - 8 changes by SilverSurferZzZ
9 years ago
Jonathan G Rennison 6ecf53530f Merge branch 'enhanced_viewport_overlay-sx' into jgrpp 9 years ago
Jonathan G Rennison d58b0cef43 Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx 9 years ago
Jonathan G Rennison 374316e4b4 Fix new/enlarged route step markers not being redrawn. 9 years ago
frosch e78a03d7b4 (svn r27463) -Merge: Documentation updates from 1.5 branch 9 years ago
translators 244144f0f6 (svn r27460) -Update from WebTranslator v3.0:
spanish - 8 changes by SilverSurferZzZ
9 years ago
Jonathan G Rennison 570bc4cc5d Log random output to a new file on Unix/glibc.
No longer fflush() every write.
9 years ago
Jonathan G Rennison cd23d17745 Merge branch 'auto_timetables-sx' into jgrpp
Conflicts:
	src/vehicle.cpp
9 years ago
Jonathan G Rennison 9eb07b4a77 Merge branch 'auto_timetables' into auto_timetables-sx 9 years ago
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.
9 years ago
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.
9 years ago
Jonathan G Rennison d05f67cf5a Merge branch 'master' into auto_timetables 9 years ago
translators 9808cfdf5e (svn r27459) -Update from WebTranslator v3.0:
basque - 43 changes by Thadah
spanish - 3 changes by SilverSurferZzZ
9 years ago
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.
9 years ago
Jonathan G Rennison af93385f41 Merge pull request #3 from auge8472/translate-de
Translate de; improved breakdowns, adjacent level crossings
9 years ago
Heiko August d485f548f0 translate-de: add translation for improved breakdowns 9 years ago
Heiko August e59a789fff translate-de: fix wrong template string 9 years ago
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.
9 years ago
Jonathan G Rennison 4534812b4f Use a fixed array instead of a map for link refresher cargo capacities. 9 years ago
translators bf61d7a797 (svn r27458) -Update from WebTranslator v3.0:
basque - 20 changes by Thadah
9 years ago
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.
9 years ago
Jonathan G Rennison a3768d3a29 Label threads with a descriptive name where supported (pthreads). 9 years ago
Jonathan G Rennison 3a28be7841 Linkgraph: Replace three uses of std::list with std::deque/vector. 9 years ago
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.
9 years ago
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.
9 years ago
translators 786838d277 (svn r27457) -Update from WebTranslator v3.0:
croatian - 1 changes by VoyagerOne
spanish - 2 changes by SilverSurferZzZ
9 years ago
Jonathan G Rennison 781c34882e Version: Committing version data for tag: jgrpp-0.8.0 9 years ago
Jonathan G Rennison 5b1fe71552 Merge branch 'tracerestrict-sx' into jgrpp
Conflicts:
	src/rail_cmd.cpp
9 years ago
Jonathan G Rennison 8eac403224 Merge branch 'tracerestrict' into tracerestrict-sx 9 years ago
Jonathan G Rennison 4d484a858f Fix attempts to recolour signal sprites from GRFs. 9 years ago
translators e94c79227b (svn r27456) -Update from WebTranslator v3.0:
korean - 7 changes by telk5093
spanish - 4 changes by SilverSurferZzZ
9 years ago
Jonathan G Rennison 9ee5aecbaf Merge branch 'enhanced_viewport_overlay-sx' into jgrpp 9 years ago
Jonathan G Rennison 9ed7fe22fb Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx 9 years ago
Jonathan G Rennison 1c3c413cfb Merge branch 'save_ext' into enhanced_viewport_overlay-sx 9 years ago
Jonathan G Rennison dd5e6eaa28 Merge branch 'master' into save_ext 9 years ago
Jonathan G Rennison 9bd32e76bd Merge branch 'progsig-sx' into jgrpp
Conflicts:
	src/command.cpp
9 years ago
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.
9 years ago