dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
53,126 Commits 1 Branch 0 Tags
41117a52d28864ac97c60cc66cad87fc98f5a095
Commit Graph

845 Commits

Author SHA1 Message Date
Jonathan G Rennison
176fd2180b Fix regression preventing road vehicles from leaving tunnels 2018-07-13 08:27:52 +01:00
Jonathan G Rennison
6740a9a470 Merge branch 'custom_bridgeheads' into jgrpp 
# Conflicts:
#	docs/landscape.html
#	src/bridge_map.h
#	src/pbs.cpp
#	src/saveload/company_sl.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/settings_type.h
#	src/signal.cpp
#	src/train_cmd.cpp
#	src/tunnel_map.h
#	src/tunnelbridge_cmd.cpp
#	src/tunnelbridge_map.h
#	src/vehicle.cpp
#	src/viewport.cpp
 2018-07-08 23:04:30 +01:00
Jonathan G Rennison
77362b829a Initial support for rail custom bridge heads 2018-07-08 23:03:42 +01:00
Jonathan G Rennison
79ca5c8b7d Merge branch 'custom_bridgeheads' into jgrpp 2018-06-26 18:34:17 +01:00
Jonathan G Rennison
25af12814b Fix double-adding of road tunnel/bridge infra counts when changing owner 2018-06-26 18:30:31 +01:00
Jonathan G Rennison
670ed0de5b Fix double-accounting of bidi signals on bridge/tunnel during owner change 2018-06-21 18:45:40 +01:00
Jonathan G Rennison
e82ccad052 Merge branch 'signal_tunnels_bridges' into jgrpp 
# Conflicts:
#	src/pbs.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/signal.cpp
#	src/table/settings.ini
#	src/train_cmd.cpp
#	src/tunnelbridge.h
 2018-06-17 09:35:18 +01:00
Jonathan G Rennison
814f9f7e0f Implement bidirectional mode for signals on bridges/tunnels 2018-06-17 04:27:03 +01:00
Jonathan G Rennison
d03139b241 Use separate bits for signals on bridge/tunnel entrance/exit red/green states 2018-06-17 04:01:31 +01:00
Jonathan G Rennison
b7ce21038a Merge branch 'custom_bridgeheads' into jgrpp 
# Conflicts:
#	src/tunnelbridge_cmd.cpp
 2018-04-26 21:08:52 +01:00
Jonathan G Rennison
1911c0cb69 Fix handling of custom bridge head ramp-only pieces/types when upgrading 2018-04-26 21:07:58 +01:00
Jonathan G Rennison
c053549144 Merge branch 'signal_tunnels_bridges' into jgrpp 2018-04-25 22:33:10 +01:00
Jonathan G Rennison
c92a28a072 Preserve signal simulation/reservation data when upgrading bridges. 
Based on commit 301925f948c9b36966c9c668e1476c2485425338
 2018-04-25 22:32:50 +01:00
Jonathan G Rennison
714b9711e4 Merge branch 'custom_bridgeheads' into jgrpp 
# Conflicts:
#	src/tunnelbridge_cmd.cpp
 2018-04-25 21:59:22 +01:00
Jonathan G Rennison
ff6a3ed234 Preserve custom bridge head road data when upgrading bridges. 
Based on commit 301925f948c9b36966c9c668e1476c2485425338
 2018-04-25 18:51:15 +01:00
Jonathan G Rennison
e138d3564b Fix tram reversing on custom bridge head tiles. 
(cherry picked from commit 0a345efc27)
 2018-04-24 22:08:03 +01:00
Jonathan G Rennison
102c55bc57 Fix assertion failure when trams do a short turnaround in a tunnel mouth 2017-12-13 20:44:12 +00:00
Jonathan G Rennison
0a345efc27 Fix tram reversing on custom bridge head tiles. 2017-06-21 23:40:19 +01:00
Jonathan G Rennison
95e8bc67cc Merge branch 'chunnel' into jgrpp 2017-06-07 21:00:00 +01:00
HackaLittleBit
60345d2e18 Fix cost of building tunnels. 2017-06-07 19:56:20 +01:00
Jonathan G Rennison
4d21d6f81c Merge branch 'chunnel' into jgrpp 2017-04-04 23:30:04 +01:00
HackaLittleBit
eddd635f00 Chunnel: Make error reporting consistent with tunnel length reporting at cursor. 
Error reporting should be in tune with occurrence of events.
 2017-03-31 01:54:41 +01:00
