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
fb5cae3120
Version: Committing version data for tag: jgrpp-0.30.3
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
ab157ea07f
Version: Committing version data for tag: jgrpp-0.30.2
5 years ago
5c1168603d
Exclude MinGW headers from source/project files on non-MinGW platforms
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
33a0253137
Update project files
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
Jonathan G Rennison
Michael Lutz
stormcone
translators
peter1138
glx
PeterN
SamuXarick
Henry Wilson
glx22