21edf67f89
Codechange: Untangle game and scenario toolbars.
5 years ago
08f00151f1
Codechange: MakeBridgeRamp()'s road-or-rail-type parameter does not make sense.
...
Road type and rail type are stored in separate locations, so this parameter does
not make make sense as it is only used for rail bridges. Instead explicitly set the
rail type in MakeRailBridgeRamp().
5 years ago
bcdb28249c
Codechange: Use RAILTYPES_NONE instead of INVALID_RAILTYPES when not using rail.
...
INVALID_RAILTYPES, if it was accidentally tested, would match any railtype.
5 years ago
8b1ee39ace
Setting: Add support for enum type settings
5 years ago
04c74355ba
Fix: IniLoadFile::LoadFromDisk expects filename but BaseMedia::AddFile provided full path ( #7348 )
5 years ago
76788a1eb3
Fix 2bb80d2: really increase the maximum number of GameScript texts to 64k ( #7555 )
5 years ago
cef9a76c3f
Fix #7553 : check bounds when loading strings ( #7554 )
5 years ago
28b23a6643
Fix: Crash on waypoint selection window
5 years ago
14dc8dd619
Fix 81d335b: Don't check state of widget not present in scenario editor. ( #7551 )
5 years ago
8cc6ee60ed
Add: Icons on air/water/landscape construction menus ( #7485 )
5 years ago
63a7df027d
Fix 5db883f: Railtype bits were moved too late, leading to rails under bridges losing their type
5 years ago
d9f9a64389
Fix #6507 : Don't try to load invalid depots from older savegames
5 years ago
3299d6540b
Cleanup: Delete GetSavegameType function since it's been commented out since 2005
5 years ago
9da1c5bb0b
Fix: Crash when attempting to load old save game with GRFs set
...
GroupStatistics pool was not initialised before trying to delete vehicles (specifically, trams with no tram track)
5 years ago
47d0d86a3c
Fix #7255 : Prevent crashlog corruption by only printing the 32 most recent news messages
5 years ago
9e19a5f93e
Remove: (Simple)TinyEnumT
5 years ago
bd87f11355
Codechange: Remove DistributionTypeByte
5 years ago
a5681d3eba
Codechange: Remove GoalTypeByte
5 years ago
327ff89808
Codechange: Remove PauseModeByte
5 years ago
e18c8c30be
Codechange: Remove RoadTypesByte
5 years ago
644f4c3547
Codechange: Set size of SettingGuiFlag & SettingDescType enums, and use them properly
5 years ago
0a53ee8cfe
Codechange: Remove PartOfSubsidyByte
5 years ago
5d66d8fd7d
Codechange: Remove ExpensesTypeByte
5 years ago
2e1936da64
Codechange: Remove SourceTypeByte type
5 years ago
5b34c8019f
Codechange: Remove Company/OwnerByte types
5 years ago
fcf06ba4c4
Codechange: Remove StationClassIDByte, and drop STAT_CLASS_MAX by one
5 years ago
60e31c7cfa
Codechange: Remove OrderTypeByte
5 years ago
96097b34a5
Codechange: Remove Direction*Byte types
5 years ago
9f3928658b
Codechange: Remove Track{dir,}{Bits,}Byte types
5 years ago
931d32f414
Codechange: Remove RailTypeByte type
5 years ago
10ba431d21
Codechange: Remove SpriteTypeByte type
5 years ago
119ea7a195
Codechange: Remove StationHadVehicleOfTypeByte type
5 years ago
fb6ae81415
Codechange: Remove StationFacilityByte type
5 years ago
09567bf0b3
Codechange: Remove StoryPageElementTypeByte type
5 years ago
f20b75d712
Codechange: Remove TownLayoutByte type
5 years ago
0e439aeab7
Codechange: Remove TownFoundingByte type
5 years ago
0a57db01af
Codechange: Remove TrainForceProceedingByte type
5 years ago
69a6c494bf
Codechange: Set VehicleType's base type to byte instead of using VehicleTypeByte
5 years ago
96a4787710
Codechange: Set ZoomLevel's base type to byte instead of using ZoomLevelByte
5 years ago
aa220b2375
Update: Translations from eints
...
indonesian: 2 changes by fanioz
dutch: 3 changes by JanWillem
korean: 3 changes by telk5093
5 years ago
f54f549632
Add SlXvCheckSpecialSavegameVersions constants to SaveLoadVersion enum
5 years ago
f8e34838c6
Avoid -Wdynamic-class-memaccess warning on clang in CheckCaches()
5 years ago
f331ae8f81
Progsig: Fix error return path in CmdModifySignalInstruction
5 years ago
06463b8be0
Merge branch 'tracerestrict-sx' into jgrpp
5 years ago
d47c083e00
Comment out some unused constants
5 years ago
24458e9990
Add various missing override specifiers
5 years ago
6b107d65d9
Merge branch 'tracerestrict' into tracerestrict-sx
5 years ago
0d2277211c
Fix enum type mismatch in TestOrderCondition
5 years ago
6d3e9093c4
TBTR: Show warning on templates which include unavailable vehicles
5 years ago
9d861fb8a0
TBTR: Allow cloning virtual/template trains with unavailable engines
5 years ago
0ab6244f6b
Fix #7165 : Missed another 'Append() --> push_back()' replacement ( #7548 )
5 years ago
ead5b55119
Update: Translations from eints
...
spanish (mexican): 3 changes by Absay
russian: 3 changes by Lone_Wolf
5 years ago
2ff8a71e59
Fix handling of road-stop states in a6ea1ea40
5 years ago
b454ca7110
Fix 81d335b: Coverage button missing from town window in scenario editor.
5 years ago
a6ea1ea408
Allow articulated road vehicles to overtake other vehicles
...
Add setting
5 years ago
c84a8c14b4
Add ground vehicle cache info to vehicle debug window
5 years ago
f354b869c1
Update: Translations from eints
...
indonesian: 3 changes by fanioz
croatian: 3 changes by VoyagerOne
5 years ago
5b0ce8c214
Update: Translations from eints
...
finnish: 3 changes by hpiirai
italian: 3 changes by lorenzodv
5 years ago
d5841109f0
Fix dcb2571: Missing override keywords
5 years ago
81d335b081
Feature: Add station coverage area display for towns.
5 years ago
81f0f97406
Feature: Add existing station coverage area display when placing new station parts.
5 years ago
b6733edd17
Feature: Add coverage area display for existing stations.
5 years ago
37daf43037
Change: Zoom title game by UI zoom level
5 years ago
58609e8fa6
Fix: Manager name in company news was being clipped
5 years ago
2c67af391b
Fix: Scale news ticker scroll speed by UI scale
5 years ago
62dec9f174
Fix: Scale all min size and padding by UI scale
5 years ago
fedfedc492
Silence false-positive misalignment UBSan warning in YAPF road, ship
5 years ago
dd35a43703
Codechange: Revert unnecessary indentation change
5 years ago
a64bd6e22c
Fix: Also breaking for warning text in set company password
5 years ago
08284e005d
Fix: Automatic line breaking of the warning
5 years ago
dcb2571888
Add: Warn players that company passwords are not truly secure
5 years ago
92d97d9879
Allow removing signals from plain rail track when a train is present
5 years ago
85c8f4baca
Merge branch 'crashlog_improvements' into jgrpp
...
# Conflicts:
# src/os/macosx/crashlog_osx.cpp
5 years ago
cc970aac70
Add sigaltstack support to MacOS crashlog
5 years ago
145fee04fa
Add sigaltstack support to Unix crashlog
5 years ago
61a4ecf078
Add sigaction and ucontext support to Mac crashlog
5 years ago
bd2fdde759
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/core/sort_func.hpp
# src/rail_cmd.cpp
# src/timetable_cmd.cpp
# src/video/sdl_v.cpp
# src/video/win32_v.cpp
5 years ago
66cd32a252
Codechange: Use std::underlying_type for DECLARE_POSTFIX_INCREMENT.
5 years ago
ac1e1a272f
Fix: Replace int with std::underlying_type in DECLARE_ENUM_AS_BIT_SET.
...
This fixes 64 bit uses of this macro.
5 years ago
c17736b493
Fix e8d397e: Invisible station/waypoint signs could still be clicked on. ( #7531 )
5 years ago
be073b46da
Fix: Bounds check access to railtype_map. ( #7529 )
5 years ago
d2b6176cdf
Add: NewGRF string codes to access PUSH/POP_COLOUR. ( #7527 )
5 years ago
66a8db9dc5
Fix #7526 , 5b77102b6: FiosItem::operator< must return false for equality ( #7528 )
5 years ago
da2528cbe2
Add defensive checks to MacOSStringCompare
5 years ago
ede88aa6cd
Fix multi-packet network content requests (ContentVector)
...
Broken by incorrect merge conflict resolution in ba34ec7ad#86
5 years ago
ebd4f32d15
Cleanup: remove core/sort_func.hpp as it's not used anymore
5 years ago
48f99fd980
Codechange: use std::array for _sorted_industry_types
5 years ago
60da17418a
Codechange: use std::sort in SaveHighScoreValueNetwork()
5 years ago
9388fa2aa1
Codechange: use std::vector to sort _all_grfs linked list
5 years ago
8899272614
Codechange: use std::vector for _language_dropdown
5 years ago
9195f2337a
Codechange: use std::vector for _resolutions
5 years ago
25e534f3cf
Codechange: use std::vector for _sorted_railtypes
5 years ago
0797de06be
Codechange: use std::vector for _sorted_cargo_specs
5 years ago
8715574c4a
Merge branch 'crashlog_improvements' into jgrpp
5 years ago
73c8715eb6
Add LLDB self debug to OSX
5 years ago
55fbf37373
Add missing includes to newgrf_text.cpp
5 years ago
1c0643e419
Add GRF ID/name to "Too many NewGRF string parameters" messages
5 years ago
0c3fbecb96
Delete GSortT implementation
...
Unused
5 years ago
f0b3267615
Update: Translations from eints
...
indonesian: 9 changes by fanioz
5 years ago
2a41d783cd
Adjust vehicle position filter in ViewportMapDrawVehicles
5 years ago
671a310d21
Fix #7235 : Ensure catchment area of neutral station covers entire industry. ( #7518 )
5 years ago
8ae15d9797
Update: Translations from eints
...
indonesian: 6 changes by fanioz
5 years ago
0d93ecb6bf
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/core/alloc_type.hpp
# src/group_gui.cpp
# src/newgrf.cpp
# src/saveload/economy_sl.cpp
# src/saveload/map_sl.cpp
# src/station_cmd.cpp
5 years ago
38729297f9
Codechange: No need for AutoFreePtr if there's std::unique_ptr.
5 years ago
4e85ccf3c0
Codechange: Replace SmallStackSafeStackAlloc with std::array.
...
The only port that ever used it to make heap allocations instead of stack ones was the NDS port, which got thrown out some time ago.
5 years ago
79343762a4
Fix: Typos. ( #7517 )
5 years ago
793d01ec74
Open train vehicle details window on total cargo tab if ctrl presed
5 years ago
3964604148
Update: Translations from eints
...
luxembourgish: 1 change by Phreeze
5 years ago
b81967f42a
Change default non-global polyrail hotkeys to Y, CTRL-Y
...
This is to avoid a clash with the transparency hotkeys
5 years ago
4f052fc2a4
Cleanup: Fix alignment after NULL -> nullptr change.
5 years ago
410b81537c
Fix 801cbea9c: operator< is not always the best idea
...
Also removes unused and anyway broken SmallMap::SortByKey() function.
5 years ago
3bbd7ea2c1
Fix: Industry coverage area is no longer rectangular. ( #7464 )
...
AIs test station catchment in reverse to how players see station catchment.
This did not take account of non-rectangular station catchment areas, so AIs
could end up placing stations in locations that did not accept/deliver cargo.
5 years ago
abe8cf4985
Codechange: Replace duplicated code with TileArea::Expand() ( #7467 )
5 years ago
801cbea9cc
Codechange: use std::sort() for all std::vector types
5 years ago
5b77102b63
Codechange: use std::sort() to sort file lists
5 years ago
b52561fd38
Codechange: use std::sort() in EngList_Sort[Partial]()
5 years ago
2db88953e7
Codechange: use std::sort() in GUIList
5 years ago
b9b34f676b
Change: Always report error when ordering a road vehicle to wrong type of road stop. ( #7316 )
...
This was inconsistent before, depending on road/tram and articulated/single vehicle status.
5 years ago
601f3aaef4
Fix race condition causing crashes/undefined behaviour on thread init on windows/MinGW
5 years ago
5bd2b15e86
Codechange: Replace NULL with nullptr in squirrel interface.
5 years ago
1c7b454a57
Merge branch 'pr-7490' into jgrpp
...
# Conflicts:
# src/dock_gui.cpp
# src/water_cmd.cpp
5 years ago
c365c904a2
Merge branch 'master' into jgrpp
5 years ago
674732cd68
Merge: Codechange: Use null pointer literal instead of the NULL macro
5 years ago
f5747bf753
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/genworld_gui.cpp
# src/group_gui.cpp
# src/saveload/saveload.cpp
# src/settings_gui.cpp
# src/toolbar_gui.cpp
# src/vehicle_gui.cpp
# src/vehicle_gui_base.h
# src/widgets/dropdown.cpp
# src/widgets/dropdown_type.h
5 years ago
c0836bccef
Codechange: NULL -> nullptr in settings files.
5 years ago
0130f3be45
Fix #7491 : Send company update admin message when bankruptcy counter changes.
5 years ago
4ad981a98e
Fix 50e08f333a: Creating a cargo subsidy with town as source did not consider min population. ( #7493 )
5 years ago
8c3d1b1c45
Convert secondary rail types in AfterLoadLabelMaps
...
Handle missing rail types
5 years ago
7c8e7c6b6e
Codechange: Use null pointer literal instead of the NULL macro
5 years ago
3b4f224c0b
Fix #7494 : std::sort() and qsort() use different comparators ( #7495 )
5 years ago
87d588f22f
Update: Translations from eints
...
luxembourgish: 17 changes by Phreeze
spanish (mexican): 2 changes by njn
5 years ago
f887b12be2
Add 3rd party mingw-std-threads headers to fix MinGW compilation
5 years ago
01f957c51f
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
5 years ago
8b1880187a
Remove: AutoFreeSmallVector.
...
The last use was for storing a list of memory blocks. As the way these lists are accessed is very
specific, it is easier to just write an explicit destructor instead of trying to exactly match the behaviour.
5 years ago
e804173595
Codechange: If something is a vector of strings, use a vector of strings instead of an AutoFreeSmallVector.
5 years ago
c7b9987d08
Codechange: Switch DropDownList to directly use std::vector, thus making AutoDeleteSmallVector obsolete.
...
DropDownListItem are strongly managed using std::unique_ptr to ensure leak-free handling. Appropriate use
of move-semantics make intent a lot clearer than parameter comments and allows the compiler to generate
copy-free code for most situations.
5 years ago
d3e113eb5f
Codechange: Use std::vector instead of AutoDeleteSmallVector in GS text handling.
5 years ago
baf9229931
Codechange: Replace AutoDeleteSmallVector with direct std::vector use in text layout code.
5 years ago
329bb52613
Codechange: Store text layout runs directly as values in a std::vector instead of heap allocated.
...
This reduces memory allocations and heap fragmentation.
5 years ago
9325d63d8e
Fix: Forgotten override keywords for DropDownListIconItem.
5 years ago
fbc4cef180
Codechange: Use override specifier for text layout classes.
5 years ago
d95c7083ea
Fix: Don't crash if reading a GS string file from disk produces an error.
...
The raw_strings vector may not include NULLs as no consumer can deal with it.
5 years ago
58c27ab59e
Merge branch 'crashlog_improvements' into jgrpp
5 years ago
69d2d3e278
Crashlog: Limit total number of news items
5 years ago
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
5 years ago
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
5 years ago
7f80884047
Merge branch 'cpp-11' into save_ext
...
# Conflicts:
# src/saveload/saveload.cpp
# src/settings.cpp
# src/settings_gui.cpp
5 years ago
01261daec0
Merge branch 'master' into cpp-11
...
# Conflicts:
# config.lib
5 years ago
0a883afe19
Update: Translations from eints
...
luxembourgish: 20 changes by Phreeze
5 years ago
070160af40
Save point used when adding station to viewport kd tree, use for removal
5 years ago
3807f0551d
Limit maximum recursion depth in StationViewWindow::EstimateDestinations
5 years ago
72b72dbec3
Add: Press ctrl to build diagonal rivers in scenario editor.
5 years ago
812886ca61
Fix #7478 : Don't remove NewGRF objects on company take-over. ( #7483 )
5 years ago
bc9b47d2e5
Fix #6222 : Advanced sprite layout sometimes showed incorrect railtype ground tile
5 years ago
99055c22cb
Fix string format issue in Japanese translation
5 years ago
99f3ebe1fd
Merge branch 'pr-78' into jgrpp
5 years ago
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
5 years ago
3e608afa6c
Fix: [Windows] OpenTTD window may be inactive when an error happens ( #7482 )
5 years ago
967b27a2c1
Codechange: C++11 STL has a function for getting the number of CPU cores.
5 years ago
ae748166d0
Codechange: Use platform independent C++11 function for sleeping on a thread.
5 years ago
94c5269fa7
Codechange: Use atomic variables for thread synchronization where useful.
5 years ago
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.
5 years ago
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.
5 years ago
a1e492d0d8
Fix #7439 : don't overwrite CompanyRemoveReason with ClientID ( #7465 )
5 years ago
fb6e31ca43
Cleanup 3f32711: Don't apply forbid 90 deg turn settings for ships.
5 years ago
4bf4862674
Add AI/game script DoCommand calls to command log
5 years ago
c3e90b61b7
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/vehicle_cmd.cpp
5 years ago
8114bad033
Fix #7469 : Desync when using build and refit feature.
5 years ago
44c8696b2a
Fix Win32 compilation with WITH_DBGHELP on non-MSVC
5 years ago
a404db80f6
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/town_cmd.cpp
5 years ago
7b36bba766
Fix max value for zoning overlay settings
5 years ago
cd2b2f4c04
Add details to SettingEntry::Init assertion failure message
5 years ago
24fc25164a
Update: Translations from eints
...
french: 3 changes by glx
croatian: 17 changes by VoyagerOne
5 years ago
5242ec4642
Fix handling of GRF programmable signal graphics with trace restrict
5 years ago
cebdd72146
Fix #7440 : Remove town sign when deleting town, not add it once more
5 years ago
53ff27370d
Do not update viewport sign kd tree in network dedicated mode, or during savegame conversion
5 years ago
92d5835495
Update: Translations from eints
...
dutch: 2 changes by JanWillem
french: 19 changes by glx
5 years ago
c7d96d037b
Fix RebuildViewportKdtree being called too early in AfterLoadGame
5 years ago
8ad3e50b80
Fix handling of viewport kd-tree in CmdDeleteTown
5 years ago
a4a3a6a630
Merge branch 'master' into jgrpp
5 years ago
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
5 years ago
f0336f1f17
Codechange: Remove ship max order distance from script API.
5 years ago
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.
5 years ago
66bed86bbb
Fix #7062 , Revert 7af53d7588: Don't test ship max order distance when pathfinding.
5 years ago
d0e8060182
Fix 6fc60d8c4f: forgot to update API changelog
5 years ago
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.
5 years ago
e1069eee05
Codechange: Check airport layout would fit within map bounds before iterating tiles. ( #7429 )
5 years ago
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.
5 years ago
423aea5c32
Change: adjust Violet smallmap colour 1 shade darker, to compensate for legibility against darker blue of sea introduced by #7436
5 years ago
e93630541d
Fix #7433 : don't use AirportSpec substitute if it's not set ( #7435 )
5 years ago
df673e9b2c
Fix: Fluidsynth should not try to lock sample data in memory
5 years ago
66c60e52ba
Change: [SDL] Do not offer video smaller than 640x480
5 years ago
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
5 years ago
0cf25e84df
Fix #7447 , 3357cac847: Action 4 has feature 48 'original strings'. ( #7449 )
5 years ago
3118f1430f
Update: Translations from eints
...
italian: 25 changes by lorenzodv
portuguese: 3 changes by JayCity
5 years ago
ed51fba7ed
Change: Dark Blue company and water were indistinguishable in small map. ( #7436 )
5 years ago
1d14e31be3
Update: Translations from eints
...
korean: 14 changes by telk5093
5 years ago
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.
5 years ago
9244dad3f1
Fix #7434 : Incorrect use of vector iterator. ( #7437 )
5 years ago
acb09eb9a8
Fix: [Win64] settingsgen MSVC compile warnings ( #7432 )
5 years ago
Peter Nelson
Jonathan G Rennison
Berbe
glx22
kiwitree
pnda
Charles Pigott
translators
Niels Martin Hansen
PeterN
glx
Michael Lutz
stormcone
SamuXarick
Henry Wilson
Samu
Andy
frosch