Commit Graph

192 Commits

Author SHA1 Message Date
Jonathan G Rennison
e3b85f617b Merge branch 'master' into jgrpp
# Conflicts:
#	src/station_cmd.cpp
2019-03-13 18:36:36 +00:00
Johannes E. Krause
234f1007f7 Cleanup: Remove questionable syntax in HQ size calculation 2019-03-13 07:47:32 +00:00
Jonathan G Rennison
08998d95ba De-virtualise tile animation calls 2019-01-19 04:28:51 +00:00
Jonathan G Rennison
e3207a77fb Add setting to control if and how land purchasing is permitted 2018-11-26 18:25:17 +00:00
Jonathan G Rennison
10320747a9 Allow purchasing a region of tile at once, by dragging 2018-11-23 19:07:13 +00:00
Jonathan G Rennison
46b1ea81e4 Add company rate limit for land area purchasing 2018-11-23 18:47:36 +00:00
Jonathan G Rennison
9e1e074c2b Update existing assertions to log tile information where suitable 2018-07-26 19:13:35 +01:00
Jonathan G Rennison
56bde8ce18 Add setting to allow placing all NewGRF objects under bridges 2018-07-24 03:22:33 +01:00
Jonathan G Rennison
56be293107 Merge branch 'master' into jgrpp
# Conflicts:
#	src/blitter/32bpp_anim.cpp
#	src/blitter/32bpp_anim.hpp
#	src/blitter/32bpp_anim_sse2.cpp
#	src/blitter/32bpp_base.cpp
#	src/blitter/32bpp_base.hpp
#	src/ground_vehicle.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/main_gui.cpp
#	src/newgrf_house.cpp
#	src/newgrf_house.h
#	src/town_cmd.cpp
#	src/vehicle_base.h
#	src/viewport_gui.cppp
2018-05-25 18:29:17 +01:00
PeterN
4cebebcf68 Change: Add CargoTypes type for cargo masks. (#6790) 2018-05-21 22:08:39 +01:00
Jonathan G Rennison
c83903ddb0 Merge branch 'master' into jgrpp 2016-09-26 23:15:22 +01:00
frosch
d7ee0b6fee (svn r27656) -Fix [FS#6511]: When removing objects of bankrupt companies the tiles may revert to canal. In that case also check the ownership of the canal. 2016-09-18 14:07:52 +00:00
frosch
740534440e (svn r27656) -Fix [FS#6511]: When removing objects of bankrupt companies the tiles may revert to canal. In that case also check the ownership of the canal. 2016-09-18 14:07:52 +00: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
rubidium
dc2b4f2498 (svn r26879) -Codechange: remove most MayHaveBridgeAbove calls since the data is now always accessible 2014-09-21 11:24:51 +00:00
rubidium
9daf7e749c (svn r26879) -Codechange: remove most MayHaveBridgeAbove calls since the data is now always accessible 2014-09-21 11:24:51 +00:00
rubidium
2be4215f43 (svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values 2014-04-23 20:13:33 +00:00
rubidium
0463dbdc9e (svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values 2014-04-23 20:13:33 +00:00
frosch
3484660ab1 (svn r26240) -Codechange: Pass the GRFFile to GetErrorMessageFromLocationCallbackResult instead of the GRFID. 2014-01-12 18:00:19 +00:00
frosch
73c6565cf2 (svn r26240) -Codechange: Pass the GRFFile to GetErrorMessageFromLocationCallbackResult instead of the GRFID. 2014-01-12 18:00:19 +00:00
planetmaker
3cff961713 (svn r25938) -Fix [FS#5798] (r25876): Don't mistake a lighthouse for a transmitter and vice versa 2013-11-04 17:59:58 +00:00
planetmaker
86a658ca21 (svn r25938) -Fix [FS#5798] (r25876): Don't mistake a lighthouse for a transmitter and vice versa 2013-11-04 17:59:58 +00:00
planetmaker
c146d59a25 (svn r25880) -Fix (r25875): Special rules for world generation needs be considered in one more place 2013-10-18 15:23:41 +00:00
planetmaker
95b973ec6c (svn r25880) -Fix (r25875): Special rules for world generation needs be considered in one more place 2013-10-18 15:23:41 +00:00
planetmaker
8c86b8c668 (svn r25879) -Change: Allow to remove unowned objects unless they have the 'unremovable' flag 2013-10-17 21:47:16 +00:00
planetmaker
70e4074a4c (svn r25879) -Change: Allow to remove unowned objects unless they have the 'unremovable' flag 2013-10-17 21:47:16 +00:00
planetmaker
91c3c20cc5 (svn r25876) -Codechange: Unify object placement during map creation 2013-10-17 21:41:17 +00:00
planetmaker
8033162bb8 (svn r25876) -Codechange: Unify object placement during map creation 2013-10-17 21:41:17 +00:00
planetmaker
3eed8402f1 (svn r25875) -Change: In scenario editor allow to build all objects which were available at any point in the past to support building scenarios with historic items 2013-10-17 21:37:25 +00:00
planetmaker
2ee9a2b5e7 (svn r25875) -Change: In scenario editor allow to build all objects which were available at any point in the past to support building scenarios with historic items 2013-10-17 21:37:25 +00:00
planetmaker
7ac9dd08ea (svn r25871) -Codechange: Move placement rules for lighthouses to its own function 2013-10-17 21:25:15 +00:00
planetmaker
0bc86ff9ee (svn r25871) -Codechange: Move placement rules for lighthouses to its own function 2013-10-17 21:25:15 +00:00
planetmaker
c391cdaf33 (svn r25870) -Codechange: Move placement rules for transmitter to its own function 2013-10-17 21:22:39 +00:00
planetmaker
0a481d5ea6 (svn r25870) -Codechange: Move placement rules for transmitter to its own function 2013-10-17 21:22:39 +00:00
zuu
e124838db5 (svn r25849) -Codechange: Introduce IsTileFlat to not compute full slope information for situations when we only want to know if a tile is flat or not (cirdan, LordAro) 2013-10-12 22:07:58 +00:00
zuu
dfb5663313 (svn r25849) -Codechange: Introduce IsTileFlat to not compute full slope information for situations when we only want to know if a tile is flat or not (cirdan, LordAro) 2013-10-12 22:07:58 +00:00
frosch
b70d64200e (svn r25835) -Change: Increase the total number of object types from 256 to 64000. 2013-10-12 16:31:55 +00:00
frosch
ac599625da (svn r25835) -Change: Increase the total number of object types from 256 to 64000. 2013-10-12 16:31:55 +00:00
frosch
d9d978d6d2 (svn r25833) -Codechange: Move ObjectType from map array into pool item. 2013-10-12 16:30:42 +00:00
frosch
35d7e8bca4 (svn r25833) -Codechange: Move ObjectType from map array into pool item. 2013-10-12 16:30:42 +00:00
frosch
478500abbc (svn r25832) -Codechange: Reduce variety of object type test functions. 2013-10-12 16:30:22 +00:00
frosch
2080a8c16f (svn r25832) -Codechange: Reduce variety of object type test functions. 2013-10-12 16:30:22 +00:00
frosch
08cedd77b2 (svn r25753) -Fix [FS#5725] (r25557): If old savegames contain bridges over owned land, keep on drawing the bridges nevertheless. 2013-09-02 18:37:44 +00:00
frosch
938ae194a5 (svn r25753) -Fix [FS#5725] (r25557): If old savegames contain bridges over owned land, keep on drawing the bridges nevertheless. 2013-09-02 18:37:44 +00:00
rubidium
5811e3eae7 (svn r23842) -Change [FS#5001, FS#5002]: do not let towns (ever) remove objects 2012-01-22 21:26:42 +00:00
rubidium
60a52404e3 (svn r23842) -Change [FS#5001, FS#5002]: do not let towns (ever) remove objects 2012-01-22 21:26:42 +00:00
rubidium
de4ecdb876 (svn r23763) -Fix [FS#4956]: check whether a water tile is really empty when overbuilding it with an object 2012-01-06 19:49:44 +00:00
rubidium
9d958ff581 (svn r23763) -Fix [FS#4956]: check whether a water tile is really empty when overbuilding it with an object 2012-01-06 19:49:44 +00:00
rubidium
d5eeab43b7 (svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files 2012-01-03 21:32:51 +00:00
rubidium
6d6be50ae0 (svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files 2012-01-03 21:32:51 +00:00