Jonathan G Rennison
612c825bb6 Chunnel: Minor whitespace/scope changes, rename function. 2017-03-24 22:51:29 +00:00
HackaLittleBit
2549def764 Chunnel: Use separate container function for chunnel related conditions. 2017-03-24 22:40:38 +00:00
Jonathan G Rennison
0d4bf16f57 Merge branch 'custom_bridgeheads' into jgrpp 2017-03-23 20:15:45 +00:00
Jonathan G Rennison
57a5f08687 Fix handling of custom bridge heads on steep slopes. 2017-03-23 20:15:37 +00:00
HackaLittleBit
de24fed9d1 Chunnel: Tunnels are only allowed to cross sea. 2017-03-12 20:33:59 +00:00
Jonathan G Rennison
93a43da809 Chunnel: Prevent chunnels from intersecting with each other. 2017-03-05 19:13:42 +00:00
Jonathan G Rennison
4c9f7b73b3 Chunnel: Add a ground veh flag for (maybe) being in a chunnel 
Use this to avoid inclination change code in non-chunnel wormholes.
 2017-03-05 18:37:35 +00:00
Jonathan G Rennison
500ef49694 Chunnel: Double cost of building and removing chunnels. 2017-03-05 14:39:17 +00:00
Jonathan G Rennison
89a0a9c182 Chunnel: Use hash table for tunnel search, change tunnel fields and savegame format. 2017-03-05 14:39:10 +00:00
Jonathan G Rennison
212f6ce6ef Chunnel: Add setting to enable construction, default off. 2017-03-04 13:23:52 +00:00
Jonathan G Rennison
02b33e7f64 Chunnel: Add error text for too many tunnels. 2017-03-04 13:06:43 +00:00
Jonathan G Rennison
aac5b2d4ad Chunnel: Adjust struct Tunnel constructor 2017-03-04 12:36:01 +00:00
Jonathan G Rennison
21bbb42d7e Chunnel: Adjust arguments of IsTunnelInWay 2017-03-04 12:23:52 +00:00
HackaLittleBit
7e6215f271 Chunnel patch 28401: Add: Tile description chunnel. 
https://www.tt-forums.net/viewtopic.php?p=1183580#p1183580
 2017-03-04 11:59:36 +00:00
HackaLittleBit
15c8e67655 Chunnel patch 28400: Codechange: Chunnels can now pass normal tunnels, fixed tile highlighting, fixed ramp detection. 
https://www.tt-forums.net/viewtopic.php?p=1183580#p1183580
 2017-03-04 11:59:33 +00:00
HackaLittleBit
1ac8f66de1 Chunnel patch 28397: Codechange: Chunnels can't pass oilrigs. 
https://www.tt-forums.net/viewtopic.php?p=1183416#p1183416
 2017-03-04 11:50:52 +00:00
HackaLittleBit
dfce9cc4c0 Chunnel patch 28396: Codechange: Chunnel portal must have minimal length of 4 tiles. 
https://www.tt-forums.net/viewtopic.php?p=1183416#p1183416
 2017-03-04 11:48:12 +00:00
HackaLittleBit
dee526c6d6 Chunnel patch 28395: Add: Basic chunnel. Creating tunnels under water. 
https://www.tt-forums.net/viewtopic.php?p=1183416#p1183416
 2017-03-04 11:48:07 +00:00
HackaLittleBit
f7ced74c22 Chunnel patch 28394: Codechange: Rework IsTunnelInWay proc. 
https://www.tt-forums.net/viewtopic.php?p=1183416#p1183416
 2017-03-04 11:48:00 +00:00
HackaLittleBit
ad070b91ea Chunnel patch 28392: Add: Basic tunnel pool. (no save) 
https://www.tt-forums.net/viewtopic.php?p=1183416#p1183416
 2017-03-04 11:43:53 +00:00
Jonathan G Rennison
091c30e254 Merge branch 'custom_bridgeheads' into jgrpp 2017-02-22 02:54:01 +00:00
Jonathan G Rennison
c6fa52f1f1 Fix wrong calculation of road tunnel infrastructure counts. 2017-02-22 02:53:37 +00:00
Jonathan G Rennison
4550ac39b9 Merge branch 'signal_tunnels_bridges' into jgrpp 2017-02-12 12:17:51 +00:00
Jonathan G Rennison
e1ee952b85 Fix crash when updating infrastructure totals when deleting bridge with signals. 2017-02-12 12:17:43 +00:00
Jonathan G Rennison
072915f2c7 Merge branch 'custom_bridgeheads' into jgrpp 
# Conflicts:
#	docs/landscape_grid.html
#	src/roadveh_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/extended_ver_sl.h
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/tunnelbridge_cmd.cpp
#	src/tunnelbridge_map.h
 2017-02-05 20:43:56 +00:00
Jonathan G Rennison
da177d063f Custom bridge heads: Initial implementation 2017-02-05 20:43:19 +00:00
Jonathan G Rennison
1e5c788541 Merge branch 'signal_tunnels_bridges' into jgrpp 
# Conflicts:
#	src/table/settings.ini
#	src/tunnelbridge.h
 2017-01-30 21:41:20 +00:00
Jonathan G Rennison
d762835903 Signals on tunnel/bridges are now added to infrastructure stats. 2017-01-30 21:37:17 +00:00