Jonathan G Rennison
01261daec0
Merge branch 'master' into cpp-11
...
# Conflicts:
# config.lib
6 years ago
PeterN
812886ca61
Fix #7478 : Don't remove NewGRF objects on company take-over. ( #7483 )
6 years ago
kiwitreekor
bc9b47d2e5
Fix #6222 : Advanced sprite layout sometimes showed incorrect railtype ground tile
6 years ago
glx22
3e608afa6c
Fix: [Windows] OpenTTD window may be inactive when an error happens ( #7482 )
6 years ago
Michael Lutz
967b27a2c1
Codechange: C++11 STL has a function for getting the number of CPU cores.
6 years ago
Michael Lutz
ae748166d0
Codechange: Use platform independent C++11 function for sleeping on a thread.
6 years ago
Michael Lutz
94c5269fa7
Codechange: Use atomic variables for thread synchronization where useful.
6 years ago
Michael Lutz
05bc2ed7cb
Codechange: Replace custom thread code with C++11 thread objects.
...
We assume a conforming C++11 compiler environment that has a valid <thread>-header.
Failure to run a real thread is handled gracefully.
6 years ago
Michael Lutz
05f4e73608
Codechange: Replace custom mutex code with C++11 mutex'es.
...
A conforming compiler with a valid <mutex>-header is expected.
Most parts of the code assume that locking a mutex will never fail unexpectedly,
which is generally true on all common platforms that don't just pretend to
be C++11. The use of condition variables in driver code is checked.
6 years ago
glx22
a1e492d0d8
Fix #7439 : don't overwrite CompanyRemoveReason with ClientID ( #7465 )
6 years ago
Samu
fb6e31ca43
Cleanup 3f32711: Don't apply forbid 90 deg turn settings for ships.
6 years ago
peter1138
8114bad033
Fix #7469 : Desync when using build and refit feature.
6 years ago
translators
24fc25164a
Update: Translations from eints
...
french: 3 changes by glx
croatian: 17 changes by VoyagerOne
6 years ago
Niels Martin Hansen
cebdd72146
Fix #7440 : Remove town sign when deleting town, not add it once more
6 years ago
translators
92d5835495
Update: Translations from eints
...
dutch: 2 changes by JanWillem
french: 19 changes by glx
6 years ago
translators
cb449049ff
Update: Translations from eints
...
english (us): 3 changes by Supercheese
spanish (mexican): 18 changes by Absay
hungarian: 2 changes by Brumi
latin: 33 changes by Supercheese
6 years ago
peter1138
f0336f1f17
Codechange: Remove ship max order distance from script API.
6 years ago
peter1138
f656f5e8eb
Change: Remove ship max order distance.
...
It is skipped when NPF is in use.
It is trivial to work around by adding and removing dummy orders.
It is mostly alleviated by the ship path cache in YAPF.
6 years ago
peter1138
66bed86bbb
Fix #7062 , Revert 7af53d7588: Don't test ship max order distance when pathfinding.
6 years ago
glx
d0e8060182
Fix 6fc60d8c4f: forgot to update API changelog
6 years ago
PeterN
6d1cc142c2
Change: Shorten engine rail type drop down in autoreplace window. ( #7448 )
...
In the autoreplace window, the rail type drop down is for choosing engines
of the given time. Many rail types do not have engines specifically designed for them,
and are merely compatible with other rail types. This list is thus unwieldy and many
options have no engines available.
As this drop down is for choosing _engine_ rail type rather than compatible rail types,
we can list just the rail types explicitly listed by engines.
6 years ago
PeterN
e1069eee05
Codechange: Check airport layout would fit within map bounds before iterating tiles. ( #7429 )
6 years ago
PeterN
32fda83d39
Fix aa7ca7fe6: Linkgraph node index order must be maintained due to other references. ( #7431 )
...
Linkgraph nodes require a specific order that was maintained by swapping just the last
element for the node to be removed. std::vector::erase() changed this to removing the
node is then shuffling the remain items down, which upsets other references to this
indices.
This is fixed by switching back to the original swap & pop method.
6 years ago
Andy
423aea5c32
Change: adjust Violet smallmap colour 1 shade darker, to compensate for legibility against darker blue of sea introduced by #7436
6 years ago
glx22
e93630541d
Fix #7433 : don't use AirportSpec substitute if it's not set ( #7435 )
6 years ago
Niels Martin Hansen
df673e9b2c
Fix: Fluidsynth should not try to lock sample data in memory
6 years ago
Niels Martin Hansen
66c60e52ba
Change: [SDL] Do not offer video smaller than 640x480
6 years ago
frosch
0cf25e84df
Fix #7447 , 3357cac847: Action 4 has feature 48 'original strings'. ( #7449 )
6 years ago
translators
3118f1430f
Update: Translations from eints
...
italian: 25 changes by lorenzodv
portuguese: 3 changes by JayCity
6 years ago
SamuXarick
ed51fba7ed
Change: Dark Blue company and water were indistinguishable in small map. ( #7436 )
6 years ago
translators
1d14e31be3
Update: Translations from eints
...
korean: 14 changes by telk5093
6 years ago
PeterN
b6e3e30d86
Codechange: Distance between town and airport has already just been found, so use it. ( #7427 )
...
Previously the distance was thrown away, only to be expensively recalculated again.
6 years ago
PeterN
9244dad3f1
Fix #7434 : Incorrect use of vector iterator. ( #7437 )
6 years ago
glx22
acb09eb9a8
Fix: [Win64] settingsgen MSVC compile warnings ( #7432 )
6 years ago
translators
cd3767bec2
Update: Translations from eints
...
luxembourgish: 29 changes by Phreeze
russian: 2 changes by Lone_Wolf
latin: 4 changes by Supercheese
portuguese: 1 change by JayCity
6 years ago
Michael Lutz
21d9e87b46
Fix #7165 : Const overload SmallMap::Contains(key) compared wrong types.
...
Const and non-const Find() have different return types.
6 years ago
stormcone
ee260e4704
Fix #7165 : SmallMap::Erase(key) does not work correctly
6 years ago
PeterN
7fb77ff35a
Fix: Incorrect display of industry production around tiles. ( #7426 )
...
Display of industry production around tiles (as shown when placing a station)
did not take account of the station catchment changes, so still showed production
from an industry even if it was not covered by a tile.
This is fixed by making a set of nearby industries that are covered, instead of
looping over all possible industries.
6 years ago
glx22
66dd7c3879
Fix: MSVC warnings ( #7423 )
6 years ago
translators
e817951bfd
Update: Translations from eints
...
finnish: 2 changes by hpiirai
english (us): 17 changes by Supercheese
luxembourgish: 10 changes by Phreeze
dutch: 20 changes by JanWillem
norwegian (bokmal): 2 changes by Leifbk
latin: 16 changes by Supercheese
portuguese: 3 changes by JayCity
6 years ago
Johannes E. Krause
fdaf67d924
Add: [Newgrf] Some 60+ Vars for industries that were missed in #6867
6 years ago
Johannes E. Krause
1a4c7a4e54
Cleanup: use switch for industry cargo vars
6 years ago
Charles Pigott
49f7332b75
Feature #6053 : Collapsible vehicle groups (3298)
6 years ago
Charles Pigott
8890436af1
Add #6189 : Groups now count the total number of vehicles in subgroups (3298)
6 years ago
Charles Pigott
a393c94695
Change #5977 : Use specific error message when attempting to create a circular group hierarchy (3298)
6 years ago
Charles Pigott
ed9005690a
Fix #7421 : Don't (directly) dereference std::vector::end() in SmallMap
6 years ago
stormcone
b913c92aa7
Fix #7165 : Missed 'Append() --> push_back()' replacement
6 years ago
glx22
427d9d483f
Fix #6564 : enforce types of arguments for station name strings ( #7419 )
6 years ago
Charles Pigott
a065d4623e
Codechange: Move 2 constants into the ifdef where they're used
6 years ago
Charles Pigott
7c81f8e076
Codechange: Simplify refit cargo filter condition and stop mixing enum types
6 years ago