Commit Graph

48278 Commits

Author SHA1 Message Date
Jonathan G Rennison
04ef407ddf Merge branch 'jgrpp' into jgrpp-nrt
# Conflicts:
#	.ottdrev-vc
#	README.md
#	jgrpp-changelog.md
#	src/ship_cmd.cpp
2019-08-24 10:41:08 +01:00
Jonathan G Rennison
12be6fd81f Version: Committing version data for tag: jgrpp-0.31.4 2019-08-24 10:21:17 +01:00
Jonathan G Rennison
62713ad106 Fix missing declaration in c8a37d82 2019-08-24 03:41:08 +01:00
Jonathan G Rennison
f1df81bdd8 Increase company ID field widths in command log dump 2019-08-22 07:41:25 +01:00
Jonathan G Rennison
942da75dd4 Fix commit 4cf60613 suppressing critical error message windows 2019-08-22 02:28:29 +01:00
Jonathan G Rennison
2e4b1d73d8 Avoid performing emergency network save more than once 2019-08-22 01:40:28 +01:00
Jonathan G Rennison
6ce7f22fe6 Send server desync log to client 2019-08-22 01:13:07 +01:00
Jonathan G Rennison
459a49cb24 Add flags for mismatch type to client desync log 2019-08-20 22:52:03 +01:00
Jonathan G Rennison
ec892879f4 Add passworded mechanism to change server game settings from client 2019-08-20 20:42:17 +01:00
Jonathan G Rennison
17c054a650 Use password hash for network server and rcon passwords 2019-08-20 20:04:34 +01:00
Jonathan G Rennison
0299eaa45f Clear order backup clone when train head is moved to non-head position 2019-08-20 19:26:19 +01:00
Jonathan G Rennison
5155afee9b Ensure nearby stations list updated in CBID_HOUSE_DESTRUCTION callback 2019-08-20 01:47:07 +01:00
Jonathan G Rennison
515187058f Add nearby stations to town debug window 2019-08-20 01:45:35 +01:00
Jonathan G Rennison
4b9a4ae695 Use consistent casts/types for byte swap functions 2019-08-19 20:25:53 +01:00
Jonathan G Rennison
a8786632f7 Always call UpdateTownCargoTotal in UpdateTownCargoes 2019-08-19 20:15:05 +01:00
Jonathan G Rennison
2105d21356 Merge branch 'tracerestrict' into jgrpp 2019-08-19 20:14:05 +01:00
Jonathan G Rennison
ccdc75e2bf Tracerestrict: Fix non-deterministic use of _sorted_cargo_specs 2019-08-19 20:02:24 +01:00
Jonathan G Rennison
c8a37d8292 Add 64 bit FindFirstBit function 2019-08-19 20:01:49 +01:00
Jonathan G Rennison
d0ee897135 Unreserve and re-reserve reservations to bidi bridge/tunnel entrances when reversing train inside 2019-08-18 17:05:44 +01:00
Jonathan G Rennison
dae041601d Unreserve signalled tunnel/bridge head when reversing on approach to exit 2019-08-18 16:54:00 +01:00
Jonathan G Rennison
5bc9c8ed6e Unreserve signalled tunnel/bridge head when entering from opposite to v->tile 2019-08-18 16:52:57 +01:00
Jonathan G Rennison
70ef0f562b Fix train reverse inside signalled tunnel/bridge entrance clearing reservation of incoming train 2019-08-18 14:40:24 +01:00
Jonathan G Rennison
0aa366a24b Desync: Log seed and state checksum on desync 2019-08-06 03:03:40 +01:00
Jonathan G Rennison
a1d36b02f0 Network: Add state checksum which is check in network sync 2019-08-06 03:03:40 +01:00
Jonathan G Rennison
c941d2d2a6 Desync: Change sync event logging to desync debug level 2 2019-08-05 19:14:06 +01:00
Jonathan G Rennison
6d2efd0837 Crashlog: Log pathfinders and day length factor 2019-08-05 19:12:01 +01:00
Jonathan G Rennison
385960af4e Network: Decrease sync frame period when desync occurs 2019-08-05 18:21:14 +01:00
Jonathan G Rennison
bc0de9b6ef Rebuild total cargo acceptance on load even for empty acceptance area 2019-08-01 23:05:31 +01:00
Jonathan G Rennison
f5badfefd1 Check order destination refcount maps in CheckCaches 2019-07-30 19:09:22 +01:00
Jonathan G Rennison
e28da50c4f Fix order destination refcount accounting for shared orders 2019-07-30 19:09:08 +01:00
Jonathan G Rennison
7ed86e7488 Merge branch 'jgrpp' into jgrpp-nrt 2019-07-29 22:50:51 +01:00
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
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
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
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