Diffusion 0 A.D. Public Repository rP26483

[Art] New trees, bushes, and rocks.
rP26483
Actions

Description

[Art] New trees, bushes, and rocks.

New "Bush" mixin

Note, the Badlands rock actors have been renamed. Might break some maps.

Details

Committed

wowgetoffyourcellphone

Feb 25 2022, 10:31 AM

Parents

rP26482: [Gameplay - Alpha 26] More Han Refactoring

Branches

Unknown

Tags

Unknown

Build Status

Buildable 19635
Build 46986: Post-Commit Build	Jenkins
Build 46985: Post-Commit Build (macOS)	Jenkins

Event Timeline

wowgetoffyourcellphone committed rP26483: [Art] New trees, bushes, and rocks..Feb 25 2022, 10:31 AM

Harbormaster completed building B19635: rP26483: [Art] New trees, bushes, and rocks..Feb 25 2022, 10:43 AM

Stan mentioned this in rP26496: Fix stone mine actors on maps after Phab:rP26483..Feb 26 2022, 11:52 PM

Langbart mentioned this in D4549: fix mainland: decorative bushes spawnig inside the player cc.Mar 16 2022, 12:50 PM

Langbart awarded a token.

Changes (45)

Path

Size

ps/

trunk/

binaries/

data/

mods/

public/

art/

actors/

flora/

trees/

oak_hungarian_autumn.xml

geology/

stonemine_desert.xml

	stonemine_desert_badlands_large.xml
	stonemine_desert_badlands_new.xml

stonemine_desert_badlands_new.xml

	stonemine_desert_badlands_small.xml
	stonemine_desert_badlands_small_new.xml

stonemine_desert_badlands_small_new.xml

stonemine_desert_quarry.xml

stonemine_desert_small.xml

props/

flora/

bush_temperate_autumn.xml

meshes/

gaia/

textures/

skins/

gaia/

maple_tree_autumn_a.png

maple_tree_autumn_b.png

maple_tree_autumn_c.png

oak_holly_autumn_1.png

oak_holly_autumn_2.png

oak_holly_autumn_3.png

oak_hungarian_autumn_4.png

oak_hungarian_autumn_5.png

oak_hungarian_autumn_6.png

simulation/

templates/

gaia/

rock/

tree/

bush_mediterranean.xml

bush_temperate_autumn.xml

bush_temperate_winter.xml

mixins/

rP26483

View Options

ps/trunk/binaries/data/mods/public/art/actors/flora/bushes/

View Options

ps/trunk/binaries/data/mods/public/art/actors/flora/bushes/medit_scrub_01.xml

View Options

ps/trunk/binaries/data/mods/public/art/actors/flora/trees/acacia.xml

View Options

ps/trunk/binaries/data/mods/public/art/actors/flora/trees/acacia_large.xml

View Options

ps/trunk/binaries/data/mods/public/art/actors/flora/trees/acacia_large_top.xml

View Options

ps/trunk/binaries/data/mods/public/art/actors/flora/trees/acacia_top.xml

View Options

ps/trunk/binaries/data/mods/public/art/actors/flora/trees/maple_autumn.xml

View Options

ps/trunk/binaries/data/mods/public/art/actors/flora/trees/oak_holly_autumn.xml

View Options

ps/trunk/binaries/data/mods/public/art/actors/flora/trees/oak_hungarian_autumn.xml

View Options

ps/trunk/binaries/data/mods/public/art/actors/geology/stonemine_desert.xml

View Options

ps/trunk/binaries/data/mods/public/art/actors/geology/stonemine_desert_badlands_large.xml

View Options

ps/trunk/binaries/data/mods/public/art/actors/geology/stonemine_desert_badlands_new.xml

View Options

ps/trunk/binaries/data/mods/public/art/actors/geology/stonemine_desert_badlands_small.xml

View Options

ps/trunk/binaries/data/mods/public/art/actors/geology/stonemine_desert_badlands_small_new.xml

View Options

ps/trunk/binaries/data/mods/public/art/actors/geology/stonemine_desert_quarry.xml

View Options

ps/trunk/binaries/data/mods/public/art/actors/geology/stonemine_desert_small.xml

View Options

ps/trunk/binaries/data/mods/public/art/actors/props/flora/bush_temperate_autumn.xml

View Options

ps/trunk/binaries/data/mods/public/art/meshes/gaia/medit_bush_01.dae

View Options

ps/trunk/binaries/data/mods/public/art/meshes/gaia/medit_bush_02.dae

View Options

ps/trunk/binaries/data/mods/public/art/meshes/gaia/medit_bush_03.dae

View Options

ps/trunk/binaries/data/mods/public/art/meshes/gaia/medit_bush_04.dae

View Options

ps/trunk/binaries/data/mods/public/art/textures/skins/gaia/maple_tree_autumn_a.png

View Options

ps/trunk/binaries/data/mods/public/art/textures/skins/gaia/maple_tree_autumn_b.png

View Options

ps/trunk/binaries/data/mods/public/art/textures/skins/gaia/maple_tree_autumn_c.png

View Options

ps/trunk/binaries/data/mods/public/art/textures/skins/gaia/oak_holly_autumn_1.png

View Options

ps/trunk/binaries/data/mods/public/art/textures/skins/gaia/oak_holly_autumn_2.png

View Options

ps/trunk/binaries/data/mods/public/art/textures/skins/gaia/oak_holly_autumn_3.png

View Options

ps/trunk/binaries/data/mods/public/art/textures/skins/gaia/oak_hungarian_autumn_4.png

View Options

ps/trunk/binaries/data/mods/public/art/textures/skins/gaia/oak_hungarian_autumn_5.png

