[Wesnoth-commits] r10068 - in /trunk: data/units/ images/units/merfolk/ (February 12, 2006 - 04:14)

Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Headers

 

Author: eleazar
Date: Sun Feb 12 04:13:03 2006
New Revision: 10068

URL: http://svn.gna.org/viewcvs/wesnoth?rev=10068&view=rev
Log:
removed 'merm*-' from merfolk names and rewired CFGs and deleted unused merman images.

Added:
    trunk/images/units/merfolk/diviner-defend.png
      - copied unchanged from r10067, trunk/images/units/merfolk/mermaid-diviner-defend.png
    trunk/images/units/merfolk/diviner-magic1.png
      - copied unchanged from r10067, trunk/images/units/merfolk/mermaid-diviner-magic1.png
    trunk/images/units/merfolk/diviner-magic2.png
      - copied unchanged from r10067, trunk/images/units/merfolk/mermaid-diviner-magic2.png
    trunk/images/units/merfolk/diviner-magic3.png
      - copied unchanged from r10067, trunk/images/units/merfolk/mermaid-diviner-magic3.png
    trunk/images/units/merfolk/diviner-magic4.png
      - copied unchanged from r10067, trunk/images/units/merfolk/mermaid-diviner-magic4.png
    trunk/images/units/merfolk/diviner-magic5.png
      - copied unchanged from r10067, trunk/images/units/merfolk/mermaid-diviner-magic5.png
    trunk/images/units/merfolk/diviner-magic6.png
      - copied unchanged from r10067, trunk/images/units/merfolk/mermaid-diviner-magic6.png
    trunk/images/units/merfolk/diviner-staff-attack.png
      - copied unchanged from r10067, trunk/images/units/merfolk/mermaid-diviner-staff-attack.png
    trunk/images/units/merfolk/diviner.png
      - copied unchanged from r10067, trunk/images/units/merfolk/mermaid-diviner.png
    trunk/images/units/merfolk/enchantress-defend.png
      - copied unchanged from r10067, trunk/images/units/merfolk/mermaid-enchantress-defend.png
    trunk/images/units/merfolk/enchantress-staff-attack.png
      - copied unchanged from r10067, trunk/images/units/merfolk/mermaid-enchantress-staff-attack.png
    trunk/images/units/merfolk/enchantress-water-attack1.png
      - copied unchanged from r10067, trunk/images/units/merfolk/mermaid-enchantress-water-attack1.png
    trunk/images/units/merfolk/enchantress-water-attack2.png
      - copied unchanged from r10067, trunk/images/units/merfolk/mermaid-enchantress-water-attack2.png
    trunk/images/units/merfolk/enchantress-water-attack3.png
      - copied unchanged from r10067, trunk/images/units/merfolk/mermaid-enchantress-water-attack3.png
    trunk/images/units/merfolk/enchantress-water-attack4.png
      - copied unchanged from r10067, trunk/images/units/merfolk/mermaid-enchantress-water-attack4.png
    trunk/images/units/merfolk/enchantress-water-attack5.png
      - copied unchanged from r10067, trunk/images/units/merfolk/mermaid-enchantress-water-attack5.png
    trunk/images/units/merfolk/enchantress-water-attack6.png
      - copied unchanged from r10067, trunk/images/units/merfolk/mermaid-enchantress-water-attack6.png
    trunk/images/units/merfolk/enchantress-water-attack7.png
      - copied unchanged from r10067, trunk/images/units/merfolk/mermaid-enchantress-water-attack7.png
    trunk/images/units/merfolk/enchantress.png
      - copied unchanged from r10067, trunk/images/units/merfolk/mermaid-enchantress.png
    trunk/images/units/merfolk/entangler.png
      - copied unchanged from r10067, trunk/images/units/merfolk/merman-entangler.png
    trunk/images/units/merfolk/fighter-attack.png
      - copied unchanged from r10067, trunk/images/units/merfolk/merman-fighter-attack.png
    trunk/images/units/merfolk/fighter-defend.png
      - copied unchanged from r10067, trunk/images/units/merfolk/merman-fighter-defend.png
    trunk/images/units/merfolk/fighter.png
      - copied unchanged from r10067, trunk/images/units/merfolk/merman-fighter.png
    trunk/images/units/merfolk/hoplite-attack.png
      - copied unchanged from r10067, trunk/images/units/merfolk/merman-hoplite-attack.png
    trunk/images/units/merfolk/hoplite-defend.png
      - copied unchanged from r10067, trunk/images/units/merfolk/merman-hoplite-defend.png
    trunk/images/units/merfolk/hoplite.png
      - copied unchanged from r10067, trunk/images/units/merfolk/merman-hoplite.png
    trunk/images/units/merfolk/hunter-attack-n.png
      - copied unchanged from r10067, trunk/images/units/merfolk/merman-hunter-attack-n.png
    trunk/images/units/merfolk/hunter-attack-ne.png
      - copied unchanged from r10067, trunk/images/units/merfolk/merman-hunter-attack-ne.png
    trunk/images/units/merfolk/hunter-attack-ranged.png
      - copied unchanged from r10067, trunk/images/units/merfolk/merman-hunter-attack-ranged.png
    trunk/images/units/merfolk/hunter-attack-s.png
      - copied unchanged from r10067, trunk/images/units/merfolk/merman-hunter-attack-s.png
    trunk/images/units/merfolk/hunter-attack-se.png
      - copied unchanged from r10067, trunk/images/units/merfolk/merman-hunter-attack-se.png
    trunk/images/units/merfolk/hunter-defend.png
      - copied unchanged from r10067, trunk/images/units/merfolk/merman-hunter-defend.png
    trunk/images/units/merfolk/hunter.png
      - copied unchanged from r10067, trunk/images/units/merfolk/merman-hunter.png
    trunk/images/units/merfolk/initiate-defend.png
      - copied unchanged from r10067, trunk/images/units/merfolk/mermaid-initiate-defend.png
    trunk/images/units/merfolk/initiate-staff-attack.png
      - copied unchanged from r10067, trunk/images/units/merfolk/mermaid-initiate-staff-attack.png
    trunk/images/units/merfolk/initiate-water-attack1.png
      - copied unchanged from r10067, trunk/images/units/merfolk/mermaid-initiate-water-attack1.png
    trunk/images/units/merfolk/initiate-water-attack2.png
      - copied unchanged from r10067, trunk/images/units/merfolk/mermaid-initiate-water-attack2.png
    trunk/images/units/merfolk/initiate-water-attack3.png
      - copied unchanged from r10067, trunk/images/units/merfolk/mermaid-initiate-water-attack3.png
    trunk/images/units/merfolk/initiate-water-attack4.png
      - copied unchanged from r10067, trunk/images/units/merfolk/mermaid-initiate-water-attack4.png
    trunk/images/units/merfolk/initiate-water-attack5.png
      - copied unchanged from r10067, trunk/images/units/merfolk/mermaid-initiate-water-attack5.png
    trunk/images/units/merfolk/initiate-water-attack6.png
      - copied unchanged from r10067, trunk/images/units/merfolk/mermaid-initiate-water-attack6.png
    trunk/images/units/merfolk/initiate-water-attack7.png
      - copied unchanged from r10067, trunk/images/units/merfolk/mermaid-initiate-water-attack7.png
    trunk/images/units/merfolk/initiate.png
      - copied unchanged from r10067, trunk/images/units/merfolk/mermaid-initiate.png
    trunk/images/units/merfolk/javelineer-attack-n.png
      - copied unchanged from r10067, trunk/images/units/merfolk/merman-javelineer-attack-n.png
    trunk/images/units/merfolk/javelineer-attack-ne.png
      - copied unchanged from r10067, trunk/images/units/merfolk/merman-javelineer-attack-ne.png
    trunk/images/units/merfolk/javelineer-attack-ranged.png
      - copied unchanged from r10067, trunk/images/units/merfolk/merman-javelineer-attack-ranged.png
    trunk/images/units/merfolk/javelineer-attack-s.png
      - copied unchanged from r10067, trunk/images/units/merfolk/merman-javelineer-attack-s.png
    trunk/images/units/merfolk/javelineer-attack-se.png
      - copied unchanged from r10067, trunk/images/units/merfolk/merman-javelineer-attack-se.png
    trunk/images/units/merfolk/javelineer-defend.png
      - copied unchanged from r10067, trunk/images/units/merfolk/merman-javelineer-defend.png
    trunk/images/units/merfolk/javelineer.png
      - copied unchanged from r10067, trunk/images/units/merfolk/merman-javelineer.png
    trunk/images/units/merfolk/king-attack.png
      - copied unchanged from r10067, trunk/images/units/merfolk/merman-king-attack.png
    trunk/images/units/merfolk/king-defend.png
      - copied unchanged from r10067, trunk/images/units/merfolk/merman-king-defend.png
    trunk/images/units/merfolk/king.png
      - copied unchanged from r10067, trunk/images/units/merfolk/merman-king.png
    trunk/images/units/merfolk/netcaster.png
      - copied unchanged from r10067, trunk/images/units/merfolk/merman-netcaster.png
    trunk/images/units/merfolk/priestess-defend.png
      - copied unchanged from r10067, trunk/images/units/merfolk/mermaid-priestess-defend.png
    trunk/images/units/merfolk/priestess-magic1.png
      - copied unchanged from r10067, trunk/images/units/merfolk/mermaid-priestess-magic1.png
    trunk/images/units/merfolk/priestess-magic2.png
      - copied unchanged from r10067, trunk/images/units/merfolk/mermaid-priestess-magic2.png
    trunk/images/units/merfolk/priestess-magic3.png
      - copied unchanged from r10067, trunk/images/units/merfolk/mermaid-priestess-magic3.png
    trunk/images/units/merfolk/priestess-magic4.png
      - copied unchanged from r10067, trunk/images/units/merfolk/mermaid-priestess-magic4.png
    trunk/images/units/merfolk/priestess-magic5.png
      - copied unchanged from r10067, trunk/images/units/merfolk/mermaid-priestess-magic5.png
    trunk/images/units/merfolk/priestess-magic6.png
      - copied unchanged from r10067, trunk/images/units/merfolk/mermaid-priestess-magic6.png
    trunk/images/units/merfolk/priestess-staff-attack.png
      - copied unchanged from r10067, trunk/images/units/merfolk/mermaid-priestess-staff-attack.png
    trunk/images/units/merfolk/priestess.png
      - copied unchanged from r10067, trunk/images/units/merfolk/mermaid-priestess.png
    trunk/images/units/merfolk/siren-defend.png
      - copied unchanged from r10067, trunk/images/units/merfolk/mermaid-siren-defend.png
    trunk/images/units/merfolk/siren-naia-touch-attack1.png
      - copied unchanged from r10067, trunk/images/units/merfolk/mermaid-siren-naia-touch-attack1.png
    trunk/images/units/merfolk/siren-naia-touch-attack2.png
      - copied unchanged from r10067, trunk/images/units/merfolk/mermaid-siren-naia-touch-attack2.png
    trunk/images/units/merfolk/siren-naia-touch-attack3.png
      - copied unchanged from r10067, trunk/images/units/merfolk/mermaid-siren-naia-touch-attack3.png
    trunk/images/units/merfolk/siren-naia-touch-attack4.png
      - copied unchanged from r10067, trunk/images/units/merfolk/mermaid-siren-naia-touch-attack4.png
    trunk/images/units/merfolk/siren-water-attack1.png
      - copied unchanged from r10067, trunk/images/units/merfolk/mermaid-siren-water-attack1.png
    trunk/images/units/merfolk/siren-water-attack2.png
      - copied unchanged from r10067, trunk/images/units/merfolk/mermaid-siren-water-attack2.png
    trunk/images/units/merfolk/siren-water-attack3.png
      - copied unchanged from r10067, trunk/images/units/merfolk/mermaid-siren-water-attack3.png
    trunk/images/units/merfolk/siren-water-attack4.png
      - copied unchanged from r10067, trunk/images/units/merfolk/mermaid-siren-water-attack4.png
    trunk/images/units/merfolk/siren-water-attack5.png
      - copied unchanged from r10067, trunk/images/units/merfolk/mermaid-siren-water-attack5.png
    trunk/images/units/merfolk/siren-water-attack6.png
      - copied unchanged from r10067, trunk/images/units/merfolk/mermaid-siren-water-attack6.png
    trunk/images/units/merfolk/siren-water-attack7.png
      - copied unchanged from r10067, trunk/images/units/merfolk/mermaid-siren-water-attack7.png
    trunk/images/units/merfolk/siren.png
      - copied unchanged from r10067, trunk/images/units/merfolk/mermaid-siren.png
    trunk/images/units/merfolk/spearman-attack-n.png
      - copied unchanged from r10067, trunk/images/units/merfolk/merman-spearman-attack-n.png
    trunk/images/units/merfolk/spearman-attack-ne.png
      - copied unchanged from r10067, trunk/images/units/merfolk/merman-spearman-attack-ne.png
    trunk/images/units/merfolk/spearman-attack-ranged.png
      - copied unchanged from r10067, trunk/images/units/merfolk/merman-spearman-attack-ranged.png
    trunk/images/units/merfolk/spearman-attack-s.png
      - copied unchanged from r10067, trunk/images/units/merfolk/merman-spearman-attack-s.png
    trunk/images/units/merfolk/spearman-attack-se.png
      - copied unchanged from r10067, trunk/images/units/merfolk/merman-spearman-attack-se.png
    trunk/images/units/merfolk/spearman-defend.png
      - copied unchanged from r10067, trunk/images/units/merfolk/merman-spearman-defend.png
    trunk/images/units/merfolk/spearman.png
      - copied unchanged from r10067, trunk/images/units/merfolk/merman-spearman.png
    trunk/images/units/merfolk/triton-attack-blade.png
      - copied unchanged from r10067, trunk/images/units/merfolk/merman-triton-attack-blade.png
    trunk/images/units/merfolk/triton-attack-pierce.png
      - copied unchanged from r10067, trunk/images/units/merfolk/merman-triton-attack-pierce.png
    trunk/images/units/merfolk/triton-defend.png
      - copied unchanged from r10067, trunk/images/units/merfolk/merman-triton-defend.png
    trunk/images/units/merfolk/triton.png
      - copied unchanged from r10067, trunk/images/units/merfolk/merman-triton.png
    trunk/images/units/merfolk/warrior-attack.png
      - copied unchanged from r10067, trunk/images/units/merfolk/merman-warrior-attack.png
    trunk/images/units/merfolk/warrior-defend.png
      - copied unchanged from r10067, trunk/images/units/merfolk/merman-warrior-defend.png
    trunk/images/units/merfolk/warrior.png
      - copied unchanged from r10067, trunk/images/units/merfolk/merman-warrior.png
