dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
49,723 Commits 1 Branch 0 Tags
65d5d13a08fc40ddb14bd99c5f7f672f7fae2b16
Commit Graph

58 Commits

Author SHA1 Message Date
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
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
c02ef3e456 Feature: Add NotRoadTypes (NRT) 2019-05-01 21:36:27 +02:00
Jonathan G Rennison
ae15c96c1a Merge branch 'master' into jgrpp 
# Conflicts:
#	docs/landscape.html
#	docs/landscape_grid.html
#	src/bridge_gui.cpp
#	src/bridge_map.h
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/rail_map.h
#	src/rail_type.h
#	src/road_map.h
#	src/saveload/afterload.cpp
#	src/saveload/map_sl.cpp
#	src/saveload/saveload.cpp
#	src/script/api/script_rail.cpp
#	src/station_cmd.cpp
#	src/tunnel_map.h
#	src/tunnelbridge_cmd.cpp
 2018-07-26 20:54:13 +01:00
Jonathan G Rennison
9e1e074c2b Update existing assertions to log tile information where suitable 2018-07-26 19:13:35 +01:00
Peter Nelson
5db883fbe9 Change: Move rail type bits from m3 to m8. 2018-07-26 13:27:40 +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
93a43da809 Chunnel: Prevent chunnels from intersecting with each other. 2017-03-05 19:13:42 +00:00
Jonathan G Rennison
ad15b47f72 Chunnel: Fix setting of tunnel ID in load conversion, add method to set ID. 2017-03-05 14:39:06 +00:00
Jonathan G Rennison
afd8c6b867 Chunnel: Increase tunnel pool size, make tunnel IDs 32 bit. 
Add lookup mechanism for tunnel IDs which don't fit in 16 bits in M2.
 2017-03-05 14:39:01 +00:00
Jonathan G Rennison
ab38623ea6 Chunnel: Adjust documentation and whitespace in tunnel_map.h 2017-03-04 12:43:48 +00:00
Jonathan G Rennison
21bbb42d7e Chunnel: Adjust arguments of IsTunnelInWay 2017-03-04 12:23: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
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
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
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
rubidium
94d326dc7d (svn r23167) -Codechange [FS#4818]: make IsTunnelInWay z parameters signed as well (hackalittlebit) 2011-11-08 19:44:41 +00:00
rubidium
704dcc0a47 (svn r23167) -Codechange [FS#4818]: make IsTunnelInWay z parameters signed as well (hackalittlebit) 2011-11-08 19:44:41 +00:00
rubidium
9467b7c6d6 (svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header 2010-01-15 16:41:15 +00:00
rubidium
82fc28f77f (svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header 2010-01-15 16:41:15 +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
smatz
e57699d8c0 (svn r15643) -Fix [FS#2711]: be more strict with zeroing unused map array bits 2009-03-08 16:10:39 +00:00
smatz
e124aa8fd6 (svn r15643) -Fix [FS#2711]: be more strict with zeroing unused map array bits 2009-03-08 16:10:39 +00:00
rubidium
9f2a906bc1 (svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks. 
-Feature: allow building road stops on road/tram tracks of competitors.
 2009-03-02 22:57:47 +00:00
rubidium
7831346ef8 (svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks. 
-Feature: allow building road stops on road/tram tracks of competitors.
 2009-03-02 22:57:47 +00:00
rubidium
e0e1bf76a2 (svn r12986) -Codechange: move the landscape and transport related types from openttd.h to their own headers. 2008-05-07 09:07:19 +00:00
rubidium
7ccda80b0b (svn r12986) -Codechange: move the landscape and transport related types from openttd.h to their own headers. 2008-05-07 09:07:19 +00:00
rubidium
1ce0b03bf0 (svn r12971) -Documentation: add @file in files that missed them and add something more than whitespace as description of files that don't have a description. 2008-05-06 15:11:33 +00:00
rubidium
d03994098b (svn r12971) -Documentation: add @file in files that missed them and add something more than whitespace as description of files that don't have a description. 2008-05-06 15:11:33 +00:00
rubidium
f82aeb82c5 (svn r11701) -Codechange: removal unnecessary inclusions of map.h (and split map.h). 2007-12-26 11:45:43 +00:00
rubidium
2786d789a1 (svn r11701) -Codechange: removal unnecessary inclusions of map.h (and split map.h). 2007-12-26 11:45:43 +00:00
rubidium
8ebdfb258f (svn r11674) -Codechange: refactor some functions out of macros.h into more logical locations. 2007-12-21 19:21:21 +00:00
rubidium
01e20c9140 (svn r11674) -Codechange: refactor some functions out of macros.h into more logical locations. 2007-12-21 19:21:21 +00:00
rubidium
be923601bf (svn r11669) -Codechange: refactor tile.h -> tile_type.h and tile_map.h 2007-12-19 23:26:02 +00:00
rubidium
5b49e75453 (svn r11669) -Codechange: refactor tile.h -> tile_type.h and tile_map.h 2007-12-19 23:26:02 +00:00
rubidium
efc18e8ab3 (svn r11663) -Codechange: moving of the road related types and functions. 2007-12-18 20:38:16 +00:00
rubidium
e4ef359f47 (svn r11663) -Codechange: moving of the road related types and functions. 2007-12-18 20:38:16 +00:00
rubidium
0995194162 (svn r11661) -Codechange: some header reworks in order to try to reduce the compile time of OpenTTD by reduce the amount of circular-ish dependencies. 2007-12-18 19:52:14 +00:00
rubidium
f56a354d31 (svn r11661) -Codechange: some header reworks in order to try to reduce the compile time of OpenTTD by reduce the amount of circular-ish dependencies. 2007-12-18 19:52:14 +00:00
smatz
926fe5c9e9 (svn r11644) -Codechange: merge some functions from tunnel_map.h and bridge_map.h into tunnelbridge_map.h 2007-12-16 15:38:51 +00:00
smatz
3cee0abdba (svn r11644) -Codechange: merge some functions from tunnel_map.h and bridge_map.h into tunnelbridge_map.h 2007-12-16 15:38:51 +00:00
skidd13
c0a2c0c23e (svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style 2007-11-19 21:02:30 +00:00
skidd13
71c4325c50 (svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style 2007-11-19 21:02:30 +00:00
rubidium
d0fa4eb9de (svn r10258) -Codechange: as we are now using int64 all over the place, it's better to use int64 variables in the string generating too instead of packing them into two int32s. 
-Fix: some displays of money were wrong.
 2007-06-21 17:25:17 +00:00
rubidium
9c0944aa09 (svn r10258) -Codechange: as we are now using int64 all over the place, it's better to use int64 variables in the string generating too instead of packing them into two int32s. 
-Fix: some displays of money were wrong.
 2007-06-21 17:25:17 +00:00