Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-11 13:10:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,862 Commits 12 Branches 180 Tags 451 MiB
69d2d3e278
Commit Graph

45862 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan G Rennison
69d2d3e278 Crashlog: Limit total number of news items 2019-04-09 19:29:27 +01:00
Jonathan G Rennison
d5ee9d34da Merge branch 'cpp-11' into crashlog_improvements 
# Conflicts:
#	Makefile.src.in
#	projects/determineversion.vbs
#	source.list
#	src/crashlog.cpp
#	src/misc.cpp
#	src/os/unix/crashlog_unix.cpp
#	src/os/windows/crashlog_win.cpp
#	src/rev.h
#	src/thread/thread.h
#	src/thread/thread_morphos.cpp
#	src/thread/thread_none.cpp
#	src/thread/thread_os2.cpp
#	src/thread/thread_pthread.cpp
#	src/thread/thread_win32.cpp
 2019-04-09 19:21:39 +01:00
Jonathan G Rennison
01261daec0 Merge branch 'master' into cpp-11 
# Conflicts:
#	config.lib
 2019-04-09 18:47:28 +01:00
PeterN
812886ca61
Fix #7478: Don't remove NewGRF objects on company take-over. (#7483) 2019-04-08 19:20:43 +01:00
kiwitreekor
bc9b47d2e5 Fix #6222: Advanced sprite layout sometimes showed incorrect railtype ground tile 2019-04-08 18:41:07 +01:00
glx22
3e608afa6c
Fix: [Windows] OpenTTD window may be inactive when an error happens (#7482) 2019-04-07 21:52:30 +02:00
Michael Lutz
967b27a2c1 Codechange: C++11 STL has a function for getting the number of CPU cores. 2019-04-06 11:27:39 +02:00
Michael Lutz
ae748166d0 Codechange: Use platform independent C++11 function for sleeping on a thread. 2019-04-06 11:27:39 +02:00
Michael Lutz
94c5269fa7 Codechange: Use atomic variables for thread synchronization where useful. 2019-04-06 11:27:39 +02:00
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.
 2019-04-06 11:27:39 +02:00
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.
 2019-04-06 11:27:39 +02:00
Michael Lutz
3b86f54fc7 Fix: [OSX] .mm files are C++ files, not C files. 2019-04-06 11:27:39 +02:00
glx22
90a91f1d0d
Fix: [MSVC] don't force SDK version (#7474) 2019-04-05 21:07:06 +02:00
glx22
a1e492d0d8
Fix #7439: don't overwrite CompanyRemoveReason with ClientID (#7465) 2019-04-05 15:11:52 +02:00
Samu
fb6e31ca43 Cleanup 3f32711: Don't apply forbid 90 deg turn settings for ships. 2019-04-05 10:03:54 +01:00
peter1138
8114bad033 Fix #7469: Desync when using build and refit feature. 2019-04-04 23:29:43 +01:00
Patric Stout
c99f731f89 Update: documentation updates from 1.9 branch 2019-04-05 00:19:41 +02:00
translators
24fc25164a Update: Translations from eints 
french: 3 changes by glx
croatian: 17 changes by VoyagerOne
 2019-04-02 19:45:45 +02:00
Niels Martin Hansen
cebdd72146 Fix #7440: Remove town sign when deleting town, not add it once more 2019-04-02 09:46:33 +02:00
translators
92d5835495 Update: Translations from eints 
dutch: 2 changes by JanWillem
french: 19 changes by glx
 2019-04-01 19:45:46 +02:00
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
 2019-03-31 19:45:45 +02:00
peter1138
f0336f1f17 Codechange: Remove ship max order distance from script API. 2019-03-31 17:22:54 +01:00
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.
 2019-03-31 17:22:54 +01:00
peter1138
66bed86bbb Fix #7062, Revert 7af53d7588: Don't test ship max order distance when pathfinding. 2019-03-31 17:22:54 +01:00
glx
d0e8060182 Fix 6fc60d8c4f: forgot to update API changelog 2019-03-31 03:33:03 +02:00
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.
 2019-03-31 02:05:23 +01:00
PeterN
e1069eee05
Codechange: Check airport layout would fit within map bounds before iterating tiles. (#7429) 2019-03-30 22:20:26 +00:00
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.
 2019-03-30 22:19:50 +00:00
Andy
423aea5c32 Change: adjust Violet smallmap colour 1 shade darker, to compensate for legibility against darker blue of sea introduced by #7436 2019-03-30 22:57:07 +01:00
glx22
e93630541d
Fix #7433: don't use AirportSpec substitute if it's not set (#7435) 2019-03-30 22:12:25 +01:00
Niels Martin Hansen
df673e9b2c Fix: Fluidsynth should not try to lock sample data in memory 2019-03-30 22:11:32 +01:00
Niels Martin Hansen
66c60e52ba Change: [SDL] Do not offer video smaller than 640x480 2019-03-30 22:02:14 +01:00
frosch
0cf25e84df Fix #7447, 3357cac847: Action 4 has feature 48 'original strings'. (#7449) 2019-03-30 19:56:43 +00:00
translators
3118f1430f Update: Translations from eints 
italian: 25 changes by lorenzodv
portuguese: 3 changes by JayCity
 2019-03-30 19:45:46 +01:00
SamuXarick
ed51fba7ed Change: Dark Blue company and water were indistinguishable in small map. (#7436) 2019-03-29 19:00:43 +00:00
translators
1d14e31be3 Update: Translations from eints 
korean: 14 changes by telk5093
 2019-03-29 19:45:45 +01:00
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.
 2019-03-29 17:43:06 +00:00
PeterN
9244dad3f1
Fix #7434: Incorrect use of vector iterator. (#7437) 2019-03-29 17:42:32 +00:00
glx22
acb09eb9a8 Fix: [Win64] settingsgen MSVC compile warnings (#7432) 2019-03-28 21:25:21 +01:00
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
 2019-03-28 19:45:46 +01:00
Michael Lutz
21d9e87b46 Fix #7165: Const overload SmallMap::Contains(key) compared wrong types. 
Const and non-const Find() have different return types.
 2019-03-28 00:04:28 +00:00
stormcone
ee260e4704 Fix #7165: SmallMap::Erase(key) does not work correctly 2019-03-28 00:04:28 +00:00
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.
 2019-03-27 23:10:02 +00:00
glx22
66dd7c3879
Fix: MSVC warnings (#7423) 2019-03-28 00:09:33 +01:00
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
 2019-03-27 19:45:44 +01:00
Johannes E. Krause
fdaf67d924 Add: [Newgrf] Some 60+ Vars for industries that were missed in #6867 2019-03-27 10:44:21 +00:00
Johannes E. Krause
1a4c7a4e54 Cleanup: use switch for industry cargo vars 2019-03-27 10:44:21 +00:00
Charles Pigott
49f7332b75 Feature #6053: Collapsible vehicle groups (3298) 2019-03-27 06:58:48 +00:00
Charles Pigott
8890436af1 Add #6189: Groups now count the total number of vehicles in subgroups (3298) 2019-03-27 06:58:48 +00:00
Charles Pigott
a393c94695 Change #5977: Use specific error message when attempting to create a circular group hierarchy (3298) 2019-03-27 06:58:48 +00:00