591d2ee8b9
Merge branch 'ingame_rivers' into jgrpp
...
Conflicts:
src/settings_gui.cpp
src/settings_type.h
9 years ago
9c75a3c477
Enable building rivers in-game.
...
Controlled by setting, default off.
9 years ago
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
9 years ago
536a95dfd0
Import combined Enhanced viewport: zoom out, overlays & tooltips (r53_27127) patch
...
https://www.tt-forums.net/viewtopic.php?f=33&t=53394
9 years ago
9c75b61e5f
(svn r27254) -Fix [FS#6264]: When building a lock on DC_AUTO-removable water-based objects, the water class was always set to canal.
9 years ago
dc2b4f2498
(svn r26879) -Codechange: remove most MayHaveBridgeAbove calls since the data is now always accessible
10 years ago
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
10 years ago
0f44dfe473
(svn r26344) -Change [FS#5907]: Do not flood shores of type MP_TREE needlessly (MJP)
11 years ago
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)
11 years ago
83c2c96b74
(svn r25229) -Feature: [NewGRF] Variable 0x82 for canals and rivers (dike map)
11 years ago
0278d192c6
(svn r25220) -Change [FS#Eddi]: Consider map border as water wrt. river/canal continuation.
11 years ago
5f6e789e1f
(svn r24972) -Fix [FS#5258]: do not make overbuilding rivers with canals insanely expensive; there is no real need to fill the river with dirt first, just excavate it a bit and build borders
12 years ago
c84ca4d500
(svn r24924) -Fix (r24923): Make sure that autoslope on steep coast tiles cannot not leave invalid canals
12 years ago
e264ab19f9
(svn r24923) -Fix [FS#5441]: When an object built on a river is removed, restore the river, if possible also on slopes (based on patch by Supercheese)
12 years ago
336a93a9d8
(svn r24846) -Add: Advanced settings to disable certain sound effects.
12 years ago
2aa43d6c8b
(svn r24284) -Codechange: Remove NewsSubtypes and directly use NewsTypes and NewsFlag instead.
12 years ago
808f1151c2
(svn r23920) -Fix: Consider only the middle tile of a lock for lock-infrastructure costs. The other two tiles may be owned by other companies. Also do not count the middle tile of a lock as canal, independent of whether it is build on ground or river slope.
13 years ago
0cfe86cead
(svn r23735) -Codechange: remove ~50 includes from headers that weren't needed
13 years ago
efe0fcf48d
(svn r23725) -Fix (r23723): compile before commit
13 years ago
f884be58e5
(svn r23724) -Codechange: split of the check to see if ambient sounds are enabled to a header file allowing compilers to inline that check
13 years ago
7975bedc23
(svn r23723) -Codechange: speedup flood checks a bit
13 years ago
0e273d27ae
(svn r23686) -Fix [FS#4921] (r23413): Infrastructure count of canals/locks/ship depots wasn't updated properly when a company went into bankruptcy or was taken over.
13 years ago
bc78328918
(svn r23622) -Add: a set of events to trigger in a GameScript
13 years ago
38c6c723f3
(svn r23512) -Change [FS#4872]: Allow to place locks also on river rapids and restore rivers, if locks are deleted
13 years ago
8b9d2a8a47
(svn r23443) -Fix (r23413): Building of locks in SE failed.
13 years ago
796fe54a2f
(svn r23413) -Add: Company infrastructure counts for canals.
13 years ago
af1b3cc070
(svn r23355) -Codechange: rename all AI* to Script* (Rubidium)
13 years ago
11bfbc2e02
(svn r23284) -Fix [FS#4845]: Pathfinders go haywire when you build a lock over a ship going perpendicular to the axis of the new lock
13 years ago
36e61e08b3
(svn r23160) -Fix: wrong comments in a lot of TileTypeProcs definitions
13 years ago
109d15410e
(svn r23116) -Fix (r23114): Ambient sound effect callback was called for unsupported tile types.
13 years ago
84a103e112
(svn r23114) -Feature: [NewGRF] Ambient sound effect callback.
13 years ago
0e2d2b2317
(svn r23108) -Codechange: more uint -> int / byte -> int conversions for Z related variables
13 years ago
fb9fb416a1
(svn r23107) -Codechange: let GetSlopePixelZ and TerraformTile tile type functions use int z as well
13 years ago
70faeeaba9
(svn r23106) -Codechange: pass int* to GetTileSlope and friends
13 years ago
db14361d28
(svn r23099) -Codechange: remove pointless multiplications by TILE_HEIGHT for the water/river code
13 years ago
f7297d5c3a
(svn r23094) -Codechange: add a default NULL to GetFoundationSlope and use it
13 years ago
bcb93b3b75
(svn r23093) -Codechange: add a default NULL for the Z of GetTileSlope and use it
13 years ago
de980ef0f9
(svn r23091) -Codechange: rename some Get*Z functions to Get*PixelZ functions if they return the Z in pixels (like TilePixelHeight)
13 years ago
5477ac3eb1
(svn r22773) -Add: Some grass around rivers in desert areas.
13 years ago
ba358638a8
(svn r22646) -Codechange: Simplify MP_WATER map accessors, esp. for locks and depots. (based on patched by adf88 and michi_cc)
13 years ago
f182f6e675
(svn r22638) -Fix: Keep the previous owner of the upper and lower lock parts if they are built on existing water.
13 years ago
3e619faeaf
(svn r22110) -Codechange: Remove WaterDrawTileStruct and use DrawTileSprites/DrawTileSeqStruct instead.
14 years ago
415724ff38
(svn r22108) -Codechange: Replace some magic with some other magic though less easy to break.
14 years ago
9f8a684460
(svn r22107) -Cleanup (r1903): Remove unused struct.
14 years ago
cb2c7f871f
(svn r22018) -Cleanup: remove some (now) unneeded includes of functions.h
14 years ago
a66e32efb5
(svn r21993) -Fix (r19720): When building a lock on dry land costs for clearing water were deducted rather than for building canals
14 years ago
4aa45d8742
(svn r21953) -Remove [FS#4456]: the non-uniform stations setting. Support for uniform stations has been broken for over a year
14 years ago
5a355daa5b
(svn r21290) -Codechange: Add HasTileWaterGround() to deduplicate some tests.
14 years ago
39f95fabe2
(svn r20763) -Fix [FS#4113](r20749): The bridgetest on building shipdepots can no longer rely on being only called for clear water tiles.
14 years ago
ffe67c9171
(svn r20749) -Fix: allow overbuilding objects with buoys and ship depots
14 years ago
Jonathan G Rennison
patch-import
frosch
rubidium
planetmaker
zuu
yexo
michi_cc
truebrain
smatz