dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
52,831 Commits 1 Branch 0 Tags
0a31b27a209f71a2a71b3fab740fb39253b3f2c4
Commit Graph

968 Commits

Author SHA1 Message Date
frosch
d9bfe88261 (svn r27676) -Codechange: Rename catenary functions, so that they refer unambiguously to either RoadCatenary or RailCatenary. 2016-11-05 11:53:03 +00:00
Jonathan G Rennison
f82feb160f Merge branch 'signal_tunnels_bridges' into jgrpp 
# Conflicts:
#	projects/openttd_vs100.vcxproj
#	projects/openttd_vs100.vcxproj.filters
#	projects/openttd_vs140.vcxproj
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs80.vcproj
#	projects/openttd_vs90.vcproj
#	source.list
#	src/misc.cpp
#	src/openttd.cpp
#	src/pbs.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/saveload.cpp
#	src/signal.cpp
#	src/train_cmd.cpp
#	src/tunnelbridge_map.h
 2016-09-18 20:07:48 +01:00
Jonathan G Rennison
556594f2f0 Extend bridge signal simulation to support an unlimited no. of signals. 
This is instead of the previous limit of 16, all stored in M2.
 2016-09-18 20:06:59 +01:00
Jonathan G Rennison
0d2e9f91bf Adjust signal on bridge/tunnel map bits, rename accessors, add docs. 
Use same bit to store red/green state for entrances and exits.
No longer re-use exit bit to store red/green state of entrance.
Avoid modifying the M2 of tunnel entrances/exits.
Rename and rationalise map accessor functions.
Document bits used in landscape HTML docs.
 2016-09-18 20:06:39 +01:00
Jonathan G Rennison
8a59b960d4 Fix missing include in parent commit. 2016-09-18 13:43:25 +01:00
Jonathan G Rennison
e85e302a68 Merge branch 'signal_tunnels_bridges' into jgrpp 
# Conflicts:
#	src/rail_cmd.cpp
 2016-09-11 13:21:14 +01:00
Jonathan G Rennison
8281041784 Fix action cost estimation for signal dragging over bridge/tunnels. 
If a bridge/tunnel entrance is signalled, blacklist the far end.
 2016-09-11 13:20:30 +01:00
Jonathan G Rennison
afb5b625ef Merge branch 'tracerestrict-sx' into jgrpp 
# Conflicts:
#	src/rail_cmd.cpp
 2016-06-18 11:12:20 +01:00
Jonathan G Rennison
fe1fee456a Merge branch 'tracerestrict' into tracerestrict-sx 2016-06-18 11:11:18 +01:00
Jonathan G Rennison
a091780843 Fix type mismatch in GRF externals. 2016-06-18 11:10:57 +01:00
Jonathan G Rennison
54b8eb9b4c Merge branch 'polyline_track_tool' into jgrpp 
# Conflicts:
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/viewport.cpp
#	src/viewport_func.h
 2016-04-13 21:14:47 +01:00
patch-import
01cf154f51 Import polyline rail tool patch v10b 
http://www.tt-forums.net/viewtopic.php?f=33&t=57080
 2016-04-13 21:03:51 +01:00
keldorkatarn
5cc56d6ad9 Make 32 instead of 16 rail types possible. by using one free bit of m1 in the map array. 
(cherry picked from commit b44843800880cdc186f5183301ee0f42afbb5f84)

Also set non-rail type M3 bits to 0 where applicable.
Change savegame versioning to SLXI format.
 2016-04-08 20:38:31 +01:00
Jonathan G Rennison
59677d5c6f Merge branch 'signal_tunnels_bridges-sx' into jgrpp 2016-04-08 20:19:19 +01:00
keldorkatarn
095229128d Fix crash when dragging two-directional block signals onto a bridge or tunnel 
(cherry picked from commit 4199ba5981b2761d5226ebc89b315f00e62e1a3a)
 2016-04-08 18:04:18 +01:00
