Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge Wow's fork #80

Open
wants to merge 22 commits into
base: master
Choose a base branch
from
Open

Merge Wow's fork #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
d43c02e
Delete tech_military_2.png
stereotipo Jan 25, 2022
ff0a1d5
new_map
stereotipo Jan 26, 2022
da9929e
maps_cleanup
stereotipo Jan 26, 2022
3de53a6
Update church_B_dome.xml
stereotipo Jan 27, 2022
d87c11a
damage_texture
stereotipo Jan 28, 2022
9c93119
damage_texture
stereotipo Jan 28, 2022
0a35b84
rus_damage_texture
stereotipo Jan 28, 2022
be8c957
tower
stereotipo Jan 30, 2022
e8481a4
Fork: Alpha 26
JustusAvramenko Oct 12, 2022
b3b016a
Fix some walls
JustusAvramenko Oct 21, 2022
eaa39c1
Some fixes to Byzantine buildings. Should also fix a bug report: Fixe…
JustusAvramenko Oct 23, 2022
7f1c274
Fix project information
JustusAvramenko Oct 23, 2022
3efe4b4
Fix the Byzantine 'Military Reforms' tech
JustusAvramenko Oct 23, 2022
41e3a34
Deletes a bunch of unnecessary GUI stuff.
JustusAvramenko Oct 23, 2022
dfef749
updTE Norse storehouse
JustusAvramenko Apr 3, 2023
28751bd
725 actor fixes for A27 compatibility
JustusAvramenko Jun 24, 2024
ad03bc3
More actor fixes for A27
JustusAvramenko Jun 25, 2024
5d1c760
Update ProjectInformation_milleniumad.js
JustusAvramenko Jun 25, 2024
07259f3
2 actor material fixes
JustusAvramenko Jun 25, 2024
c40d822
110 more fixes for A27
JustusAvramenko Jun 25, 2024
9edaf12
Move unit portraits to civ folders, rename them
JustusAvramenko Jun 28, 2024
91efeb6
In the unit templates, adjust all unit portrait refs to the new names…
JustusAvramenko Jun 28, 2024
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
  •  
  •  
  •  
4 changes: 4 additions & 0 deletions archiving.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
https://wildfiregames.com/forum/topic/24444-how-to-package-your-mods-on-windows/


