dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,996 Commits 1 Branch 0 Tags
a7de6ec35be30a018077b66d36a09379424d8159
Commit Graph

35445 Commits

Author SHA1 Message Date
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
361758b516 Merge branches 'crashlog_improvements', 'save_ext' into jgrpp 
# Conflicts:
#	Makefile.src.in
#	projects/openttd_vs140.vcxproj
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs141.vcxproj
#	projects/openttd_vs141.vcxproj.filters
#	projects/openttd_vs142.vcxproj
#	projects/openttd_vs142.vcxproj.filters
#	src/core/smallstack_type.hpp
#	src/linkgraph/linkgraphjob.cpp
#	src/linkgraph/linkgraphjob.h
#	src/misc.cpp
#	src/network/network_udp.cpp
#	src/openttd.cpp
#	src/saveload/saveload.cpp
 2019-04-09 19:06:26 +01:00
Jonathan G Rennison
7f80884047 Merge branch 'cpp-11' into save_ext 
# Conflicts:
#	src/saveload/saveload.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
 2019-04-09 18:54:02 +01:00
Jonathan G Rennison
01261daec0 Merge branch 'master' into cpp-11 
# Conflicts:
#	config.lib
 2019-04-09 18:47:28 +01:00
translators
0a883afe19 Update: Translations from eints 
luxembourgish: 20 changes by Phreeze
 2019-04-09 19:45:42 +02:00
Jonathan G Rennison
070160af40 Save point used when adding station to viewport kd tree, use for removal 2019-04-09 02:32:28 +01:00
Jonathan G Rennison
3807f0551d Limit maximum recursion depth in StationViewWindow::EstimateDestinations 2019-04-09 01:49:18 +01:00
peter1138
72b72dbec3 Add: Press ctrl to build diagonal rivers in scenario editor. 2019-04-08 22:32:33 +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
Jonathan G Rennison
99055c22cb Fix string format issue in Japanese translation 2019-04-08 17:38:10 +01:00
Jonathan G Rennison
99f3ebe1fd Merge branch 'pr-78' into jgrpp 2019-04-08 17:28:33 +01:00
Jonathan G Rennison
74e5e04724 Fix: Crash due to use of invalid iterator in ClientNetworkContentSocketHandler 
In particular this crash can be observed when using the
bootstrap GUI to download the base graphics.

In ClientNetworkContentSocketHandler::OnReceiveContentInfo
ClientNetworkContentSocketHandler::callbacks is iterated, using an iterator
cb->OnReceiveContentInfo() is called (cb is of type BootstrapAskForDownloadWindow)
This calls new BootstrapContentDownloadStatusWindow()
This inherits from BaseNetworkContentDownloadStatusWindow
The constructor of which calls _network_content_client.AddCallback(this)
This reallocates the std::vector which is being iterated in ClientNetworkContentSocketHandler::OnReceiveContentInfo
This results in iter being invalid, and an assertion failure occurs shortly
afterwards due to its use in the next iteration of cb->OnReceiveContentInfo()

Adjust all locations where ClientNetworkContentSocketHandler::callbacks
is iterated to avoid problematic behaviour
 2019-04-08 12:03:28 +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
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
Jonathan G Rennison
4bf4862674 Add AI/game script DoCommand calls to command log 2019-04-04 23:43:54 +01:00
Jonathan G Rennison
c3e90b61b7 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/vehicle_cmd.cpp
 2019-04-04 23:39:29 +01:00
peter1138
8114bad033 Fix #7469: Desync when using build and refit feature. 2019-04-04 23:29:43 +01:00
Jonathan G Rennison
44c8696b2a Fix Win32 compilation with WITH_DBGHELP on non-MSVC 2019-04-03 23:54:55 +01:00
Jonathan G Rennison
a404db80f6 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/town_cmd.cpp
 2019-04-03 23:37:41 +01:00
Jonathan G Rennison
7b36bba766 Fix max value for zoning overlay settings 2019-04-03 23:19:12 +01:00
Jonathan G Rennison
cd2b2f4c04 Add details to SettingEntry::Init assertion failure message 2019-04-02 20:46:20 +01: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
Jonathan G Rennison
5242ec4642 Fix handling of GRF programmable signal graphics with trace restrict 2019-04-02 18:19:28 +01: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
Jonathan G Rennison
53ff27370d Do not update viewport sign kd tree in network dedicated mode, or during savegame conversion 2019-04-02 03:48:19 +01: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
Jonathan G Rennison
c7d96d037b Fix RebuildViewportKdtree being called too early in AfterLoadGame 2019-04-01 18:17:48 +01:00
Jonathan G Rennison
8ad3e50b80 Fix handling of viewport kd-tree in CmdDeleteTown 2019-04-01 18:05:24 +01:00
Jonathan G Rennison
a4a3a6a630 Merge branch 'master' into jgrpp 2019-04-01 03:06:18 +01: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
Jonathan G Rennison
58433c7667 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/core/smallmap_type.hpp
#	src/lang/korean.txt
#	src/network/network_content.cpp
#	src/smallmap_gui.cpp
#	src/station_cmd.cpp
 2019-03-30 20:45:58 +00:00
frosch
0cf25e84df Fix #7447, 3357cac847: Action 4 has feature 48 'original strings'. (#7449) 2019-03-30 19:56:43 +00:00