Jonathan G Rennison
d08b162119 Merge branch 'signal_tunnels_bridges-sx' into jgrpp 
# Conflicts:
#	src/saveload/afterload.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/signal.cpp
#	src/train_cmd.cpp
 2016-02-21 12:16:11 +00:00
Jonathan G Rennison
35b93a42ac Enable bridge/tunnel exit signals to be one-way PBS. 
Add signal conversion support.
 2016-02-20 23:49:06 +00:00
Jonathan G Rennison
69c2cf352e Fix drag-convert not updating bridge/tunnel direction correctly. 2016-02-20 23:45:21 +00:00
Jonathan G Rennison
3861968765 Enable setting semaphore/electric type of signals on bridges/tunnels. 2016-02-20 23:44:21 +00:00
Jonathan G Rennison
41e0d65d6a Merge branch 'progsig-sx' into jgrpp 2016-01-31 20:56:22 +00:00
Jonathan G Rennison
1e9433e0ff progsig: Fix signal dependency being left dangling after cycling side. 
If the target of a programmable signal dependency was cycled to the
other side, the dependency was not cleared.
As the dependency was then no longer valid, it was not cleared by the
programmable signal.
Deleting the programmable signal and then the target signal resulted
in a crash.
 2016-01-31 20:56:11 +00:00
Jonathan G Rennison
a671f40fc8 Merge branch 'save_ext' into tracerestrict-sx 2016-01-20 22:02:14 +00:00
Jonathan G Rennison
69f3844d2e Merge branch 'tracerestrict-sx' into jgrpp 
Conflicts:
	src/lang/english.txt
	src/settings_gui.cpp
	src/settings_type.h
	src/table/settings.ini
 2015-12-09 01:03:37 +00:00
Jonathan G Rennison
a93714a720 Add setting to show restricted electric signals using the default sprites. 
This is to improve visual distinctiveness of restricted signals when
using signal GRFs.
This defaults to off.
 2015-12-09 01:01:37 +00:00
Jonathan G Rennison
8edf5e0a34 Special case OpenGFX as a "base" set to allow recolouring signals. 2015-12-08 21:40:04 +00:00
Jonathan G Rennison
5b1fe71552 Merge branch 'tracerestrict-sx' into jgrpp 
Conflicts:
	src/rail_cmd.cpp
 2015-11-24 20:30:19 +00:00
Jonathan G Rennison
4d484a858f Fix attempts to recolour signal sprites from GRFs. 2015-11-24 19:59:40 +00:00
Jonathan G Rennison
169a979737 Merge branch 'signal_tunnels_bridges-sx' into jgrpp 
Conflicts:
	src/tunnelbridge.h

(Fixup zoom level changes).
 2015-11-01 14:07:55 +00:00
Jonathan G Rennison
95a329a4b9 Fix signals on far side of bridge not being updated when adding/removing signals. 2015-11-01 14:05:50 +00:00
Jonathan G Rennison
b3e03e8cf9 Fix middle of bridge not being redrawn when adding removing signals. 2015-11-01 14:05:22 +00:00
Jonathan G Rennison
e07e4fdb8e Merge branch 'master' into signal_tunnels_bridges 2015-11-01 14:02:13 +00:00
Jonathan G Rennison
8d19727c93 Merge branch 'save_ext' into jgrpp 
Conflicts:
	src/pathfinder/follow_track.hpp
 2015-10-31 10:53:00 +00:00
Jonathan G Rennison
3b60379a42 Merge branch 'signal_tunnels_bridges-sx' into jgrpp 2015-10-31 01:31:48 +00:00
Jonathan G Rennison
5d774e5844 Merge branch 'signal_tunnels_bridges' into signal_tunnels_bridges-sx 2015-10-31 01:31:38 +00:00
Jonathan G Rennison
654afdc113 Fix removing signals from bridges not updating adjacent signals. 
Fix minor whitespace/code issues.
 2015-10-31 01:30:08 +00:00
