Skip to content

Commit

Permalink
Merge 'remotes/trunk'
Browse files Browse the repository at this point in the history
  • Loading branch information
@na-Itms
na-Itms committed Mar 28, 2020
2 parents dfb6aa6 + 624f6fa commit 4574223
Show file tree
Hide file tree
Showing 456 changed files with 3,841 additions and 2,081 deletions.
19 changes: 1 addition & 18 deletions binaries/data/mods/public/art/actors/structures/britons/barracks.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,7 @@
<actor version="1">
<castshadow/>
<group>
<variant frequency="0" name="Celtic Barracks">
<mesh>structural/brit_barracks_struct.dae</mesh>
<props>
<prop actor="props/structures/britons/barracks_props_new.xml" attachpoint="root"/>
<prop actor="props/structures/britons/barracks_palisade.xml" attachpoint="root"/>
<prop actor="props/structures/britons/barracks_props_1.xml" attachpoint="root"/>
<prop actor="props/structures/britons/barracks_struct1.xml" attachpoint="root"/>
<prop actor="props/structures/britons/barracks_weapons.xml" attachpoint="root"/>
<prop actor="props/structures/decals/celt_barracks.xml" attachpoint="root"/>
</props>
<textures>
<texture file="structural/celt_struct.dds" name="baseTex"/>
<texture file="structural/celt_struct_norm.png" name="normTex"/>
<texture file="structural/celt_struct_spec.png" name="specTex"/>
<texture file="structural/ao/brit_barracks.png" name="aoTex"/>
</textures>
</variant>
<variant frequency="1" name="Celtic Barracks test">
<variant frequency="1" name="Briton Barracks">
<mesh>structural/brit_barracks_struct.dae</mesh>
<props>
<prop actor="props/structures/britons/barracks_props_new.xml" attachpoint="root"/>
Expand Down
2 changes: 1 addition & 1 deletion binaries/data/mods/public/art/actors/structures/britons/blacksmith.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="Blacksmith">
<variant frequency="1" name="Briton Blacksmith">
<mesh>structural/brit_blacksmith.dae</mesh>
<props>
<prop actor="particle/smoke_blacksmith.xml" attachpoint="smoke"/>
Expand Down
23 changes: 1 addition & 22 deletions binaries/data/mods/public/art/actors/structures/britons/civic_centre.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,7 @@
<actor version="1">
<castshadow/>
<group>
<variant frequency="0" name="Celtic Great Hall">
<animations>
<animation event="0.5" load="0.0" name="attack_ranged" speed="100"/>
</animations>
<mesh>structural/brit_civic_centre_struct1.dae</mesh>
<props>
<prop actor="props/structures/britons/civic_centre_props_1.xml" attachpoint="root"/>
<prop actor="props/structures/britons/civic_centre_props_new.xml" attachpoint="root"/>
<prop actor="props/structures/britons/civic_centre_wood_c.xml" attachpoint="root"/>
<prop actor="props/structures/britons/civic_centre_roof.xml" attachpoint="root"/>
<prop actor="props/structures/decals/gravel_5x5.xml" attachpoint="root"/>
<prop actor="props/units/weapons/arrow_front.xml" attachpoint="loaded-projectile"/>
<prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
</props>
<textures>
<texture file="structural/celt_struct_1.dds" name="baseTex"/>
<texture file="structural/celt_struct_1_norm.png" name="normTex"/>
<texture file="structural/celt_struct_1_spec.png" name="specTex"/>
<texture file="structural/ao/brit_civic_centre.png" name="aoTex"/>
</textures>
</variant>
<variant frequency="1" name="Celtic Great Hall test">
<variant frequency="1" name="Briton Civic Center">
<animations>
<animation event="0.5" load="0.0" name="attack_ranged" speed="100"/>
</animations>
Expand Down
28 changes: 1 addition & 27 deletions binaries/data/mods/public/art/actors/structures/britons/crannog.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,7 @@
<castshadow/>
<float/>
<group>
<variant frequency="0" name="crannog">
<animations>
<animation event="0.5" load="0.0" name="attack_ranged" speed="100"/>
</animations>
<mesh>structural/brit_crannog_struct1.dae</mesh>
<props>
<prop actor="props/structures/britons/crannog_props.xml" attachpoint="root"/>
<prop actor="props/structures/britons/crannog_dirt.xml" attachpoint="root"/>
<prop actor="props/structures/britons/crannog_wall.xml" attachpoint="root"/>
<prop actor="particle/smoke_jav.xml" attachpoint="chimney"/>
<prop actor="props/special/eyecandy/campfire_prop.xml" attachpoint="campfire"/>
<prop actor="props/flora/grass_tufts_a.xml" attachpoint="tufta"/>
<prop actor="props/flora/grass_tufts_a.xml" attachpoint="tuftb"/>
<prop actor="props/flora/grass_tufts_a.xml" attachpoint="tuftc"/>
<prop actor="props/flora/reeds_beach_mythos.xml" attachpoint="watergrassa"/>
<prop actor="props/flora/reeds_beach_mythos.xml" attachpoint="watergrassb"/>
<prop actor="props/units/weapons/arrow_front.xml" attachpoint="loaded-projectile"/>
<prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
</props>
<textures>
<texture file="structural/celt_struct_1.dds" name="baseTex"/>
<texture file="structural/celt_struct_1_norm.png" name="normTex"/>
<texture file="structural/celt_struct_1_spec.png" name="specTex"/>
<texture file="structural/ao/brit_crannog.png" name="aoTex"/>
</textures>
</variant>
<variant frequency="1" name="crannog test">
<variant frequency="1" name="Briton Crannog">
<animations>
<animation event="0.5" load="0.0" name="attack_ranged" speed="100"/>
</animations>
Expand Down
15 changes: 1 addition & 14 deletions binaries/data/mods/public/art/actors/structures/britons/dock.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,7 @@
<actor version="1">
<castshadow/>
<group>
<variant frequency="0" name="norm">
<mesh>structural/celt_dock.dae</mesh>
<props>
<prop actor="props/structures/celts/dock_shields.xml" attachpoint="root"/>
<prop actor="props/structures/celts/dock_props.xml" attachpoint="root"/>
</props>
<textures>
<texture file="structural/celt_struct_1.dds" name="baseTex"/>
<texture file="structural/celt_struct_1_norm.png" name="normTex"/>
<texture file="structural/celt_struct_1_spec.png" name="specTex"/>
<texture file="structural/ao/celt_dock.png" name="aoTex"/>
</textures>
</variant>
<variant frequency="1" name="test">
<variant frequency="1" name="Briton Dock">
<mesh>structural/celt_dock.dae</mesh>
<props>
<prop actor="props/structures/celts/dock_shields.xml" attachpoint="root"/>
Expand Down
17 changes: 1 addition & 16 deletions binaries/data/mods/public/art/actors/structures/britons/farmstead.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,7 @@
<actor version="1">
<castshadow/>
<group>
<variant frequency="0" name="Celt Farmstead">
<mesh>structural/celt_farmstead.dae</mesh>
<props>
<prop actor="props/structures/celts/farmstead.xml" attachpoint="root"/>
<prop actor="props/structures/celts/farmstead_shield.xml" attachpoint="root"/>
<prop actor="props/structures/celts/farmstead_hoe.xml" attachpoint="root"/>
<prop actor="props/structures/decals/farmstead_mud.xml" attachpoint="root"/>
</props>
<textures>
<texture file="structural/celt_struct_1.dds" name="baseTex"/>
<texture file="structural/celt_struct_1_norm.png" name="normTex"/>
<texture file="structural/celt_struct_1_spec.png" name="specTex"/>
<texture file="structural/ao/celt_farmstead.png" name="aoTex"/>
</textures>
</variant>
<variant frequency="1" name="Celt Farmstead test">
<variant frequency="1" name="Briton Farmstead">
<mesh>structural/celt_farmstead.dae</mesh>
<props>
<prop actor="props/structures/celts/farmstead.xml" attachpoint="root"/>
Expand Down
44 changes: 3 additions & 41 deletions binaries/data/mods/public/art/actors/structures/britons/fortress.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<actor version="1">
<castshadow/>
<group>
<variant frequency="0" name="Brythonic Broch">
<variant frequency="0" name="Briton Fortress Old">
<animations>
<animation event="0.5" load="0.0" name="attack_ranged" speed="100"/>
</animations>
Expand All @@ -24,26 +24,7 @@
<texture file="structural/ao/brit_fortress.png" name="aoTex"/>
</textures>
</variant>
<variant frequency="0" name="Celt Broch">
<animations>
<animation event="0.5" load="0.0" name="attack_ranged" speed="100"/>
</animations>
<mesh>structural/brit_fortress_2.dae</mesh>
<props>
<prop actor="particle/smoke_light_delay.xml" attachpoint="smokea"/>
<prop actor="props/structures/decals/celt_fortress.xml" attachpoint="root"/>
<prop actor="props/structures/decals/celt_fortress.xml" attachpoint="root"/>
<prop actor="props/units/weapons/arrow_front.xml" attachpoint="loaded-projectile"/>
<prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
</props>
<textures>
<texture file="structural/celt_struct.dds" name="baseTex"/>
<texture file="structural/celt_struct_norm.png" name="normTex"/>
<texture file="structural/celt_struct_spec.png" name="specTex"/>
<texture file="structural/ao/brit_fortress_2_AO.png" name="aoTex"/>
</textures>
</variant>
<variant frequency="1" name="Celt Broch test">
<variant frequency="1" name="Briton Fortress A">
<animations>
<animation event="0.5" load="0.0" name="attack_ranged" speed="100"/>
</animations>
Expand All @@ -62,26 +43,7 @@
<texture file="structural/ao/brit_fortress_2_AO.png" name="aoTex"/>
</textures>
</variant>
<variant frequency="0" name="Pict Broch">
<animations>
<animation event="0.5" load="0.0" name="attack_ranged" speed="100"/>
</animations>
<mesh>structural/brit_fortress_2_b.dae</mesh>
<props>
<prop actor="particle/smoke_light_delay.xml" attachpoint="smokea"/>
<prop actor="props/structures/decals/celt_fortress.xml" attachpoint="root"/>
<prop actor="props/structures/decals/celt_fortress.xml" attachpoint="root"/>
<prop actor="props/units/weapons/arrow_front.xml" attachpoint="loaded-projectile"/>
<prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
</props>
<textures>
<texture file="structural/celt_struct.dds" name="baseTex"/>
<texture file="structural/celt_struct_norm.png" name="normTex"/>
<texture file="structural/celt_struct_spec.png" name="specTex"/>
<texture file="structural/ao/brit_fortress_2_b_AO.png" name="aoTex"/>
</textures>
</variant>
<variant frequency="1" name="Pict Broch test">
<variant frequency="1" name="Briton Fortress B">
<animations>
<animation event="0.5" load="0.0" name="attack_ranged" speed="100"/>
</animations>
Expand Down
17 changes: 5 additions & 12 deletions binaries/data/mods/public/art/actors/structures/britons/house.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,7 @@
<actor version="1">
<castshadow/>
<group>
<variant frequency="0" name="base">
<textures>
<texture file="structural/celt_struct_1.dds" name="baseTex"/>
<texture file="structural/celt_struct_1_norm.png" name="normTex"/>
<texture file="structural/celt_struct_1_spec.png" name="specTex"/>
</textures>
</variant>
<variant frequency="1" name="base test">
<variant frequency="1" name="Briton House">
<textures>
<texture file="structural/brit_struct_1.png" name="baseTex"/>
<texture file="structural/celt_struct_1_norm.png" name="normTex"/>
Expand All @@ -18,7 +11,7 @@
</variant>
</group>
<group>
<variant frequency="1" name="brit house a">
<variant frequency="1" name="Briton House A">
<mesh>structural/brit_house_a.dae</mesh>
<props>
<prop actor="props/structures/britons/house_a_props_1.xml" attachpoint="root"/>
Expand All @@ -28,7 +21,7 @@
<texture file="structural/ao/brit_house_a.png" name="aoTex"/>
</textures>
</variant>
<variant frequency="1" name="brit house b">
<variant frequency="1" name="Briton House B">
<mesh>structural/brit_house_b.dae</mesh>
<props>
<prop actor="props/structures/britons/house_b_props_new.xml" attachpoint="root"/>
Expand All @@ -38,7 +31,7 @@
<texture file="structural/ao/brit_house_b.png" name="aoTex"/>
</textures>
</variant>
<variant frequency="1" name="brit house c">
<variant frequency="1" name="Briton House C">
<mesh>structural/brit_house_c.dae</mesh>
<props>
<prop actor="props/structures/britons/house_c_props_new.xml" attachpoint="root"/>
Expand All @@ -48,7 +41,7 @@
<texture file="structural/ao/brit_house_c.png" name="aoTex"/>
</textures>
</variant>
<variant frequency="1" name="brit house d">
<variant frequency="1" name="Briton House D">
<mesh>structural/brit_house_d.dae</mesh>
<props>
<prop actor="props/structures/britons/house_d_props_new.xml" attachpoint="root"/>
Expand Down
17 changes: 1 addition & 16 deletions binaries/data/mods/public/art/actors/structures/britons/kennel.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,7 @@
<actor version="1">
<castshadow/>
<group>
<variant frequency="0" name="Celtic dog kennel">
<mesh>structural/celt_kennel_struct.dae</mesh>
<props>
<prop actor="props/structures/celts/kennel_props_new.xml" attachpoint="root"/>
<prop actor="props/structures/celts/kennel_mud.xml" attachpoint="root"/>
<prop actor="props/structures/celts/kennel_props_1.xml" attachpoint="root"/>
<prop actor="props/structures/celts/kennel_beef.xml" attachpoint="root"/>
</props>
<textures>
<texture file="structural/celt_struct_1.dds" name="baseTex"/>
<texture file="structural/celt_struct_1_norm.png" name="normTex"/>
<texture file="structural/celt_struct_1_spec.png" name="specTex"/>
<texture file="structural/ao/celt_kennel.png" name="aoTex"/>
</textures>
</variant>
<variant frequency="1" name="Celtic dog kennel test">
<variant frequency="1" name="Briton Dog Kennel">
<mesh>structural/celt_kennel_struct.dae</mesh>
<props>
<prop actor="props/structures/celts/kennel_props_new.xml" attachpoint="root"/>
Expand Down
18 changes: 1 addition & 17 deletions binaries/data/mods/public/art/actors/structures/britons/market.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,7 @@
<actor version="1">
<castshadow/>
<group>
<variant frequency="0" name="Brit Market">
<mesh>structural/brit_market_struct_1.dae</mesh>
<props>
<prop actor="props/structures/britons/market_props_1.xml" attachpoint="root"/>
<prop actor="props/structures/britons/market_props_new.xml" attachpoint="root"/>
<prop actor="props/structures/britons/market_wood_c.xml" attachpoint="root"/>
<prop actor="props/structures/decals/gravel_5x5.xml" attachpoint="root"/>
<prop actor="particle/smoke_light_delay.xml" attachpoint="smoke"/>
</props>
<textures>
<texture file="structural/celt_struct_1.dds" name="baseTex"/>
<texture file="structural/celt_struct_1_norm.png" name="normTex"/>
<texture file="structural/celt_struct_1_spec.png" name="specTex"/>
<texture file="structural/ao/brit_market.png" name="aoTex"/>
</textures>
</variant>
<variant frequency="1" name="Brit Market test">
<variant frequency="1" name="Briton Market">
<mesh>structural/brit_market_struct_1.dae</mesh>
<props>
<prop actor="props/structures/britons/market_props_1.xml" attachpoint="root"/>
Expand Down
17 changes: 1 addition & 16 deletions binaries/data/mods/public/art/actors/structures/britons/plot_corral.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,7 @@
<actor version="1">
<castshadow/>
<group>
<variant frequency="0" name="celtic corral">
<mesh>structural/celt_corral_base.dae</mesh>
<props>
<prop actor="props/structures/decals/celt_corral_mud.xml" attachpoint="root"/>
<prop actor="props/structures/celts/corral_props_new.xml" attachpoint="root"/>
<prop actor="props/structures/celts/corral_props_1.xml" attachpoint="root"/>
<prop actor="props/structures/celts/corral_food.xml" attachpoint="food" maxheight="20" minheight="-20"/>
</props>
<textures>
<texture file="structural/celt_struct_1.dds" name="baseTex"/>
<texture file="structural/celt_struct_1_norm.png" name="normTex"/>
<texture file="structural/celt_struct_1_spec.png" name="specTex"/>
<texture file="structural/ao/celt_corral.png" name="aoTex"/>
</textures>
</variant>
<variant frequency="1" name="celtic corral test">
<variant frequency="1" name="Briton Corral">
<mesh>structural/celt_corral_base.dae</mesh>
<props>
<prop actor="props/structures/decals/celt_corral_mud.xml" attachpoint="root"/>
Expand Down
2 changes: 1 addition & 1 deletion binaries/data/mods/public/art/actors/structures/britons/range.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Brittonic shooting range">
<variant frequency="1" name="Briton Practice Range">
<mesh>structural/brit_range.dae</mesh>
<props>
<prop actor="props/structures/decals/dirt_5x5.xml" attachpoint="root"/>
Expand Down
2 changes: 1 addition & 1 deletion binaries/data/mods/public/art/actors/structures/britons/scout_tower.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="Briton Scout Tower">
<variant frequency="1" name="Briton Large Tower">
<animations>
<animation event="0.5" load="0" name="attack_ranged" speed="100"/>
</animations>
Expand Down
22 changes: 1 addition & 21 deletions binaries/data/mods/public/art/actors/structures/britons/special.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,7 @@
<actor version="1">
<castshadow/>
<group>
<variant frequency="0" name="Base">
<mesh>structural/celt_rotary_mill.dae</mesh>
<props>
<prop actor="props/structures/celts/rotary_mill_hay_big.xml" attachpoint="haybig001" maxheight="20" minheight="-20"/>
<prop actor="props/structures/celts/rotary_mill_hay_big.xml" attachpoint="haybig002" maxheight="20" minheight="-20"/>
<prop actor="props/structures/celts/rotary_mill_hay_small.xml" attachpoint="haysmall001" maxheight="20" minheight="-20"/>
<prop actor="props/structures/celts/rotary_mill_hay_small.xml" attachpoint="haysmall002" maxheight="20" minheight="-20"/>
<prop actor="props/structures/celts/rotary_mill_vases.xml" attachpoint="vases" maxheight="20" minheight="-20"/>
<prop actor="props/structures/celts/rotary_mill_shield_a.xml" attachpoint="shield001" maxheight="20" minheight="-20"/>
<prop actor="props/structures/celts/rotary_mill_shield_b.xml" attachpoint="shield002" maxheight="20" minheight="-20"/>
<prop actor="props/structures/celts/rotary_mill_grinder.xml" attachpoint="root" maxheight="20" minheight="-20"/>
<prop actor="props/structures/decals/farmstead_mud.xml" attachpoint="root" maxheight="20" minheight="-20"/>
<prop actor="props/structures/decals/celt_corral_mud.xml" attachpoint="root" maxheight="20" minheight="-20"/>
</props>
<textures>
<texture file="structural/celt_struct.dds" name="baseTex"/>
<texture file="structural/celt_struct_norm.png" name="normTex"/>
<texture file="structural/celt_struct_spec.png" name="specTex"/>
</textures>
</variant>
<variant frequency="1" name="Base test">
<variant frequency="1" name="Briton Rotary Mill">
<mesh>structural/celt_rotary_mill.dae</mesh>
<props>
<prop actor="props/structures/celts/rotary_mill_hay_big.xml" attachpoint="haybig001" maxheight="20" minheight="-20"/>
Expand Down
2 changes: 1 addition & 1 deletion binaries/data/mods/public/art/actors/structures/britons/stable.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Brittonic stable">
<variant frequency="1" name="Briton Stable">
<mesh>structural/brit_stable.dae</mesh>
<props>
<prop actor="props/structures/decals/dirt_5x5.xml" attachpoint="root"/>
Expand Down
Loading

0 comments on commit 4574223

Please sign in to comment.