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
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
Jonathan G Rennison
ba34ec7ade
Merge branch 'master' into jgrpp
...
Replace build and refit, and group collapse implementations
Fix template creation build and refit
# Conflicts:
# Makefile.bundle.in
# config.lib
# src/animated_tile.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_base.hpp
# src/blitter/8bpp_base.hpp
# src/blitter/null.hpp
# src/build_vehicle_gui.cpp
# src/command.cpp
# src/command_func.h
# src/console_gui.cpp
# src/core/smallstack_type.hpp
# src/date.cpp
# src/debug.cpp
# src/genworld_gui.cpp
# src/ground_vehicle.hpp
# src/group_gui.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.h
# src/main_gui.cpp
# src/misc_gui.cpp
# src/network/core/game.h
# src/network/core/packet.cpp
# src/network/core/udp.cpp
# src/network/core/udp.h
# src/network/network_content.cpp
# src/network/network_type.h
# src/network/network_udp.cpp
# src/newgrf_house.h
# src/openttd.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/os/unix/crashlog_unix.cpp
# src/os/windows/crashlog_win.cpp
# src/osk_gui.cpp
# src/pathfinder/opf/opf_ship.cpp
# src/rail_cmd.cpp
# src/rail_gui.cpp
# src/saveload/saveload.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/smallmap_gui.h
# src/station_base.h
# src/station_cmd.cpp
# src/table/gameopt_settings.ini
# src/table/newgrf_debug_data.h
# src/table/settings.ini
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/train_gui.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/vehiclelist.cpp
# src/viewport.cpp
# src/widgets/dropdown.cpp
# src/window_gui.h
2019-03-27 18:12:04 +00: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
Charles Pigott
ed9005690a
Fix #7421 : Don't (directly) dereference std::vector::end() in SmallMap
2019-03-27 06:31:49 +00:00
Jonathan G Rennison
99b79c26c6
Remove disaster vehicles from tick cache immediately on deletion
2019-03-27 00:36:06 +00:00
stormcone
b913c92aa7
Fix #7165 : Missed 'Append() --> push_back()' replacement
2019-03-26 22:20:56 +00:00
Jonathan G Rennison
7395705775
Remove assertion in TownGenerateCargo
...
It is not correct with the new town cargo generation algorithm
2019-03-26 22:15:56 +00:00
glx22
427d9d483f
Fix #6564 : enforce types of arguments for station name strings ( #7419 )
2019-03-26 22:50:56 +01:00
Charles Pigott
a065d4623e
Codechange: Move 2 constants into the ifdef where they're used
2019-03-26 20:54:40 +00:00
Charles Pigott
7c81f8e076
Codechange: Simplify refit cargo filter condition and stop mixing enum types
2019-03-26 20:54:40 +00:00
Charles Pigott
e453572b6a
Codechange: Initialise a few variables that -flto seems to think could possibly be uninitialised
2019-03-26 20:54:40 +00:00
Henry Wilson
03ca3190c9
Codechange: Use range-based for-loop in Auto[Free|Delete]SmallVector
2019-03-26 20:15:57 +00:00
Henry Wilson
cc62f4163f
Cleanup: Remove unused size template parameters from SmallMap and Auto[Free|Delete]SmallVector
2019-03-26 20:15:57 +00:00