frosch
ade25fff71 (svn r27427) -Fix: Use the NewGRF railtype sorting order in the infrastructure window. 2015-10-30 17:24:30 +00:00
frosch
2d636266f5 (svn r27427) -Fix: Use the NewGRF railtype sorting order in the infrastructure window. 2015-10-30 17:24:30 +00:00
Jonathan G Rennison
6c5b86bd21 Merge branch 'progsig-sx' into jgrpp 2015-10-03 14:34:01 +01:00
Jonathan G Rennison
0577d7cbf8 progsig: Fix test remove rail action clearing signal programs. 
This could be triggered by using shift, using the land info window, etc.
 2015-10-03 14:28:47 +01:00
Jonathan G Rennison
e257b23cba Merge branch 'tracerestrict-sx' into jgrpp 2015-08-25 18:26:52 +01:00
Jonathan G Rennison
38aaf8a921 Fix compilation on legacy compilers. 2015-08-25 18:22:18 +01:00
Jonathan G Rennison
f2d0c3a441 Merge branch 'tracerestrict-sx' into jgrpp 
Conflicts:
	src/gfxinit.cpp
	src/rail_cmd.cpp
	src/table/sprites.h
 2015-08-20 00:39:26 +01:00
Jonathan G Rennison
8faead7e7a Graphically indicate restricted signals by recolouring the signal post. 
Recolour signal posts from grey to blue for restricted signals which
are not semaphores and are not custom sprites.
 2015-08-19 21:56:22 +01:00
Jonathan G Rennison
55af40c456 Merge branch 'signal_tunnels_bridges-sx' into jgrpp 2015-08-16 17:34:04 +01:00
Jonathan G Rennison
a5f00c1df5 Merge branch 'signal_tunnels_bridges' into signal_tunnels_bridges-sx 2015-08-16 17:33:11 +01:00
Jonathan G Rennison
20f1f48983 Fix add/removing signals on bridges/tunnels not checking train occupancy. 
Fix compiler warning.
 2015-08-16 17:31:34 +01:00
Jonathan G Rennison
29c4f244f3 Merge branch 'master' into tracerestrict 
Conflicts:
	src/pathfinder/yapf/yapf_costrail.hpp
 2015-08-15 00:28:14 +01:00
Jonathan G Rennison
7ed93f9211 Merge branch 'enhanced_viewport_overlay-sx' into jgrpp 
town_gui.cpp updated due to struct CommandContainer change.

Conflicts:
	src/command.cpp
	src/command_type.h
	src/gfxinit.cpp
	src/openttd.cpp
	src/pbs.cpp
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/saveload/saveload.cpp
	src/stdafx.h
	src/train_cmd.cpp
	src/viewport_type.h
	src/window_type.h
 2015-08-05 21:54:11 +01:00
Jonathan G Rennison
e24839ed65 Merge branch 'master' into enhanced_viewport_overlay 
Notes on conflict resolution:
* MarkTileDirtyByTile gained an extra param on both sides of the merge
  Move bridge level offset to be after zoom level param, as it's used less.
* Add zoom level params to MarkBridgeDirty functions
* Fix undefined behaviour in colour_index cycling in ViewportMapDraw

Conflicts:
	src/clear_cmd.cpp
	src/pbs.cpp
	src/rail_cmd.cpp
	src/toolbar_gui.cpp
	src/train_cmd.cpp
	src/vehicle.cpp
	src/viewport.cpp
	src/viewport_func.h
 2015-08-05 21:25:13 +01:00
patch-import
536a95dfd0 Import combined Enhanced viewport: zoom out, overlays & tooltips (r53_27127) patch 
https://www.tt-forums.net/viewtopic.php?f=33&t=53394
 2015-08-05 21:24:30 +01:00