ba8ed880c1
Merge branch 'master' into jgrpp-nrt
...
Merge NRT feature
# Conflicts:
# docs/landscape.html
# docs/landscape_grid.html
# src/bridge_map.h
# src/build_vehicle_gui.cpp
# src/company_base.h
# src/company_cmd.cpp
# src/misc_gui.cpp
# src/newgrf.cpp
# src/newgrf_engine.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/npf/npf.cpp
# src/road_cmd.cpp
# src/road_func.h
# src/road_gui.cpp
# src/road_map.h
# src/road_type.h
# src/roadveh_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/company_sl.cpp
# src/script/api/script_bridge.cpp
# src/table/newgrf_debug_data.h
# src/tile_cmd.h
# src/town_cmd.cpp
# src/tunnel_map.h
# src/tunnelbridge_cmd.cpp
5 years ago
eab5db9769
Fix corruption of conditional order targets when loading SpringPP savegames
5 years ago
4cf60613df
Delete windows before switching to GM_MENU mode in LoadIntroGame
...
See: https://github.com/OpenTTD/OpenTTD/issues/7635
5 years ago
97221a67f2
Merge branch 'template_train_replacement' into jgrpp
...
# Conflicts:
# src/saveload/vehicle_sl.cpp
5 years ago
bba36aef1b
TBTR: Check for mixed virtual/non-virtual consists on load
5 years ago
0f6c5ee622
Fix saveload exception handling when gamelog action in progress
5 years ago
a240a938a3
Fix: ignore C++ standard library headers in depend ( #7578 )
...
(cherry picked from commit 47fdbdd324
5 years ago
6e28727fa4
Fix: Clicking on scrollbar 'thumb' moved position up instantly.
...
(cherry picked from commit 82989ef076
5 years ago
49f3592ac9
Fix: vcpkg used to patch lzma.h to define LZMA_API_STATIC for static builds ( #7614 )
...
(cherry picked from commit 846fc8fe09
5 years ago
eb6cd6cf5f
Change ZOOM_LVL_BASE type back to signed
...
Fixes viewport map mode
5 years ago
36eb4165b8
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/bridge_map.h
# src/crashlog.cpp
# src/industry.h
# src/linkgraph/linkgraph_type.h
# src/order_type.h
# src/saveload/afterload.cpp
# src/settings.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/spritecache.cpp
# src/stdafx.h
# src/table/settings.h.preamble
# src/train.h
# src/vehicle.cpp
# src/viewport.cpp
# src/viewport_func.h
# src/widgets/station_widget.h
# src/zoom_func.h
# src/zoom_type.h
5 years ago
1e723934a1
Fix 27384486e4: Error in GM Reset sysex data
5 years ago
a35b43ce93
Fix #6666 : Mismatched parentheses in RTL languages
5 years ago
6f28a0c051
Fix #5685 : Check for free wagons in ScriptVehicleList
5 years ago
81614f2378
Fix #7633 : Allow zero-cost track conversion to succeed
5 years ago
9f81778836
Change: Limit in-editor warnings in VS 2019
...
The AllRules ruleset causes the VS 2019 editor to litter warning squiggles all over the place, about things that would never be fixed. Limit it to the smallest ruleset available. Warnings shown now mainly concern potential arithmetic overflows.
5 years ago
ac84f34062
Fix viewport kdtree not being updated for waypoints when sign moved
5 years ago
603f625fda
Fix f53817987: unsafe mix of type 'TileIndex' and type 'bool'
5 years ago
a0c78c73e3
Fix: Correctly reset playback between songs in win32_m driver
5 years ago
27b7c5a5fd
Fix: Correctly reset playback between songs in DMusic driver
5 years ago
a4cf1c8aec
Fix: Don't keep mutex locked while parsing MIDI data
5 years ago
9839ce006c
Fix: Time values should be DWORD everywhere in win32_m
5 years ago
f8633fc63b
Codechange: Fix comment indentation
5 years ago
27384486e4
Codechange: Use common source for well-known SysEx messages in Windows music drivers
5 years ago
9d8a83bf8d
Codechange: Add some const in preparation
5 years ago
c74df8581d
Codechange: Use std::mutex instead of CRITICAL_SECTION in win32_m
5 years ago
94f705e45e
Add missing include to tilearea_type.h
5 years ago
a1cf3358fe
Add missing include to crashlog.h
5 years ago
f78b72989b
Merge branch 'template_train_replacement' into jgrpp
...
# Conflicts:
# src/saveload/vehicle_sl.cpp
# src/train.h
5 years ago
f1946af707
TBTR: Delete leftover virtual trains on non-network client load
5 years ago
858e90acb9
TBTR: Avoid leaking virtual trains from template editing window
...
When pressing OK to convert to template
When (unsuccessfully) selling the head unit
(cherry picked from commit 85e9a0195d
5 years ago
2b40007ca1
TBTR: Do not allocate virtual trains a unit number in NormaliseTrainHead
...
(cherry picked from commit 8fefef9d19
5 years ago
ccfd187677
TBTR: Avoid built virtual wagons which can't be attached being orphaned
...
(cherry picked from commit f3daada67f
5 years ago
aa10556522
TBTR: Avoid articulated/rear units being added to tile hash
...
(cherry picked from commit 5a2e498182
5 years ago
2ccb6e1743
TBTR: Fix front engine not being cleared when being replaced. and kept in depot
...
(cherry picked from commit ee06258629
5 years ago
2557cec6f3
TBTR: Skip virtual vehicles in company rating/value and group stats
...
(cherry picked from commit 34d7f12a70
5 years ago
835562d81d
TBTR: Remove unused function: TemplateReplacement::GetTemplateVehicle
...
(cherry picked from commit 8afb21cf9c
5 years ago
2e929a88a9
TBTR: Fix incorrect deletion of template vehicles when deleting company
...
(cherry picked from commit fff3018b42
5 years ago
e0578a6e0c
TBTR: Show warning on templates which include unavailable vehicles
...
(cherry picked from commit 6d3e9093c4
5 years ago
324ce7ae96
TBTR: Allow cloning virtual/template trains with unavailable engines
...
(cherry picked from commit 9d861fb8a0
5 years ago
21faae910b
TBTR: Remove duplicated function: SetupTemplateVehicleFromVirtual
...
(cherry picked from commit c6fa43d767
5 years ago
91c5dee66c
Re-add removed group collapse/expand all buttons
5 years ago
85e9a0195d
TBTR: Avoid leaking virtual trains from template editing window
...
When pressing OK to convert to template
When (unsuccessfully) selling the head unit
5 years ago
8fefef9d19
TBTR: Do not allocate virtual trains a unit number in NormaliseTrainHead
5 years ago
2e23c5ec15
Update: Translations from eints
...
korean: 1 change by telk5093
5 years ago
0db31ae27f
Change: Avoid caching end of ship path, to allow penalties to apply.
5 years ago
31db4f8d5e
Add: Penalty for occupied docking points.
5 years ago
ec2656ab7e
Codechange: Restrict docking points of docks.
5 years ago
f538179878
Feature: Multi-tile docks and docking points.
5 years ago
1df56993ea
Fix order backups being applied when using buy and refit
5 years ago
Jonathan G Rennison
glx22
peter1138
Niels Martin Hansen
pnda
unknown
glx
translators