dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
48,235 Commits 1 Branch 0 Tags
1365600bed4802438f4b51d53157a0adbcf7c064
Commit Graph

48235 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan G Rennison
1365600bed Merge branch 'jgrpp' into jgrpp-nrt 2019-07-13 20:35:17 +01:00
Jonathan G Rennison
d3e0c3787f Merge branch 'master' into jgrpp-nrt 
Merge trunk multiple docks implementation

# Conflicts:
#	docs/landscape_grid.html
#	src/order_cmd.cpp
#	src/pathfinder/npf/npf.cpp
#	src/pathfinder/yapf/yapf_ship.cpp
#	src/rail_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/oldloader_sl.cpp
#	src/saveload/station_sl.cpp
#	src/script/api/script_order.cpp
#	src/ship_cmd.cpp
#	src/station.cpp
#	src/station_base.h
#	src/station_cmd.cpp
#	src/tunnelbridge_cmd.cpp
 2019-07-13 20:34:52 +01:00
Jonathan G Rennison
8b1fb60dea Version: Committing version data for tag: jgrpp-0.31.3 2019-07-13 18:23:03 +01:00
translators
a52bbb72a8 Update: Translations from eints 
welsh: 4 changes by kazzie
 2019-07-12 19:45:45 +02:00
Jonathan G Rennison
a200fcf4e9 Ensure bridge road types match when joining two previous separate ends 2019-07-11 22:34:31 +01:00
Jonathan G Rennison
7555cf2965 Fix road vehicles being unable to enter bridge at custom bridge head 
Type mismatch
 2019-07-11 21:01:13 +01:00
Jonathan G Rennison
2164eb4b12 Fix building of road stops on town-owned one-way roads 
See: https://github.com/OpenTTD/OpenTTD/issues/7626
 2019-07-11 20:07:55 +01:00
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
 2019-07-11 20:03:23 +01:00
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
 2019-07-11 19:45:56 +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
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
Niels Martin Hansen
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.
 2019-07-06 20:02:12 +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
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