47821 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Jonathan G Rennison	99055c22cb	Fix string format issue in Japanese translation	2019-04-08 17:38:10 +01:00
Jonathan G Rennison	c0b402a74c	Merge branch 'pr-82' into jgrpp	2019-04-08 17:30:02 +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
nikolas	eab8ab40d9	Fix typo in readme: sufficienty -> sufficiently	2019-04-07 23:31:17 -04:00
Jonathan G Rennison	a6887d7010	Version: Committing version data for tag: jgrpp-0.30.1	2019-04-05 01:37:21 +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
Patric Stout	c99f731f89	Update: documentation updates from 1.9 branch	2019-04-05 00:19:41 +02:00
Jonathan G Rennison	a0c8bd2164	Version: Committing version data for tag: jgrpp-0.30.0	2019-04-03 23:57:29 +01:00
Jonathan G Rennison	5de3d907a0	version_utils.sh: Allow .ottdrev-vc to be dirty at release time	2019-04-03 23:57:24 +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	43053022aa	Readme: Add link to online copy of NewGRF spec additions	2019-04-01 03:16:04 +01:00
Jonathan G Rennison	f3fb05fad4	Documentation: Fix typo in newgrf-additions	2019-04-01 03:16:04 +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
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