binaries/system/pyrogenesis -mod=mod -mod=public -mod=millenniumad -archivebuild="binaries/data/mods/millenniumad" -archivebuild-output="millenniumad.pyromod" -archivebuild-compress
18 changes: 9 additions & 9 deletions art/actors/geology/rock_various.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@
<group>
<variant frequency="1" name="Rock Big A">
<mesh>gaia/rock_various.dae</mesh>
<textures>
<texture file="gaia/rock_large_x_gray.png" name="baseTex"/>
<texture file="gaia/rock_large_x_spec.png" name="specTex"/>
<texture file="gaia/rock_large_x_norm.png" name="normTex"/>
</textures>
</variant>
<variant frequency="1" name="Rock Big B">
<mesh>gaia/rock_various_b.dae</mesh>
<textures>
<texture file="gaia/rock_large_x_gray.png" name="baseTex"/>
<texture file="gaia/rock_large_x_spec.png" name="specTex"/>
<texture file="gaia/rock_large_x_norm.png" name="normTex"/>
</textures>
</variant>
<variant frequency="1" name="Rock Big B">
<mesh>gaia/rock_various_b.dae</mesh>
<textures>
<texture file="gaia/rock_large_x_gray.png" name="baseTex"/>
<texture file="gaia/rock_large_x_spec.png" name="specTex"/>
<texture file="gaia/rock_large_x_norm.png" name="normTex"/>
</textures>
</variant>
</group>
<material>basic_trans_parallax_spec.xml</material>
<material>no_trans_parallax_spec.xml</material>
</actor>
2 changes: 1 addition & 1 deletion art/actors/particle/smoke_curved.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
<particles file="smoke_curved.xml"/>
</variant>
</group>
<material>basic_trans.xml</material>
<material>basic_trans_norm_spec.xml</material>
</actor>
44 changes: 22 additions & 22 deletions art/actors/props/horse/cav_armor_byzantine_cloth.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>props/horse/cataphract_armor.dae</mesh>
<textures>
<texture file="props/horse/cataphract_byzantine_cloth.png" name="baseTex"/>
<texture file="props/horse/cataphract_byzantine_cloth_norm.png" name="normTex"/>
<texture file="props/horse/cataphract_byzantine_cloth_spec.png" name="specTex"/>
</textures>
</variant>
</group>
<group>
<variant file="quadraped/base_horse_javelin_fast.xml" name="Javelinist-Fast-Horse" frequency="1"/>
<variant file="quadraped/base_horse_archer_fast.xml" name="Archer-Fast-Horse" frequency="1"/>
<variant file="quadraped/base_horse_javelin.xml" name="Javelinist-Horse" frequency="1"/>
<variant file="quadraped/base_horse_chariot.xml" name="Chariot-Horse" frequency="1"/>
<variant file="quadraped/base_horse_archer.xml" name="Archer-Horse" frequency="1"/>
<variant file="quadraped/base_horse_trot.xml" name="Horse-Trot" frequency="1"/>
<variant file="quadraped/base_horse_pace.xml" name="Horse-Pace" frequency="1"/>
<variant file="quadraped/base_horse_walk.xml" name="Horse-Walk" frequency="1"/>
</group>
<material>basic_trans_parallax_spec.xml</material>
<castshadow/>
<group>
<variant>
<mesh>props/horse/cataphract_armor.dae</mesh>
<textures>
<texture file="props/horse/cataphract_byzantine_cloth.png" name="baseTex"/>
<texture file="props/horse/cataphract_byzantine_cloth_norm.png" name="normTex"/>
<texture file="props/horse/cataphract_byzantine_cloth_spec.png" name="specTex"/>
</textures>
</variant>
</group>
<group>
<variant file="quadraped/base_horse_javelin_fast.xml" name="Javelinist-Fast-Horse" frequency="1"/>
<variant file="quadraped/base_horse_archer_fast.xml" name="Archer-Fast-Horse" frequency="1"/>
<variant file="quadraped/base_horse_javelin.xml" name="Javelinist-Horse" frequency="1"/>
<variant file="quadraped/base_horse_chariot.xml" name="Chariot-Horse" frequency="1"/>
<variant file="quadraped/base_horse_archer.xml" name="Archer-Horse" frequency="1"/>
<variant file="quadraped/base_horse_trot.xml" name="Horse-Trot" frequency="1"/>
<variant file="quadraped/base_horse_pace.xml" name="Horse-Pace" frequency="1"/>
<variant file="quadraped/base_horse_walk.xml" name="Horse-Walk" frequency="1"/>
</group>
<material>basic_trans_parallax_spec.xml</material>
</actor>
60 changes: 30 additions & 30 deletions art/actors/props/horse/cav_armor_byzantine_cloth_player.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="cataphract-player-light">
<mesh>props/horse/cataphract_armor.dae</mesh>
<textures>
<texture file="props/horse/cataphract_byzantine_cloth_player_light.png" name="baseTex"/>
<texture file="props/horse/cataphract_byzantine_cloth_norm.png" name="normTex"/>
<texture file="props/horse/cataphract_byzantine_cloth_spec.png" name="specTex"/>
</textures>
</variant>
<variant frequency="3" name="cataphract-player-dark">
<mesh>props/horse/cataphract_armor.dae</mesh>
<textures>
<texture file="props/horse/cataphract_byzantine_cloth_player_dark.png" name="baseTex"/>
<texture file="props/horse/cataphract_byzantine_cloth_norm.png" name="normTex"/>
<texture file="props/horse/cataphract_byzantine_cloth_spec.png" name="specTex"/>
</textures>
</variant>
</group>
<group>
<variant file="quadraped/base_horse_javelin_fast.xml" name="Javelinist-Fast-Horse" frequency="1"/>
<variant file="quadraped/base_horse_archer_fast.xml" name="Archer-Fast-Horse" frequency="1"/>
<variant file="quadraped/base_horse_javelin.xml" name="Javelinist-Horse" frequency="1"/>
<variant file="quadraped/base_horse_chariot.xml" name="Chariot-Horse" frequency="1"/>
<variant file="quadraped/base_horse_archer.xml" name="Archer-Horse" frequency="1"/>
<variant file="quadraped/base_horse_trot.xml" name="Horse-Trot" frequency="1"/>
<variant file="quadraped/base_horse_pace.xml" name="Horse-Pace" frequency="1"/>
<variant file="quadraped/base_horse_walk.xml" name="Horse-Walk" frequency="1"/>
</group>
<material>player_trans_parallax_spec.xml</material>
<castshadow/>
<group>
<variant frequency="1" name="cataphract-player-light">
<mesh>props/horse/cataphract_armor.dae</mesh>
<textures>
<texture file="props/horse/cataphract_byzantine_cloth_player_light.png" name="baseTex"/>
<texture file="props/horse/cataphract_byzantine_cloth_norm.png" name="normTex"/>
<texture file="props/horse/cataphract_byzantine_cloth_spec.png" name="specTex"/>
</textures>
</variant>
<variant frequency="3" name="cataphract-player-dark">
<mesh>props/horse/cataphract_armor.dae</mesh>
<textures>
<texture file="props/horse/cataphract_byzantine_cloth_player_dark.png" name="baseTex"/>
<texture file="props/horse/cataphract_byzantine_cloth_norm.png" name="normTex"/>
<texture file="props/horse/cataphract_byzantine_cloth_spec.png" name="specTex"/>
</textures>
</variant>
</group>
<group>
<variant file="quadraped/base_horse_javelin_fast.xml" name="Javelinist-Fast-Horse" frequency="1"/>
<variant file="quadraped/base_horse_archer_fast.xml" name="Archer-Fast-Horse" frequency="1"/>
<variant file="quadraped/base_horse_javelin.xml" name="Javelinist-Horse" frequency="1"/>
<variant file="quadraped/base_horse_chariot.xml" name="Chariot-Horse" frequency="1"/>
<variant file="quadraped/base_horse_archer.xml" name="Archer-Horse" frequency="1"/>
<variant file="quadraped/base_horse_trot.xml" name="Horse-Trot" frequency="1"/>
<variant file="quadraped/base_horse_pace.xml" name="Horse-Pace" frequency="1"/>
<variant file="quadraped/base_horse_walk.xml" name="Horse-Walk" frequency="1"/>
</group>
<material>player_trans_parallax_spec.xml</material>
</actor>
44 changes: 22 additions & 22 deletions art/actors/props/horse/cav_armor_byzantine_cloth_white.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant name="armor-player">
<mesh>props/horse/cataphract_armor.dae</mesh>
<textures>
<texture file="props/horse/cataphract_byzantine_cloth_white.png" name="baseTex"/>
<texture file="props/horse/cataphract_byzantine_cloth_norm.png" name="normTex"/>
<texture file="props/horse/cataphract_byzantine_cloth_spec.png" name="specTex"/>
</textures>
</variant>
</group>
<group>
<variant file="quadraped/base_horse_javelin_fast.xml" name="Javelinist-Fast-Horse" frequency="1"/>
<variant file="quadraped/base_horse_archer_fast.xml" name="Archer-Fast-Horse" frequency="1"/>
<variant file="quadraped/base_horse_javelin.xml" name="Javelinist-Horse" frequency="1"/>
<variant file="quadraped/base_horse_chariot.xml" name="Chariot-Horse" frequency="1"/>
<variant file="quadraped/base_horse_archer.xml" name="Archer-Horse" frequency="1"/>
<variant file="quadraped/base_horse_trot.xml" name="Horse-Trot" frequency="1"/>
<variant file="quadraped/base_horse_pace.xml" name="Horse-Pace" frequency="1"/>
<variant file="quadraped/base_horse_walk.xml" name="Horse-Walk" frequency="1"/>
</group>
<material>player_trans_parallax_spec.xml</material>
<castshadow/>
<group>
<variant name="armor-player">
<mesh>props/horse/cataphract_armor.dae</mesh>
<textures>
<texture file="props/horse/cataphract_byzantine_cloth_white.png" name="baseTex"/>
<texture file="props/horse/cataphract_byzantine_cloth_norm.png" name="normTex"/>
<texture file="props/horse/cataphract_byzantine_cloth_spec.png" name="specTex"/>
</textures>
</variant>
</group>
<group>
<variant file="quadraped/base_horse_javelin_fast.xml" name="Javelinist-Fast-Horse" frequency="1"/>
<variant file="quadraped/base_horse_archer_fast.xml" name="Archer-Fast-Horse" frequency="1"/>
<variant file="quadraped/base_horse_javelin.xml" name="Javelinist-Horse" frequency="1"/>
<variant file="quadraped/base_horse_chariot.xml" name="Chariot-Horse" frequency="1"/>
<variant file="quadraped/base_horse_archer.xml" name="Archer-Horse" frequency="1"/>
<variant file="quadraped/base_horse_trot.xml" name="Horse-Trot" frequency="1"/>
<variant file="quadraped/base_horse_pace.xml" name="Horse-Pace" frequency="1"/>
<variant file="quadraped/base_horse_walk.xml" name="Horse-Walk" frequency="1"/>
</group>
<material>player_trans_parallax_spec.xml</material>
</actor>
44 changes: 22 additions & 22 deletions art/actors/props/horse/cav_armor_caro.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>props/horse/cataphract_armor.dae</mesh>
<textures>
<texture file="props/horse/carolingian_armorican.png" name="baseTex"/>
<texture file="props/horse/carolingian_armorican_norm.png" name="normTex"/>
<texture file="props/horse/carolingian_armorican_spec.png" name="specTex"/>
</textures>
</variant>
</group>
<group>
<variant file="quadraped/base_horse_javelin_fast.xml" name="Javelinist-Fast-Horse" frequency="1"/>
<variant file="quadraped/base_horse_archer_fast.xml" name="Archer-Fast-Horse" frequency="1"/>
<variant file="quadraped/base_horse_javelin.xml" name="Javelinist-Horse" frequency="1"/>
<variant file="quadraped/base_horse_chariot.xml" name="Chariot-Horse" frequency="1"/>
<variant file="quadraped/base_horse_archer.xml" name="Archer-Horse" frequency="1"/>
<variant file="quadraped/base_horse_trot.xml" name="Horse-Trot" frequency="1"/>
<variant file="quadraped/base_horse_pace.xml" name="Horse-Pace" frequency="1"/>
<variant file="quadraped/base_horse_walk.xml" name="Horse-Walk" frequency="1"/>
</group>
<material>no_trans_parallax_spec.xml</material>
<castshadow/>
<group>
<variant>
<mesh>props/horse/cataphract_armor.dae</mesh>
<textures>
<texture file="props/horse/carolingian_armorican.png" name="baseTex"/>
<texture file="props/horse/carolingian_armorican_norm.png" name="normTex"/>
<texture file="props/horse/carolingian_armorican_spec.png" name="specTex"/>
</textures>
</variant>
</group>
<group>
<variant file="quadraped/base_horse_javelin_fast.xml" name="Javelinist-Fast-Horse" frequency="1"/>
<variant file="quadraped/base_horse_archer_fast.xml" name="Archer-Fast-Horse" frequency="1"/>
<variant file="quadraped/base_horse_javelin.xml" name="Javelinist-Horse" frequency="1"/>
<variant file="quadraped/base_horse_chariot.xml" name="Chariot-Horse" frequency="1"/>
<variant file="quadraped/base_horse_archer.xml" name="Archer-Horse" frequency="1"/>
<variant file="quadraped/base_horse_trot.xml" name="Horse-Trot" frequency="1"/>
<variant file="quadraped/base_horse_pace.xml" name="Horse-Pace" frequency="1"/>
<variant file="quadraped/base_horse_walk.xml" name="Horse-Walk" frequency="1"/>
</group>
<material>no_trans_parallax_spec.xml</material>
</actor>
66 changes: 33 additions & 33 deletions art/actors/props/horse/cav_armor_umayyad_lamellar.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>props/horse/cataphract_armor.dae</mesh>
<textures>
<texture file="props/horse/cataphract_armor_norm.png" name="normTex"/>
<texture file="props/horse/cataphract_armor_spec.png" name="specTex"/>
</textures>
</variant>
</group>
<group>
<variant name="lamellar1">
<textures>
<texture file="props/horse/cataphract_armor_lamellar.png" name="baseTex"/>
</textures>
</variant>
<variant name="lamellar2">
<textures>
<texture file="props/horse/cataphract_armor_lamellar2.png" name="baseTex"/>
</textures>
</variant>
</group>
<group>
<variant file="quadraped/base_horse_javelin_fast.xml" name="Javelinist-Fast-Horse" frequency="1"/>
<variant file="quadraped/base_horse_archer_fast.xml" name="Archer-Fast-Horse" frequency="1"/>
<variant file="quadraped/base_horse_javelin.xml" name="Javelinist-Horse" frequency="1"/>
<variant file="quadraped/base_horse_chariot.xml" name="Chariot-Horse" frequency="1"/>
<variant file="quadraped/base_horse_archer.xml" name="Archer-Horse" frequency="1"/>
<variant file="quadraped/base_horse_trot.xml" name="Horse-Trot" frequency="1"/>
<variant file="quadraped/base_horse_pace.xml" name="Horse-Pace" frequency="1"/>
<variant file="quadraped/base_horse_walk.xml" name="Horse-Walk" frequency="1"/>
</group>
<material>no_trans_parallax_spec.xml</material>
<castshadow/>
<group>
<variant>
<mesh>props/horse/cataphract_armor.dae</mesh>
<textures>
<texture file="props/horse/cataphract_armor_norm.png" name="normTex"/>
<texture file="props/horse/cataphract_armor_spec.png" name="specTex"/>
</textures>
</variant>
</group>
<group>
<variant name="lamellar1">
<textures>
<texture file="props/horse/cataphract_armor_lamellar.png" name="baseTex"/>
</textures>
</variant>
<variant name="lamellar2">
<textures>
<texture file="props/horse/cataphract_armor_lamellar2.png" name="baseTex"/>
</textures>
</variant>
</group>
<group>
<variant file="quadraped/base_horse_javelin_fast.xml" name="Javelinist-Fast-Horse" frequency="1"/>
<variant file="quadraped/base_horse_archer_fast.xml" name="Archer-Fast-Horse" frequency="1"/>
<variant file="quadraped/base_horse_javelin.xml" name="Javelinist-Horse" frequency="1"/>
<variant file="quadraped/base_horse_chariot.xml" name="Chariot-Horse" frequency="1"/>
<variant file="quadraped/base_horse_archer.xml" name="Archer-Horse" frequency="1"/>
<variant file="quadraped/base_horse_trot.xml" name="Horse-Trot" frequency="1"/>
<variant file="quadraped/base_horse_pace.xml" name="Horse-Pace" frequency="1"/>
<variant file="quadraped/base_horse_walk.xml" name="Horse-Walk" frequency="1"/>
</group>
<material>no_trans_parallax_spec.xml</material>
</actor>
66 changes: 33 additions & 33 deletions art/actors/props/horse/cav_armor_umayyad_leather.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>props/horse/cataphract_armor.dae</mesh>
<textures>
<texture file="props/horse/cataphract_armor_norm.png" name="normTex"/>
<texture file="props/horse/cataphract_armor_spec.png" name="specTex"/>
</textures>
</variant>
</group>
<group>
<variant name="leather1">
<textures>
<texture file="props/horse/cataphract_armor_leather.png" name="baseTex"/>
</textures>
</variant>
<variant name="leather2">
<textures>
<texture file="props/horse/cataphract_armor_leather2.png" name="baseTex"/>
</textures>
</variant>
</group>
<group>
<variant file="quadraped/base_horse_javelin_fast.xml" name="Javelinist-Fast-Horse" frequency="1"/>
<variant file="quadraped/base_horse_archer_fast.xml" name="Archer-Fast-Horse" frequency="1"/>
<variant file="quadraped/base_horse_javelin.xml" name="Javelinist-Horse" frequency="1"/>
<variant file="quadraped/base_horse_chariot.xml" name="Chariot-Horse" frequency="1"/>
<variant file="quadraped/base_horse_archer.xml" name="Archer-Horse" frequency="1"/>
<variant file="quadraped/base_horse_trot.xml" name="Horse-Trot" frequency="1"/>
<variant file="quadraped/base_horse_pace.xml" name="Horse-Pace" frequency="1"/>
<variant file="quadraped/base_horse_walk.xml" name="Horse-Walk" frequency="1"/>
</group>
<material>no_trans_parallax_spec.xml</material>
<castshadow/>
<group>
<variant>
<mesh>props/horse/cataphract_armor.dae</mesh>
<textures>
<texture file="props/horse/cataphract_armor_norm.png" name="normTex"/>
<texture file="props/horse/cataphract_armor_spec.png" name="specTex"/>
</textures>
</variant>
</group>
<group>
<variant name="leather1">
<textures>
<texture file="props/horse/cataphract_armor_leather.png" name="baseTex"/>
</textures>
</variant>
<variant name="leather2">
<textures>
<texture file="props/horse/cataphract_armor_leather2.png" name="baseTex"/>
</textures>
</variant>
</group>
<group>
<variant file="quadraped/base_horse_javelin_fast.xml" name="Javelinist-Fast-Horse" frequency="1"/>
<variant file="quadraped/base_horse_archer_fast.xml" name="Archer-Fast-Horse" frequency="1"/>
<variant file="quadraped/base_horse_javelin.xml" name="Javelinist-Horse" frequency="1"/>
<variant file="quadraped/base_horse_chariot.xml" name="Chariot-Horse" frequency="1"/>
<variant file="quadraped/base_horse_archer.xml" name="Archer-Horse" frequency="1"/>
<variant file="quadraped/base_horse_trot.xml" name="Horse-Trot" frequency="1"/>
<variant file="quadraped/base_horse_pace.xml" name="Horse-Pace" frequency="1"/>
<variant file="quadraped/base_horse_walk.xml" name="Horse-Walk" frequency="1"/>
</group>
<material>no_trans_parallax_spec.xml</material>
</actor>
Loading