dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
49,757 Commits 1 Branch 0 Tags
4e0804b7914f38a6ea80d54648b49c512a568095
Commit Graph

49757 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TTrebron
704eaf80f6 Fix #7655: Decrease buttons in cheat window do not work properly 
(cherry picked from commit 425cd3e4ca)
 2019-07-29 22:50:33 +01:00
Jonathan G Rennison
d99b867f44 Fix crash when removing signal from tunnel/bridge with trainless reservation 2019-07-29 22:49:24 +01:00
Jonathan G Rennison
89a6cc3e03 Add game event flag for virtual train creation 2019-07-29 19:39:01 +01:00
Jonathan G Rennison
162fcb050e Only set TBTR replacement game event flag when replacement action occurs 2019-07-29 19:36:35 +01:00
Jonathan G Rennison
942dd35380 Add game events for industry create/destroy 2019-07-29 18:48:59 +01:00
TTrebron
425cd3e4ca Fix #7655: Decrease buttons in cheat window do not work properly 2019-07-27 08:50:18 +01:00
Jonathan G Rennison
99949d6559 Crash log: Fix counts in recent news messages header 2019-07-26 18:26:09 +01:00
stormcone
163192b5e0 Fix #7667: Buying an engine after buying wagons doesn't give a complete train. 
(cherry picked from commit 2e686ad5d5)
 2019-07-26 00:20:08 +01:00
stormcone
2e686ad5d5 Fix #7667: Buying an engine after buying wagons doesn't give a complete train. 2019-07-23 23:15:08 +02:00
stormcone
2817cd41f1 Fix #7250: Viewport kdtree not being updated for waypoints when sign moved. 
Code based on the patch by JGRennison.
JGRennison/OpenTTD-patches@ac84f34062
 2019-07-22 21:41:08 +02:00
TELK
196d586849 Feature: Town name filtering (#7621) 2019-07-22 20:27:39 +01:00
Jonathan G Rennison
d71a7c21da Fix #7593: Crash in ScriptOrder::GetOrderDistance in VT_AIR mode 
Null pointer dereference occurred when either origin_tile or dest_tile
were waypoint tiles.
 2019-07-22 20:26:36 +01:00
Alberth
5981ed248a Codechange: Remove unused FioTarFirstDir and FioTarAddLink functions 2019-07-21 19:11:31 +01:00
Jonathan G Rennison
6f840a5c80 Fix road vehicles not being limited by the road type max speed 2019-07-21 17:19:03 +01:00
Jonathan G Rennison
8a01fba216 Fix crash in GetTileDesc_TunnelBridge on non-road bridges 2019-07-18 17:46:22 +01:00
Jonathan G Rennison
67dd9ffe8c Use light blue colour for station tile coverage highlight 2019-07-18 17:46:02 +01:00
Niels Martin Hansen
331eba544a Fix: Narrowing cast in one storybook command 
CompanyID is 8 bit wide, so this incorrect cast would make it impossible to create story page elements for pages past 255.
 2019-07-18 09:36:12 +02:00
translators
88950d8f23 Update: Translations from eints 
swedish: 49 changes by daishan
spanish: 80 changes by lpenap
 2019-07-15 19:45:44 +02:00
translators
24cec63a3d Update: Translations from eints 
welsh: 13 changes by kazzie
spanish: 35 changes by lpenap
 2019-07-14 19:45:46 +02:00
dP
36e4bd4023 Fix: Make GSGoal.QuestionClient work correctly at least for clients with ID < 2**16 2019-07-14 13:32:08 +01:00
Jonathan G Rennison
7573260235 Version: Committing version data for tag: jgrpp-0.32-rc1 2019-07-13 20:47:54 +01:00
Jonathan G Rennison
ddb6c2e6e3 Add MinGW std threads include to music/win32_m.cpp 
Fix uses of std::lock_guard
 2019-07-13 20:47:46 +01:00
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