Commit Graph

48196 Commits

Author SHA1 Message Date
Jonathan G Rennison
8b1fb60dea Version: Committing version data for tag: jgrpp-0.31.3 2019-07-13 18:23:03 +01:00
Jonathan G Rennison
eab5db9769 Fix corruption of conditional order targets when loading SpringPP savegames 2019-07-11 18:46:48 +01:00
Jonathan G Rennison
4cf60613df Delete windows before switching to GM_MENU mode in LoadIntroGame
See: https://github.com/OpenTTD/OpenTTD/issues/7635
2019-07-11 18:21:52 +01:00
Jonathan G Rennison
97221a67f2 Merge branch 'template_train_replacement' into jgrpp
# Conflicts:
#	src/saveload/vehicle_sl.cpp
2019-07-11 03:16:29 +01:00
Jonathan G Rennison
bba36aef1b TBTR: Check for mixed virtual/non-virtual consists on load 2019-07-11 03:15:40 +01:00
Jonathan G Rennison
0f6c5ee622 Fix saveload exception handling when gamelog action in progress 2019-07-11 03:14:14 +01:00
glx22
a240a938a3 Fix: ignore C++ standard library headers in depend (#7578)
(cherry picked from commit 47fdbdd324)
2019-07-09 19:02:19 +01:00
peter1138
6e28727fa4 Fix: Clicking on scrollbar 'thumb' moved position up instantly.
(cherry picked from commit 82989ef076)
2019-07-09 19:01:15 +01:00
glx22
49f3592ac9 Fix: vcpkg used to patch lzma.h to define LZMA_API_STATIC for static builds (#7614)
(cherry picked from commit 846fc8fe09)
2019-07-09 08:48:07 +01:00
Jonathan G Rennison
eb6cd6cf5f Change ZOOM_LVL_BASE type back to signed
Fixes viewport map mode
2019-07-08 17:36:53 +01:00
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
2019-07-08 16:19:07 +01:00
Jonathan G Rennison
ac84f34062 Fix viewport kdtree not being updated for waypoints when sign moved 2019-07-06 14:58:42 +01:00
Jonathan G Rennison
94f705e45e Add missing include to tilearea_type.h 2019-07-04 17:06:42 +01:00
Jonathan G Rennison
a1cf3358fe Add missing include to crashlog.h 2019-07-04 17:04:38 +01:00
Jonathan G Rennison
f78b72989b Merge branch 'template_train_replacement' into jgrpp
# Conflicts:
#	src/saveload/vehicle_sl.cpp
#	src/train.h
2019-07-03 22:25:47 +01:00
Jonathan G Rennison
f1946af707 TBTR: Delete leftover virtual trains on non-network client load 2019-07-03 22:22:50 +01:00
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)
2019-07-03 21:59:02 +01:00
Jonathan G Rennison
2b40007ca1 TBTR: Do not allocate virtual trains a unit number in NormaliseTrainHead
(cherry picked from commit 8fefef9d19)
2019-07-03 21:58:23 +01:00
Jonathan G Rennison
ccfd187677 TBTR: Avoid built virtual wagons which can't be attached being orphaned
(cherry picked from commit f3daada67f)
2019-07-03 21:56:08 +01:00
Jonathan G Rennison
aa10556522 TBTR: Avoid articulated/rear units being added to tile hash
(cherry picked from commit 5a2e498182)
2019-07-03 21:54:47 +01:00
Jonathan G Rennison
2ccb6e1743 TBTR: Fix front engine not being cleared when being replaced. and kept in depot
(cherry picked from commit ee06258629)
2019-07-03 21:54:07 +01:00
Jonathan G Rennison
2557cec6f3 TBTR: Skip virtual vehicles in company rating/value and group stats
(cherry picked from commit 34d7f12a70)
2019-07-03 21:53:15 +01:00
Jonathan G Rennison
835562d81d TBTR: Remove unused function: TemplateReplacement::GetTemplateVehicle
(cherry picked from commit 8afb21cf9c)
2019-07-03 21:52:49 +01:00
Jonathan G Rennison
2e929a88a9 TBTR: Fix incorrect deletion of template vehicles when deleting company
(cherry picked from commit fff3018b42)
2019-07-03 21:52:14 +01:00
Jonathan G Rennison
e0578a6e0c TBTR: Show warning on templates which include unavailable vehicles
(cherry picked from commit 6d3e9093c4)
2019-07-03 21:51:25 +01:00
Jonathan G Rennison
324ce7ae96 TBTR: Allow cloning virtual/template trains with unavailable engines
(cherry picked from commit 9d861fb8a0)
2019-07-03 21:48:26 +01:00
Jonathan G Rennison
21faae910b TBTR: Remove duplicated function: SetupTemplateVehicleFromVirtual
(cherry picked from commit c6fa43d767)
2019-07-03 21:29:57 +01:00
Jonathan G Rennison
91c5dee66c Re-add removed group collapse/expand all buttons 2019-07-03 18:16:25 +01:00
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
2019-07-03 03:24:03 +01:00
Jonathan G Rennison
8fefef9d19 TBTR: Do not allocate virtual trains a unit number in NormaliseTrainHead 2019-07-03 02:48:24 +01:00
Jonathan G Rennison
1df56993ea Fix order backups being applied when using buy and refit 2019-06-26 04:15:23 +01:00
Jonathan G Rennison
b634e5d6de Version: Committing version data for tag: jgrpp-0.31.2 2019-06-18 18:02:31 +01:00
Jonathan G Rennison
7271fdda4c
Merge pull request #92 from stormcone/patch-1
Fix: Fix some copy-paste typos.
2019-06-17 20:31:52 +01:00
stormcone
29bdab23f7
Fix: Fix some copy-paste typos. 2019-06-17 20:37:22 +02:00
Jonathan G Rennison
d02928c56a Check industry neutral stations_near in CheckCaches 2019-06-17 02:37:24 +01:00
Jonathan G Rennison
92c48d6897 Fix padded tile area being used for industries in FindStationsAroundTiles 2019-06-17 02:31:15 +01:00
Jonathan G Rennison
c4d9404d79 Check industry FindStationsAroundTiles in CheckCaches 2019-06-17 01:34:34 +01:00
Jonathan G Rennison
c13ee0979f Add industry and station rect coords to NewGRF debug window info 2019-06-17 01:34:06 +01:00
Jonathan G Rennison
601afc56dc Add NewGRF debug window info for stations and industries 2019-06-16 13:56:47 +01:00
Jonathan G Rennison
5f44741428 Add console commands to show station and industry windows 2019-06-15 10:01:29 +01:00
Jonathan G Rennison
ac629c26bb Add logs from desync log call to CheckCaches to ring buffer for next desync 2019-06-14 22:09:18 +01:00
Jonathan G Rennison
84d30e2f97 Fix packet overflow in ClientNetworkGameSocketHandler::SendDesyncLog 2019-06-14 22:09:18 +01:00
Jonathan G Rennison
1d5ba98932 Show time and in game date of game load in desync/crash logs 2019-06-14 21:56:37 +01:00
Jonathan G Rennison
f3daada67f TBTR: Avoid built virtual wagons which can't be attached being orphaned 2019-06-11 01:59:50 +01:00
Jonathan G Rennison
5a2e498182 TBTR: Avoid articulated/rear units being added to tile hash 2019-06-11 01:59:17 +01:00
Jonathan G Rennison
9519c5c1fb Ensure town cargo bitmap correctly set after town creation 2019-06-09 20:47:27 +01:00
Jonathan G Rennison
5e9dd1ff35 Update cache mismatch logging in CheckCaches 2019-06-09 11:17:22 +01:00
Jonathan G Rennison
326dfd33eb Fix town nearby station cache not being updated when house is rebuilt smaller/different shape 2019-06-09 11:17:22 +01:00
Jonathan G Rennison
16e590dc88 Add console command to show town window 2019-06-09 11:14:36 +01:00
Jonathan G Rennison
751c5229f1 Fix vehicle tile hash not always being immediately updated for aircraft 2019-06-08 18:44:12 +01:00