dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
51,002 Commits 1 Branch 0 Tags
ad554d913f57e9b780b3bc8531723a73cdaf7623
Commit Graph

38110 Commits

Author SHA1 Message Date
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
Niels Martin Hansen
1e723934a1 Fix 27384486e4: Error in GM Reset sysex data 2019-07-07 22:46:21 +02:00
pnda
a35b43ce93 Fix #6666: Mismatched parentheses in RTL languages 2019-07-07 18:30:51 +02:00
unknown
6f28a0c051 Fix #5685: Check for free wagons in ScriptVehicleList 2019-07-07 16:02:11 +01:00
Niels Martin Hansen
81614f2378 Fix #7633: Allow zero-cost track conversion to succeed 2019-07-06 21:04:43 +02:00
Jonathan G Rennison
ac84f34062 Fix viewport kdtree not being updated for waypoints when sign moved 2019-07-06 14:58:42 +01:00
glx
603f625fda Fix f53817987: unsafe mix of type 'TileIndex' and type 'bool' 2019-07-06 15:19:33 +02:00
Niels Martin Hansen
a0c78c73e3 Fix: Correctly reset playback between songs in win32_m driver 2019-07-04 22:27:34 +02:00
Niels Martin Hansen
27b7c5a5fd Fix: Correctly reset playback between songs in DMusic driver 2019-07-04 22:27:34 +02:00
Niels Martin Hansen
a4cf1c8aec Fix: Don't keep mutex locked while parsing MIDI data 2019-07-04 22:27:34 +02:00
Niels Martin Hansen
9839ce006c Fix: Time values should be DWORD everywhere in win32_m 2019-07-04 22:27:34 +02:00
Niels Martin Hansen
f8633fc63b Codechange: Fix comment indentation 2019-07-04 22:27:34 +02:00
Niels Martin Hansen
27384486e4 Codechange: Use common source for well-known SysEx messages in Windows music drivers 2019-07-04 22:27:34 +02:00
Niels Martin Hansen
9d8a83bf8d Codechange: Add some const in preparation 2019-07-04 22:27:34 +02:00
Niels Martin Hansen
c74df8581d Codechange: Use std::mutex instead of CRITICAL_SECTION in win32_m 2019-07-04 22:27:34 +02: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
translators
2e23c5ec15 Update: Translations from eints 
korean: 1 change by telk5093
 2019-07-02 19:45:45 +02:00
peter1138
0db31ae27f Change: Avoid caching end of ship path, to allow penalties to apply. 2019-06-30 16:46:32 +02:00
peter1138
31db4f8d5e Add: Penalty for occupied docking points. 2019-06-30 16:46:32 +02:00
peter1138
ec2656ab7e Codechange: Restrict docking points of docks. 2019-06-30 16:46:32 +02:00
peter1138
f538179878 Feature: Multi-tile docks and docking points. 2019-06-30 16:46:32 +02:00
Jonathan G Rennison
1df56993ea Fix order backups being applied when using buy and refit 2019-06-26 04:15:23 +01:00
translators
f1c3915341 Update: Translations from eints 
norwegian (bokmal): 25 changes by Leifbk
 2019-06-25 19:45:45 +02:00
translators
ac610c50a9 Update: Translations from eints 
italian: 38 changes by lorenzodv
 2019-06-23 19:45:43 +02:00
stormcone
29bdab23f7 Fix: Fix some copy-paste typos. 2019-06-17 20:37:22 +02:00
translators
b878891289 Update: Translations from eints 
english (us): 38 changes by njn
 2019-06-17 19:45:45 +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