Removed:
    trunk/images/units/merfolk/mermaid-diviner-defend.png
    trunk/images/units/merfolk/mermaid-diviner-magic1.png
    trunk/images/units/merfolk/mermaid-diviner-magic2.png
    trunk/images/units/merfolk/mermaid-diviner-magic3.png
    trunk/images/units/merfolk/mermaid-diviner-magic4.png
    trunk/images/units/merfolk/mermaid-diviner-magic5.png
    trunk/images/units/merfolk/mermaid-diviner-magic6.png
    trunk/images/units/merfolk/mermaid-diviner-staff-attack.png
    trunk/images/units/merfolk/mermaid-diviner.png
    trunk/images/units/merfolk/mermaid-enchantress-defend.png
    trunk/images/units/merfolk/mermaid-enchantress-staff-attack.png
    trunk/images/units/merfolk/mermaid-enchantress-water-attack1.png
    trunk/images/units/merfolk/mermaid-enchantress-water-attack2.png
    trunk/images/units/merfolk/mermaid-enchantress-water-attack3.png
    trunk/images/units/merfolk/mermaid-enchantress-water-attack4.png
    trunk/images/units/merfolk/mermaid-enchantress-water-attack5.png
    trunk/images/units/merfolk/mermaid-enchantress-water-attack6.png
    trunk/images/units/merfolk/mermaid-enchantress-water-attack7.png
    trunk/images/units/merfolk/mermaid-enchantress.png
    trunk/images/units/merfolk/mermaid-initiate-defend.png
    trunk/images/units/merfolk/mermaid-initiate-staff-attack.png
    trunk/images/units/merfolk/mermaid-initiate-water-attack1.png
    trunk/images/units/merfolk/mermaid-initiate-water-attack2.png
    trunk/images/units/merfolk/mermaid-initiate-water-attack3.png
    trunk/images/units/merfolk/mermaid-initiate-water-attack4.png
    trunk/images/units/merfolk/mermaid-initiate-water-attack5.png
    trunk/images/units/merfolk/mermaid-initiate-water-attack6.png
    trunk/images/units/merfolk/mermaid-initiate-water-attack7.png
    trunk/images/units/merfolk/mermaid-initiate.png
    trunk/images/units/merfolk/mermaid-priestess-defend.png
    trunk/images/units/merfolk/mermaid-priestess-magic1.png
    trunk/images/units/merfolk/mermaid-priestess-magic2.png
    trunk/images/units/merfolk/mermaid-priestess-magic3.png
    trunk/images/units/merfolk/mermaid-priestess-magic4.png
    trunk/images/units/merfolk/mermaid-priestess-magic5.png
    trunk/images/units/merfolk/mermaid-priestess-magic6.png
    trunk/images/units/merfolk/mermaid-priestess-staff-attack.png
    trunk/images/units/merfolk/mermaid-priestess.png
    trunk/images/units/merfolk/mermaid-siren-defend.png
    trunk/images/units/merfolk/mermaid-siren-naia-touch-attack1.png
    trunk/images/units/merfolk/mermaid-siren-naia-touch-attack2.png
    trunk/images/units/merfolk/mermaid-siren-naia-touch-attack3.png
    trunk/images/units/merfolk/mermaid-siren-naia-touch-attack4.png
    trunk/images/units/merfolk/mermaid-siren-water-attack1.png
    trunk/images/units/merfolk/mermaid-siren-water-attack2.png
    trunk/images/units/merfolk/mermaid-siren-water-attack3.png
    trunk/images/units/merfolk/mermaid-siren-water-attack4.png
    trunk/images/units/merfolk/mermaid-siren-water-attack5.png
    trunk/images/units/merfolk/mermaid-siren-water-attack6.png
    trunk/images/units/merfolk/mermaid-siren-water-attack7.png
    trunk/images/units/merfolk/mermaid-siren.png
    trunk/images/units/merfolk/merman-attack.png
    trunk/images/units/merfolk/merman-defend.png
    trunk/images/units/merfolk/merman-entangler.png
    trunk/images/units/merfolk/merman-fighter-attack.png
    trunk/images/units/merfolk/merman-fighter-defend.png
    trunk/images/units/merfolk/merman-fighter.png
    trunk/images/units/merfolk/merman-hoplite-attack.png
    trunk/images/units/merfolk/merman-hoplite-defend.png
    trunk/images/units/merfolk/merman-hoplite.png
    trunk/images/units/merfolk/merman-hunter-attack-n.png
    trunk/images/units/merfolk/merman-hunter-attack-ne.png
    trunk/images/units/merfolk/merman-hunter-attack-ranged.png
    trunk/images/units/merfolk/merman-hunter-attack-s.png
    trunk/images/units/merfolk/merman-hunter-attack-se.png
    trunk/images/units/merfolk/merman-hunter-defend.png
    trunk/images/units/merfolk/merman-hunter.png
    trunk/images/units/merfolk/merman-javelineer-attack-n.png
    trunk/images/units/merfolk/merman-javelineer-attack-ne.png
    trunk/images/units/merfolk/merman-javelineer-attack-ranged.png
    trunk/images/units/merfolk/merman-javelineer-attack-s.png
    trunk/images/units/merfolk/merman-javelineer-attack-se.png
    trunk/images/units/merfolk/merman-javelineer-defend.png
    trunk/images/units/merfolk/merman-javelineer.png
    trunk/images/units/merfolk/merman-king-attack.png
    trunk/images/units/merfolk/merman-king-defend.png
    trunk/images/units/merfolk/merman-king.png
    trunk/images/units/merfolk/merman-netcaster.png
    trunk/images/units/merfolk/merman-spearman-attack-n.png
    trunk/images/units/merfolk/merman-spearman-attack-ne.png
    trunk/images/units/merfolk/merman-spearman-attack-ranged.png
    trunk/images/units/merfolk/merman-spearman-attack-s.png
    trunk/images/units/merfolk/merman-spearman-attack-se.png
    trunk/images/units/merfolk/merman-spearman-defend.png
    trunk/images/units/merfolk/merman-spearman.png
    trunk/images/units/merfolk/merman-triton-attack-blade.png
    trunk/images/units/merfolk/merman-triton-attack-pierce.png
    trunk/images/units/merfolk/merman-triton-defend.png
    trunk/images/units/merfolk/merman-triton.png
    trunk/images/units/merfolk/merman-warrior-attack.png
    trunk/images/units/merfolk/merman-warrior-defend.png
    trunk/images/units/merfolk/merman-warrior.png
    trunk/images/units/merfolk/merman.png
