Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
a29ff05
inicial version mycenae
wltonlopes Mar 31, 2026
524fadc
update;
wltonlopes Mar 31, 2026
0967763
update units
wltonlopes Apr 2, 2026
56cbc4e
fixed and new shield
wltonlopes Apr 3, 2026
21c03f1
myce structures
wltonlopes Apr 3, 2026
1b23c7e
Ships, units, heros ando more.
wltonlopes Apr 5, 2026
5750881
structures minoans
wltonlopes Apr 6, 2026
8b9650e
minor uptade names.
wltonlopes Apr 6, 2026
17cbb02
Backgrounds
wltonlopes Apr 7, 2026
1b8495a
prop_helmets
wltonlopes Apr 7, 2026
19f0c12
minoan fortress/minoan ships updates
wltonlopes Apr 8, 2026
c4f2cdf
New names heros and AI player
wltonlopes Apr 9, 2026
92ebd8c
update -models and ao
wltonlopes Apr 9, 2026
1696c71
minoan priestess
wltonlopes Apr 11, 2026
74ae7ec
fix gameplay
wltonlopes Apr 11, 2026
86e033e
hitites inicial commit
wltonlopes Apr 13, 2026
3103153
hitites civ
wltonlopes Apr 13, 2026
3ccbe73
hitites units.
wltonlopes Apr 14, 2026
000e105
hitites units and helmet
wltonlopes Apr 15, 2026
1a066a7
Hitites names
wltonlopes Apr 15, 2026
92d3d28
more updates, hitit name IA
wltonlopes Apr 15, 2026
69c8bb9
fix structures barracks and cc
wltonlopes Apr 16, 2026
86d521d
Hittites update
wltonlopes Apr 18, 2026
3a49166
hitti fix
wltonlopes Apr 20, 2026
9f338c8
Ships and wonder hittitas
wltonlopes Apr 20, 2026
feb81d2
TeamBonuses/CivBonus
wltonlopes Apr 22, 2026
c9bec6a
uptate ships;
wltonlopes Apr 29, 2026
450598e
update ships merchant minoans
wltonlopes Apr 29, 2026
fc92c37
minoan wonder
wltonlopes Apr 29, 2026
2ae1df6
update Sword bronze
wltonlopes Apr 29, 2026
37cfdaa
Merge remote-tracking branch 'origin/master' into mycenae_and_minoan
wltonlopes Apr 29, 2026
33c85cb
textures player color update
wltonlopes May 5, 2026
282ade4
fix erros
wltonlopes May 30, 2026
d86465d
Merge branch 'mycenae_and_minoan' of https://github.com/0ADMods/arist…
wltonlopes May 30, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion art/actors/props/special/common/garrison_flag_assyrian.xml
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="Armenia Flag">
<variant frequency="1" name="Assyrian Flag">
<animations>
<animation file="mechanical/garrison_flag_idle.dae" name="Idle" speed="30"/>
</animations>
Expand Down
2 changes: 1 addition & 1 deletion art/actors/props/special/common/garrison_flag_egyptian.xml
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="Armenia Flag">
<variant frequency="1" name="Egyptian Flag">
<animations>
<animation file="mechanical/garrison_flag_idle.dae" name="Idle" speed="30"/>
</animations>
Expand Down
18 changes: 18 additions & 0 deletions art/actors/props/special/common/garrison_flag_hitti.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="Hitites Flag">
<animations>
<animation file="mechanical/garrison_flag_idle.dae" name="Idle" speed="30"/>
</animations>
<mesh>props/garrison_flag.dae</mesh>
<textures>
<texture file="props/garrison_hittite.png" name="baseTex"/>
<texture file="default_norm.png" name="normTex"/>
<texture file="null_black.dds" name="specTex"/>
</textures>
</variant>
</group>
<material>player_trans_norm_spec.xml</material>
</actor>
18 changes: 18 additions & 0 deletions art/actors/props/special/common/garrison_flag_minoa.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="Minoan Flag">
<animations>
<animation file="mechanical/garrison_flag_idle.dae" name="Idle" speed="30"/>
</animations>
<mesh>props/garrison_flag.dae</mesh>
<textures>
<texture file="props/garrison_mino.png" name="baseTex"/>
<texture file="default_norm.png" name="normTex"/>
<texture file="null_black.dds" name="specTex"/>
</textures>
</variant>
</group>
<material>player_trans_norm_spec.xml</material>
</actor>
18 changes: 18 additions & 0 deletions art/actors/props/special/common/garrison_flag_mycenae.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="Mycenaean Flag">
<animations>
<animation file="mechanical/garrison_flag_idle.dae" name="Idle" speed="30"/>
</animations>
<mesh>props/garrison_flag.dae</mesh>
<textures>
<texture file="props/garrison_myce.png" name="baseTex"/>
<texture file="default_norm.png" name="normTex"/>
<texture file="null_black.dds" name="specTex"/>
</textures>
</variant>
</group>
<material>player_trans_norm_spec.xml</material>
</actor>
15 changes: 15 additions & 0 deletions art/actors/props/special/common/hitti_waypoint_flag.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<float/>
<group>
<variant file="others/waypoints/base.xml" frequency="1" name="Hitites Waypoint Flag">
<textures>
<texture file="props/banner_hittite.png" name="baseTex"/>
<texture file="default_norm.png" name="normTex"/>
<texture file="null_black.dds" name="specTex"/>
</textures>
</variant>
</group>
<material>basic_trans_norm_spec.xml</material>
</actor>
2 changes: 1 addition & 1 deletion art/actors/props/special/common/judah_waypoint_flag.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<group>
<variant file="others/waypoints/base.xml" frequency="1" name="Judah Waypoint Flag">
<textures>
<texture file="props/banner_carthage.png" name="baseTex"/>
<texture file="props/banner_judah.png" name="baseTex"/>
<texture file="default_norm.png" name="normTex"/>
<texture file="null_black.dds" name="specTex"/>
</textures>
Expand Down
15 changes: 15 additions & 0 deletions art/actors/props/special/common/minoan_waypoint_flag.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<float/>
<group>
<variant file="others/waypoints/base.xml" frequency="1" name="ArcGreek Waypoint Flag">
<textures>
<texture file="props/banner_greek.png" name="baseTex"/>
<texture file="default_norm.png" name="normTex"/>
<texture file="null_black.dds" name="specTex"/>
</textures>
</variant>
</group>
<material>basic_trans_norm_spec.xml</material>
</actor>
15 changes: 15 additions & 0 deletions art/actors/props/special/common/mycenae_waypoint_flag.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<float/>
<group>
<variant file="others/waypoints/base.xml" frequency="1" name="ArcGreek Waypoint Flag">
<textures>
<texture file="props/banner_greek.png" name="baseTex"/>
<texture file="default_norm.png" name="normTex"/>
<texture file="null_black.dds" name="specTex"/>
</textures>
</variant>
</group>
<material>basic_trans_norm_spec.xml</material>
</actor>
16 changes: 16 additions & 0 deletions art/actors/props/structures/hittites/gate_statue_lion.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="kushite statue">
<mesh>structural/hitites/lion_gate.dae</mesh>
<textures>
<texture file="props/lion_statue.png" name="baseTex"/>
<texture file="props/lion_statue_norm.png" name="normTex"/>
<texture file="props/lion_statue_spec.png" name="specTex"/>
<texture file="props/ao/lion_statue_ao.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
32 changes: 32 additions & 0 deletions art/actors/props/structures/hittites/ships_sail.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<float/>
<group>
<variant frequency="1" name="Base">
<mesh>props/pers_merc_sail.dae</mesh>
<textures>
<texture file="props/ptol_sail_norm.png" name="normTex"/>
<texture file="props/sail_spec_1.png" name="specTex"/>
</textures>
</variant>
</group>
<group>
<variant frequency="1" name="sail stripes 1">
<textures>
<texture file="props/sail-stripes_hitti_01.png" name="baseTex"/>
</textures>
</variant>
<variant frequency="1" name="sail stripes 2">
<textures>
<texture file="props/sail-stripes_hitti_02.png" name="baseTex"/>
</textures>
</variant>
<variant frequency="1" name="sail stripes 3">
<textures>
<texture file="props/sail-stripes_hitti_03.png" name="baseTex"/>
</textures>
</variant>
</group>
<material>player_trans_parallax_spec.xml</material>
</actor>
42 changes: 42 additions & 0 deletions art/actors/props/structures/minoans/bireme_main_sail.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<float/>
<group>
<variant file="others/ships/main_sail_base.xml" name="Bireme Sail">
<mesh>props/hele_bireme_sail.dae</mesh>
</variant>
</group>
<group>
<variant frequency="1" file="others/ships/hele_sail_01.xml" name="eye"/>
<variant frequency="1" file="others/ships/hele_sail_02.xml" name="pegasus"/>
<variant frequency="1" file="others/ships/hele_sail_03.xml" name="runner"/>
<variant frequency="1" file="others/ships/hele_sail_04.xml" name="star"/>
<variant frequency="1" file="others/ships/hele_sail_05.xml" name="hawk"/>
<variant frequency="1" file="others/ships/hele_sail_06.xml" name="krater"/>
<variant frequency="1" name="boar">
<textures>
<texture file="props/ptol_sail_norm.png" name="normTex"/>
<texture file="props/sail_spec_1.png" name="specTex"/>
</textures>
</variant>
</group>
<group>
<variant frequency="1" name="sail stripes 1">
<textures>
<texture file="props/minoan_sail_01.png" name="baseTex"/>
</textures>
</variant>
<variant frequency="1" name="sail stripes 2">
<textures>
<texture file="props/minoan_sail_02.png" name="baseTex"/>
</textures>
</variant>
<variant frequency="1" name="sail stripes 3">
<textures>
<texture file="props/minoan_sail_03.png" name="baseTex"/>
</textures>
</variant>
</group>
<material>player_trans_parallax_spec.xml</material>
</actor>
19 changes: 19 additions & 0 deletions art/actors/props/structures/minoans/shields_fortress.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<float/>
<group>
<variant frequency="1" name="base">
<mesh>props/structures/minoans/shields_fortress.dae</mesh>
</variant>
</group>
<group>
<variant name="Texture-Tower-1">
<textures><texture file="props/shield/minoans_shield_a.png" name="baseTex"/></textures>
</variant>
<variant name="Texture-Tower-2">
<textures><texture file="props/shield/minoans_shield_b.png" name="baseTex"/></textures>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
16 changes: 16 additions & 0 deletions art/actors/props/structures/minoans/ship_scout.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<float/>
<group>
<variant frequency="1" name="base">
<mesh>props/structures/minoans/prop_ship_arrow.dae</mesh>
<textures>
<texture file="structural/minoan_ship.png" name="baseTex"/>
<texture file="structural/kush_bireme_spec.png" name="specTex"/>
<texture file="structural/kush_bireme_norm.png" name="normTex"/>
</textures>
</variant>
</group>
<material>player_trans_parallax_spec.xml</material>
</actor>
16 changes: 16 additions & 0 deletions art/actors/props/structures/minoans/ship_scout_tent.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<float/>
<group>
<variant frequency="1" name="base">
<mesh>props/structures/minoans/prop_ship_basic.dae</mesh>
<textures>
<texture file="structural/minoan_ship.png" name="baseTex"/>
<texture file="structural/kush_bireme_spec.png" name="specTex"/>
<texture file="structural/kush_bireme_norm.png" name="normTex"/>
</textures>
</variant>
</group>
<material>player_trans_parallax_spec.xml</material>
</actor>
42 changes: 42 additions & 0 deletions art/actors/props/structures/mycenaeans/bireme_main_sail.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<float/>
<group>
<variant file="others/ships/main_sail_base.xml" name="Bireme Sail">
<mesh>props/hele_bireme_sail.dae</mesh>
</variant>
</group>
<group>
<variant frequency="1" file="others/ships/hele_sail_01.xml" name="eye"/>
<variant frequency="1" file="others/ships/hele_sail_02.xml" name="pegasus"/>
<variant frequency="1" file="others/ships/hele_sail_03.xml" name="runner"/>
<variant frequency="1" file="others/ships/hele_sail_04.xml" name="star"/>
<variant frequency="1" file="others/ships/hele_sail_05.xml" name="hawk"/>
<variant frequency="1" file="others/ships/hele_sail_06.xml" name="krater"/>
<variant frequency="1" name="boar">
<textures>
<texture file="props/ptol_sail_norm.png" name="normTex"/>
<texture file="props/sail_spec_1.png" name="specTex"/>
</textures>
</variant>
</group>
<group>
<variant frequency="1" name="sail stripes 1">
<textures>
<texture file="props/mycenae_sail_01.png" name="baseTex"/>
</textures>
</variant>
<variant frequency="1" name="sail stripes 2">
<textures>
<texture file="props/mycenae_sail_02.png" name="baseTex"/>
</textures>
</variant>
<variant frequency="1" name="sail stripes 3">
<textures>
<texture file="props/mycenae_sail_03.png" name="baseTex"/>
</textures>
</variant>
</group>
<material>player_trans_parallax_spec.xml</material>
</actor>
16 changes: 16 additions & 0 deletions art/actors/props/structures/mycenaeans/dock_props.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>props/props_dock_myce.dae</mesh>
<textures>
<texture file="props/hele_props_a.dds" name="baseTex"/>
<texture file="props/hele_props_a_norm.png" name="normTex"/>
<texture file="props/hele_props_a_spec.png" name="specTex"/>
<texture file="structural/ao/athen_dock.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
16 changes: 16 additions & 0 deletions art/actors/props/structures/mycenaeans/ship_scout.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<float/>
<group>
<variant frequency="1" name="base">
<mesh>props/structures/mycenaeans/prop_ship_arrow.dae</mesh>
<textures>
<texture file="structural/minoan_ship.png" name="baseTex"/>
<texture file="structural/kush_bireme_spec.png" name="specTex"/>
<texture file="structural/kush_bireme_norm.png" name="normTex"/>
</textures>
</variant>
</group>
<material>player_trans_parallax_spec.xml</material>
</actor>
24 changes: 24 additions & 0 deletions art/actors/props/units/armor/mycenaen_neckguard_bronze.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>props/helmet/pers_neckguard.dae</mesh>
<textures>
<texture file="skeletal/mycenean/bronze_prop.png" name="baseTex"/>
<texture file="props/helmet/pers_neckguard_norm.png" name="normTex"/>
<texture file="props/helmet/pers_neckguard_spec.png" name="specTex"/>
</textures>
</variant>
</group>
<group>
<variant file="biped/base_spearman_shield_relax.xml" name="Spearman-Ready-Shield" frequency="1"/>
</group>
<group>
<variant frequency="1" name="Idle"/>
<variant file="biped/rider/base_carry_meat.xml"/>
<variant file="biped/rider/attack_slaughter.xml"/>
<variant file="biped/cape_gather_meat.xml"/>
</group>
<material>player_trans_norm_spec_helmet.xml</material>
</actor>
Loading