Commit Graph

48207 Commits (a200fcf4e9a5fcf75e085a1f773b9b1f91d1b655)
 

Author SHA1 Message Date
Jonathan G Rennison a200fcf4e9 Ensure bridge road types match when joining two previous separate ends 5 years ago
Jonathan G Rennison 7555cf2965 Fix road vehicles being unable to enter bridge at custom bridge head
Type mismatch
5 years ago
Jonathan G Rennison 2164eb4b12 Fix building of road stops on town-owned one-way roads
See: https://github.com/OpenTTD/OpenTTD/issues/7626
5 years ago
Jonathan G Rennison dbc5f1baed Merge branch 'master' into jgrpp-nrt
# Conflicts:
#	src/fontcache.cpp
#	src/game/game_text.cpp
#	src/lang/korean.txt
#	src/os/macosx/crashlog_osx.cpp
#	src/os/windows/crashlog_win.cpp
#	src/station_cmd.cpp
#	src/viewport.cpp
5 years ago
Jonathan G Rennison 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
glx22 a240a938a3 Fix: ignore C++ standard library headers in depend (#7578)
(cherry picked from commit 47fdbdd324)
5 years ago
peter1138 6e28727fa4 Fix: Clicking on scrollbar 'thumb' moved position up instantly.
(cherry picked from commit 82989ef076)
5 years ago
glx22 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
Jonathan G Rennison eb6cd6cf5f Change ZOOM_LVL_BASE type back to signed
Fixes viewport map mode
5 years ago
Jonathan G Rennison 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
Jonathan G Rennison ac84f34062 Fix viewport kdtree not being updated for waypoints when sign moved 5 years ago
Jonathan G Rennison 94f705e45e Add missing include to tilearea_type.h 5 years ago
Jonathan G Rennison a1cf3358fe Add missing include to crashlog.h 5 years ago
Jonathan G Rennison f78b72989b Merge branch 'template_train_replacement' into jgrpp
# Conflicts:
#	src/saveload/vehicle_sl.cpp
#	src/train.h
5 years ago
Jonathan G Rennison f1946af707 TBTR: Delete leftover virtual trains on non-network client load 5 years ago
Jonathan G Rennison 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
Jonathan G Rennison 2b40007ca1 TBTR: Do not allocate virtual trains a unit number in NormaliseTrainHead
(cherry picked from commit 8fefef9d19)
5 years ago
Jonathan G Rennison ccfd187677 TBTR: Avoid built virtual wagons which can't be attached being orphaned
(cherry picked from commit f3daada67f)
5 years ago
Jonathan G Rennison aa10556522 TBTR: Avoid articulated/rear units being added to tile hash
(cherry picked from commit 5a2e498182)
5 years ago
Jonathan G Rennison 2ccb6e1743 TBTR: Fix front engine not being cleared when being replaced. and kept in depot
(cherry picked from commit ee06258629)
5 years ago
Jonathan G Rennison 2557cec6f3 TBTR: Skip virtual vehicles in company rating/value and group stats
(cherry picked from commit 34d7f12a70)
5 years ago
Jonathan G Rennison 835562d81d TBTR: Remove unused function: TemplateReplacement::GetTemplateVehicle
(cherry picked from commit 8afb21cf9c)
5 years ago
Jonathan G Rennison 2e929a88a9 TBTR: Fix incorrect deletion of template vehicles when deleting company
(cherry picked from commit fff3018b42)
5 years ago
Jonathan G Rennison e0578a6e0c TBTR: Show warning on templates which include unavailable vehicles
(cherry picked from commit 6d3e9093c4)
5 years ago
Jonathan G Rennison 324ce7ae96 TBTR: Allow cloning virtual/template trains with unavailable engines
(cherry picked from commit 9d861fb8a0)
5 years ago
Jonathan G Rennison 21faae910b TBTR: Remove duplicated function: SetupTemplateVehicleFromVirtual
(cherry picked from commit c6fa43d767)
5 years ago
Jonathan G Rennison 91c5dee66c Re-add removed group collapse/expand all buttons 5 years ago
Jonathan G Rennison 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
Jonathan G Rennison 8fefef9d19 TBTR: Do not allocate virtual trains a unit number in NormaliseTrainHead 5 years ago
Jonathan G Rennison 1df56993ea Fix order backups being applied when using buy and refit 5 years ago
translators f1c3915341 Update: Translations from eints
norwegian (bokmal): 25 changes by Leifbk
5 years ago
translators ac610c50a9 Update: Translations from eints
italian: 38 changes by lorenzodv
5 years ago
Jonathan G Rennison b634e5d6de Version: Committing version data for tag: jgrpp-0.31.2 5 years ago
Jonathan G Rennison 7271fdda4c
Merge pull request #92 from stormcone/patch-1
Fix: Fix some copy-paste typos.
5 years ago
stormcone 29bdab23f7
Fix: Fix some copy-paste typos. 5 years ago
translators b878891289 Update: Translations from eints
english (us): 38 changes by njn
5 years ago
Jonathan G Rennison d02928c56a Check industry neutral stations_near in CheckCaches 5 years ago
Jonathan G Rennison 92c48d6897 Fix padded tile area being used for industries in FindStationsAroundTiles 5 years ago
Jonathan G Rennison c4d9404d79 Check industry FindStationsAroundTiles in CheckCaches 5 years ago
Jonathan G Rennison c13ee0979f Add industry and station rect coords to NewGRF debug window info 5 years ago
Jonathan G Rennison 601afc56dc Add NewGRF debug window info for stations and industries 5 years ago
translators 7ad9971cf0 Update: Translations from eints
croatian: 3 changes by VoyagerOne
5 years ago
Jonathan G Rennison 5f44741428 Add console commands to show station and industry windows 5 years ago
Jonathan G Rennison ac629c26bb Add logs from desync log call to CheckCaches to ring buffer for next desync 5 years ago
Jonathan G Rennison 84d30e2f97 Fix packet overflow in ClientNetworkGameSocketHandler::SendDesyncLog 5 years ago
Jonathan G Rennison 1d5ba98932 Show time and in game date of game load in desync/crash logs 5 years ago
translators 7f7aba9389 Update: Translations from eints
hungarian: 3 changes by Brumi
5 years ago
translators 00000ef8fa Update: Translations from eints
korean: 3 changes by telk5093
5 years ago
translators 0518ed01b6 Update: Translations from eints
czech: 48 changes by djst
russian: 3 changes by Lone_Wolf
5 years ago
Jonathan G Rennison f3daada67f TBTR: Avoid built virtual wagons which can't be attached being orphaned 5 years ago