View Options

ps/trunk/binaries/data/mods/public/art/textures/skins/gaia/oak_hungarian_autumn_6.png

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/gaia/rock/badlands_large.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/gaia/rock/badlands_small.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/gaia/tree/acacia_large.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/gaia/tree/bush_badlands.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/gaia/tree/bush_mediterranean.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/gaia/tree/bush_steppe_01.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/gaia/tree/bush_steppe_02.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/gaia/tree/bush_steppe_03.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/gaia/tree/bush_temperate.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/gaia/tree/bush_temperate_autumn.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/gaia/tree/bush_temperate_winter.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/gaia/tree/bush_tropic.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/gaia/tree/maple_autumn.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/gaia/tree/oak_holly_autumn.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/mixins/bush.xml

[Art] New trees, bushes, and rocks.rP26483Actions

Description

Details

Event Timeline

Changes (45)

rP26483

ps/trunk/binaries/data/mods/public/art/actors/flora/bushes/

ps/trunk/binaries/data/mods/public/art/actors/flora/bushes/medit_scrub_01.xml

ps/trunk/binaries/data/mods/public/art/actors/flora/trees/acacia.xml

ps/trunk/binaries/data/mods/public/art/actors/flora/trees/acacia_large.xml

ps/trunk/binaries/data/mods/public/art/actors/flora/trees/acacia_large_top.xml

ps/trunk/binaries/data/mods/public/art/actors/flora/trees/acacia_top.xml

ps/trunk/binaries/data/mods/public/art/actors/flora/trees/maple_autumn.xml

ps/trunk/binaries/data/mods/public/art/actors/flora/trees/oak_holly_autumn.xml

ps/trunk/binaries/data/mods/public/art/actors/flora/trees/oak_hungarian_autumn.xml

ps/trunk/binaries/data/mods/public/art/actors/geology/stonemine_desert.xml

ps/trunk/binaries/data/mods/public/art/actors/geology/stonemine_desert_badlands_large.xml

ps/trunk/binaries/data/mods/public/art/actors/geology/stonemine_desert_badlands_new.xml

ps/trunk/binaries/data/mods/public/art/actors/geology/stonemine_desert_badlands_small.xml

ps/trunk/binaries/data/mods/public/art/actors/geology/stonemine_desert_badlands_small_new.xml

ps/trunk/binaries/data/mods/public/art/actors/geology/stonemine_desert_quarry.xml

ps/trunk/binaries/data/mods/public/art/actors/geology/stonemine_desert_small.xml

ps/trunk/binaries/data/mods/public/art/actors/props/flora/bush_temperate_autumn.xml

ps/trunk/binaries/data/mods/public/art/meshes/gaia/medit_bush_01.dae

ps/trunk/binaries/data/mods/public/art/meshes/gaia/medit_bush_02.dae

ps/trunk/binaries/data/mods/public/art/meshes/gaia/medit_bush_03.dae

ps/trunk/binaries/data/mods/public/art/meshes/gaia/medit_bush_04.dae

ps/trunk/binaries/data/mods/public/art/textures/skins/gaia/maple_tree_autumn_a.png

ps/trunk/binaries/data/mods/public/art/textures/skins/gaia/maple_tree_autumn_b.png

ps/trunk/binaries/data/mods/public/art/textures/skins/gaia/maple_tree_autumn_c.png

ps/trunk/binaries/data/mods/public/art/textures/skins/gaia/oak_holly_autumn_1.png

ps/trunk/binaries/data/mods/public/art/textures/skins/gaia/oak_holly_autumn_2.png

ps/trunk/binaries/data/mods/public/art/textures/skins/gaia/oak_holly_autumn_3.png

ps/trunk/binaries/data/mods/public/art/textures/skins/gaia/oak_hungarian_autumn_4.png

ps/trunk/binaries/data/mods/public/art/textures/skins/gaia/oak_hungarian_autumn_5.png

ps/trunk/binaries/data/mods/public/art/textures/skins/gaia/oak_hungarian_autumn_6.png

ps/trunk/binaries/data/mods/public/simulation/templates/gaia/rock/badlands_large.xml

ps/trunk/binaries/data/mods/public/simulation/templates/gaia/rock/badlands_small.xml

ps/trunk/binaries/data/mods/public/simulation/templates/gaia/tree/acacia_large.xml

ps/trunk/binaries/data/mods/public/simulation/templates/gaia/tree/bush_badlands.xml

ps/trunk/binaries/data/mods/public/simulation/templates/gaia/tree/bush_mediterranean.xml

ps/trunk/binaries/data/mods/public/simulation/templates/gaia/tree/bush_steppe_01.xml

ps/trunk/binaries/data/mods/public/simulation/templates/gaia/tree/bush_steppe_02.xml

ps/trunk/binaries/data/mods/public/simulation/templates/gaia/tree/bush_steppe_03.xml

ps/trunk/binaries/data/mods/public/simulation/templates/gaia/tree/bush_temperate.xml

ps/trunk/binaries/data/mods/public/simulation/templates/gaia/tree/bush_temperate_autumn.xml

ps/trunk/binaries/data/mods/public/simulation/templates/gaia/tree/bush_temperate_winter.xml

ps/trunk/binaries/data/mods/public/simulation/templates/gaia/tree/bush_tropic.xml

ps/trunk/binaries/data/mods/public/simulation/templates/gaia/tree/maple_autumn.xml

ps/trunk/binaries/data/mods/public/simulation/templates/gaia/tree/oak_holly_autumn.xml

ps/trunk/binaries/data/mods/public/simulation/templates/mixins/bush.xml

[Art] New trees, bushes, and rocks.
rP26483
Actions