Modified:
    trunk/data/units/Mermaid_Diviner.cfg
    trunk/data/units/Mermaid_Enchantress.cfg
    trunk/data/units/Mermaid_Initiate.cfg
    trunk/data/units/Mermaid_Priestess.cfg
    trunk/data/units/Mermaid_Siren.cfg
    trunk/data/units/Merman_Entangler.cfg
    trunk/data/units/Merman_Fighter.cfg
    trunk/data/units/Merman_Hoplite.cfg
    trunk/data/units/Merman_Hunter.cfg
    trunk/data/units/Merman_Javelineer.cfg
    trunk/data/units/Merman_Netcaster.cfg
    trunk/data/units/Merman_Spearman.cfg
    trunk/data/units/Merman_Triton.cfg
    trunk/data/units/Merman_Warrior.cfg

[This mail would be too long, it was shortened to contain the URLs only.]

Modified: trunk/data/units/Mermaid_Diviner.cfg
URL: http://svn.gna.org/viewcvs/wesnoth/trunk/data/units/Mermaid_Diviner.cfg?rev=10068&r1=10067&r2=10068&view=diff

Modified: trunk/data/units/Mermaid_Enchantress.cfg
URL: http://svn.gna.org/viewcvs/wesnoth/trunk/data/units/Mermaid_Enchantress.cfg?rev=10068&r1=10067&r2=10068&view=diff


[... 36 lines stripped ...]


Related Mails




Powered by MHonArc, Updated Sun Feb 12 10:20:16 2006