dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,902 Commits 1 Branch 0 Tags
4007dc9f1b83cd0c7a63a7417c9fad9eb820e8b5
Commit Graph

23902 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan G Rennison
ecbbc03794 Merge branch 'tracerestrict' into tracerestrict-sx 2015-12-15 18:37:55 +00:00
Jonathan G Rennison
ebf250d813 Reserve instruction 24 for train owner test. 2015-12-15 18:37:34 +00:00
Jonathan G Rennison
9c5189b212 Handle double instructions correctly when deleting stations/depots/etc. 
Fix some whitespace and comment typos.
 2015-12-15 18:36:02 +00:00
Jonathan G Rennison
d3b61dd170 Merge branch 'vehicle_repair_costs-sx' into jgrpp 2015-12-15 00:04:08 +00:00
Jonathan G Rennison
cf8430da78 Merge branch 'improved_breakdowns-sx' into jgrpp 2015-12-15 00:04:00 +00:00
Jonathan G Rennison
0419e0ccab Merge branch 'vehicle_repair_costs' into vehicle_repair_costs-sx 2015-12-15 00:03:49 +00:00
Jonathan G Rennison
f567bcdb37 Fix _current_company being changed in VehicleServiceInDepot. 
_current_company is now restored when paying for a repair.
 2015-12-15 00:03:36 +00:00
Jonathan G Rennison
6ffb9c24c5 Merge branch 'improved_breakdowns' into improved_breakdowns-sx 2015-12-15 00:01:49 +00:00
Jonathan G Rennison
3ee8c76fa8 Fix desync caused by "train too heavy" advice message. 
_current_company was changed in an unsafe and non-deterministic way.
 2015-12-15 00:01:32 +00:00
translators
7338ed075f (svn r27470) -Update from WebTranslator v3.0: 
turkish - 69 changes by wakeup
 2015-12-11 18:45:09 +00:00
zuu
8660a2c2b1 (svn r27469) -Fix (r27468): Don't fetch all content info from content server when showing a online content window with exactly one type of content. 2015-12-10 19:58:33 +00:00
zuu
566d7de6af (svn r27468) -Fix (r27444): Game Scripts were not displayed in the content download window when opened from the AI/GS settings window. 2015-12-10 18:28:01 +00:00
Jonathan G Rennison
a8ce1f05bf Increase max value of difficulty.max_loan setting. 2015-12-09 23:56:09 +00:00
Jonathan G Rennison
6a780ffde2 Version detection: re-order SVN and Hg after git and .ottdrev-vc 2015-12-09 23:54:58 +00:00
translators
696626a8e9 (svn r27467) -Update from WebTranslator v3.0: 
simplified_chinese - 1 changes by Gavin
turkish - 34 changes by wakeup
 2015-12-09 18:45:14 +00:00
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
 2015-12-09 01:03:37 +00:00
Jonathan G Rennison
07aba3eb84 Merge branch 'tracerestrict' into tracerestrict-sx 2015-12-09 01:01:59 +00:00
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.
 2015-12-09 01:01:37 +00:00
Jonathan G Rennison
8edf5e0a34 Special case OpenGFX as a "base" set to allow recolouring signals. 2015-12-08 21:40:04 +00:00
Jonathan G Rennison
ad3255f347 Version: Committing version data for tag: jgrpp-0.8.1 2015-12-06 18:05:40 +00:00
Jonathan G Rennison
14bf956cec Merge branch 'master' into jgrpp 2015-12-06 17:13:37 +00:00
Jonathan G Rennison
99cbd64756 Fix version detection using .ottdrev-vc 2015-12-06 12:24:39 +00:00
translators
ae767d30a4 (svn r27466) -Update from WebTranslator v3.0: 
hungarian - 1 changes by IPG
spanish - 2 changes by SilverSurferZzZ
 2015-12-04 18:45:14 +00:00
Jonathan G Rennison
c6cbe7f1a9 Merge branch 'departure-boards-sx' into jgrpp 2015-12-04 01:39:58 +00:00
Jonathan G Rennison
0fbd6741a8 Merge branch 'departure-boards' into departure-boards-sx 2015-12-04 01:39:50 +00:00
Jonathan G Rennison
0529250e50 Fix crash when a station is deleted with the departure boards window open. 2015-12-04 01:39:40 +00:00
translators
ae1bb896e6 (svn r27465) -Update from WebTranslator v3.0: 
spanish - 5 changes by SilverSurferZzZ
 2015-12-03 18:45:08 +00:00
translators
1bf75b1abb (svn r27464) -Update from WebTranslator v3.0: 
spanish - 8 changes by SilverSurferZzZ
 2015-12-02 18:45:09 +00:00
Jonathan G Rennison
6ecf53530f Merge branch 'enhanced_viewport_overlay-sx' into jgrpp 2015-12-02 11:29:05 +00:00
Jonathan G Rennison
d58b0cef43 Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx 2015-12-02 11:28:15 +00:00
Jonathan G Rennison
374316e4b4 Fix new/enlarged route step markers not being redrawn. 2015-12-02 11:27:59 +00:00
frosch
e78a03d7b4 (svn r27463) -Merge: Documentation updates from 1.5 branch 2015-12-01 19:49:49 +00:00
translators
244144f0f6 (svn r27460) -Update from WebTranslator v3.0: 
spanish - 8 changes by SilverSurferZzZ
 2015-12-01 18:45:07 +00:00
Jonathan G Rennison
570bc4cc5d Log random output to a new file on Unix/glibc. 
No longer fflush() every write.
 2015-11-30 22:32:40 +00:00
Jonathan G Rennison
cd23d17745 Merge branch 'auto_timetables-sx' into jgrpp 
Conflicts:
	src/vehicle.cpp
 2015-11-30 22:32:29 +00:00
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