Commit Graph

115 Commits

Author SHA1 Message Date
Jonathan G Rennison
3a75f13874 Allow drive-through road stops to be one-way 2020-10-28 00:27:48 +00:00
Jonathan G Rennison
cbdd9f84d8 Merge branch 'master' into jgrpp
# Conflicts:
#	src/console_gui.cpp
#	src/lang/korean.txt
#	src/video/sdl2_v.cpp
#	src/video/sdl2_v.h
#	src/window.cpp
#	src/window_gui.h
2019-11-12 18:43:10 +00:00
S. D. Cloudt
13cc8a0cee Cleanup: Removed SVN headers 2019-11-10 17:59:20 +00: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
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
peter1138
f538179878 Feature: Multi-tile docks and docking points. 2019-06-30 16:46:32 +02:00
peter1138
c02ef3e456 Feature: Add NotRoadTypes (NRT) 2019-05-01 21:36:27 +02:00
J0an Josep
a53f13cff6 Fix #6805: Clear some m8 bits when making some tiles. 2018-08-04 08:59:22 +02:00
Jonathan G Rennison
912ddc85d4 Merge remote-tracking branch 'J0anJosep/MapArrayGrid-m8' into jgrpp
# Conflicts:
#	docs/landscape_grid.html
2018-07-30 02:05:52 +01:00
J0an Josep
9cabab03b1 Fix #6805: Clear some m8 bits when making some tiles. 2018-07-28 16:00:33 +02:00
Jonathan G Rennison
9e1e074c2b Update existing assertions to log tile information where suitable 2018-07-26 19:13:35 +01:00
rubidium
f3b79480ed (svn r26878) -Change: move m6 to TileExtended to keep Tile 8 bytes and thus better alignable 2014-09-21 11:23:33 +00:00
rubidium
982f5a6aa2 (svn r26878) -Change: move m6 to TileExtended to keep Tile 8 bytes and thus better alignable 2014-09-21 11:23:33 +00:00
frosch
6631b9e5e3 (svn r25221) -Fix: IsCompatibleTrainStationTile() is not a symmetric function. Clarify the parameters and fix the cases were they were swapped. 2013-05-06 13:05:04 +00:00
frosch
b9528c3aa0 (svn r25221) -Fix: IsCompatibleTrainStationTile() is not a symmetric function. Clarify the parameters and fix the cases were they were swapped. 2013-05-06 13:05:04 +00:00
rubidium
6e9122828e (svn r22406) -Document: some more "random-ish" tidbits 2011-05-01 19:51:52 +00:00
rubidium
5a620d1c65 (svn r22406) -Document: some more "random-ish" tidbits 2011-05-01 19:51:52 +00:00
alberth
9f3845227e (svn r21273) -Codechange: Return values should start at the same line. 2010-11-20 15:44:24 +00:00
alberth
ab50f74d7f (svn r21273) -Codechange: Return values should start at the same line. 2010-11-20 15:44:24 +00:00
yexo
a10ce551c9 (svn r20717) -Fix [FS#4103]: water class was not set for stations 2010-09-01 23:41:56 +00:00
yexo
7b0fd807fb (svn r20717) -Fix [FS#4103]: water class was not set for stations 2010-09-01 23:41:56 +00:00
rubidium
5a7d6249af (svn r20622) -Codechange: unify [GS]et[Statation|Object|Industry|House]AnimationFrame 2010-08-26 14:45:45 +00:00
rubidium
4efa2efdbb (svn r20622) -Codechange: unify [GS]et[Statation|Object|Industry|House]AnimationFrame 2010-08-26 14:45:45 +00:00
rubidium
8975ef1f7b (svn r20446) -Codechange: unify the location of the water class 2010-08-11 14:14:06 +00:00
rubidium
ab5b0ceff2 (svn r20446) -Codechange: unify the location of the water class 2010-08-11 14:14:06 +00:00
yexo
e6025117e2 (svn r20375) -Codechange: make sure the watertype for existing airport tiles is set to invalid 2010-08-05 12:06:53 +00:00
yexo
f8b7163b34 (svn r20375) -Codechange: make sure the watertype for existing airport tiles is set to invalid 2010-08-05 12:06:53 +00:00
rubidium
f09a74a996 (svn r19812) -Codechange: give some unnamed enums a name or, in case they consisted of unrelated values use static const (u)int 2010-05-13 09:44:44 +00:00
rubidium
398418b8fa (svn r19812) -Codechange: give some unnamed enums a name or, in case they consisted of unrelated values use static const (u)int 2010-05-13 09:44:44 +00:00
yexo
1975efea58 (svn r19195) -Codechange: actually draw newgrf airport tiles 2010-02-22 14:16:41 +00:00
yexo
880fedc192 (svn r19195) -Codechange: actually draw newgrf airport tiles 2010-02-22 14:16:41 +00:00
yexo
5d169e47fa (svn r18922) -Doc: add doxygen documentation to all functions in station_map.h 2010-01-26 23:25:28 +00:00
yexo
4df90cddee (svn r18922) -Doc: add doxygen documentation to all functions in station_map.h 2010-01-26 23:25:28 +00:00
yexo
47527ca67a (svn r18921) -Codechange: make the preconditions for Get/Set CustomStationSpecIndex a bit more strict 2010-01-26 23:03:47 +00:00
yexo
7f998ce80d (svn r18921) -Codechange: make the preconditions for Get/Set CustomStationSpecIndex a bit more strict 2010-01-26 23:03:47 +00:00
yexo
077cdefc9b (svn r18876) -Codechange: make sure m4 is always 0 for non-railroad station tiles 2010-01-21 13:34:05 +00:00
yexo
18e7ec6b3e (svn r18876) -Codechange: make sure m4 is always 0 for non-railroad station tiles 2010-01-21 13:34:05 +00:00
yexo
1486552f99 (svn r18857) -Codechange: don't rely on the fact that all airports are rectangular 2010-01-18 12:32:50 +00:00
yexo
ab68f08886 (svn r18857) -Codechange: don't rely on the fact that all airports are rectangular 2010-01-18 12:32:50 +00:00
yexo
bfb2635c58 (svn r18845) -Codechange: introduce AirportTileSpec and use it for animation 2010-01-17 14:22:07 +00:00
yexo
830af8ee77 (svn r18845) -Codechange: introduce AirportTileSpec and use it for animation 2010-01-17 14:22:07 +00:00
rubidium
99d46e0ad7 (svn r17248) -Fix: add GPL license notice where appropriate 2009-08-21 20:21:05 +00:00
rubidium
7fbc33dae1 (svn r17248) -Fix: add GPL license notice where appropriate 2009-08-21 20:21:05 +00:00
rubidium
1c5ae254ab (svn r16941) -Document: some map accessors 2009-07-24 15:27:31 +00:00
rubidium
9e9c397bf6 (svn r16941) -Document: some map accessors 2009-07-24 15:27:31 +00:00
rubidium
196856f54e (svn r16939) -Codechange: s/RailwayStation/RailStation/ to unify the way it's written. 2009-07-24 11:47:12 +00:00
rubidium
cf38a5bee6 (svn r16939) -Codechange: s/RailwayStation/RailStation/ to unify the way it's written. 2009-07-24 11:47:12 +00:00
rubidium
00a9b2fd3d (svn r16938) -Codechange: introduce helper function to tell whether a tile is either a rail station or rail waypoint tile 2009-07-24 11:15:11 +00:00
rubidium
2c6b5237f6 (svn r16938) -Codechange: introduce helper function to tell whether a tile is either a rail station or rail waypoint tile 2009-07-24 11:15:11 +00:00
rubidium
100cb17fa8 (svn r16909) -Fix [FS#2996]: NewGRF stations would be triggering assertions all over the place when using the more advanced station types.
-Change: make (rail) waypoints sub classes of 'base stations', make buoys waypoints and unify code between them where possible.
2009-07-22 08:59:57 +00:00