Author: ilor
Date: Sat Oct 16 19:58:08 2010
New Revision: 47058
URL: http://svn.gna.org/viewcvs/wesnoth?rev=47058&view=rev
Log:
Merge branch 'master' into new_addon_server
Added:
branches/new_addon_server/data/campaigns/Legend_of_Wesmere/images/portraits/haldricII.png
branches/new_addon_server/data/campaigns/Sceptre_of_Fire/images/terrain/
branches/new_addon_server/data/campaigns/Sceptre_of_Fire/images/terrain/gate-left-down.png
branches/new_addon_server/data/campaigns/Sceptre_of_Fire/images/terrain/gate-left-rising-1.png
branches/new_addon_server/data/campaigns/Sceptre_of_Fire/images/terrain/gate-left-rising-2.png
branches/new_addon_server/data/campaigns/Sceptre_of_Fire/images/terrain/gate-left-rising-3.png
branches/new_addon_server/data/campaigns/Sceptre_of_Fire/images/terrain/gate-left-up.png
branches/new_addon_server/data/campaigns/Sceptre_of_Fire/images/terrain/gate-middle-down.png
branches/new_addon_server/data/campaigns/Sceptre_of_Fire/images/terrain/gate-middle-rising-1.png
branches/new_addon_server/data/campaigns/Sceptre_of_Fire/images/terrain/gate-middle-rising-2.png
branches/new_addon_server/data/campaigns/Sceptre_of_Fire/images/terrain/gate-middle-rising-3.png
branches/new_addon_server/data/campaigns/Sceptre_of_Fire/images/terrain/gate-middle-up.png
branches/new_addon_server/data/campaigns/Sceptre_of_Fire/images/terrain/gate-right-down.png
branches/new_addon_server/data/campaigns/Sceptre_of_Fire/images/terrain/gate-right-rising-1.png
branches/new_addon_server/data/campaigns/Sceptre_of_Fire/images/terrain/gate-right-rising-2.png
branches/new_addon_server/data/campaigns/Sceptre_of_Fire/images/terrain/gate-right-rising-3.png
branches/new_addon_server/data/campaigns/Sceptre_of_Fire/images/terrain/gate-right-up.png
branches/new_addon_server/data/campaigns/Under_the_Burning_Suns/units/monsters/Fire_Guardian2.cfg
- copied, changed from r46909,
branches/new_addon_server/data/campaigns/Under_the_Burning_Suns/units/monsters/Lava_Monster2.cfg
branches/new_addon_server/data/campaigns/Under_the_Burning_Suns/units/monsters/Fire_Guardian3.cfg
- copied, changed from r46909,
branches/new_addon_server/data/campaigns/Under_the_Burning_Suns/units/monsters/Lava_Monster3.cfg
branches/new_addon_server/data/campaigns/Under_the_Burning_Suns/utils/dehydration-utils.cfg
branches/new_addon_server/data/core/images/portraits/humans/transparent/swordsman-3.png
branches/new_addon_server/data/core/images/terrain/sand/shore-convex-bl-br.png
branches/new_addon_server/data/core/images/terrain/sand/shore-convex-bl-l.png
branches/new_addon_server/data/core/images/terrain/sand/shore-convex-br-bl.png
branches/new_addon_server/data/core/images/terrain/sand/shore-convex-br-r.png
branches/new_addon_server/data/core/images/terrain/sand/shore-convex-l-bl.png
branches/new_addon_server/data/core/images/terrain/sand/shore-convex-l-tl.png
branches/new_addon_server/data/core/images/terrain/sand/shore-convex-r-br.png
branches/new_addon_server/data/core/images/terrain/sand/shore-convex-r-tr.png
branches/new_addon_server/data/core/images/terrain/sand/shore-convex-tl-l.png
branches/new_addon_server/data/core/images/terrain/sand/shore-convex-tl-tr.png
branches/new_addon_server/data/core/images/terrain/sand/shore-convex-tr-r.png
branches/new_addon_server/data/core/images/terrain/sand/shore-convex-tr-tl.png
branches/new_addon_server/data/core/images/units/dwarves/guard-bob-1.png
branches/new_addon_server/data/core/images/units/dwarves/guard-bob-2.png
branches/new_addon_server/data/core/images/units/dwarves/guard-bob-3.png
branches/new_addon_server/data/core/images/units/dwarves/guard-bob-4.png
branches/new_addon_server/data/core/images/units/dwarves/guard-bob-5.png
branches/new_addon_server/data/core/images/units/human-loyalists/spearman-stand-1.png
branches/new_addon_server/data/core/images/units/human-loyalists/spearman-stand-2.png
branches/new_addon_server/data/core/images/units/human-loyalists/spearman-stand-3.png
branches/new_addon_server/data/core/images/units/human-loyalists/spearman-stand-4.png
branches/new_addon_server/data/core/images/units/human-loyalists/spearman-stand-5.png
branches/new_addon_server/data/core/images/units/human-loyalists/spearman-stand-6.png
branches/new_addon_server/data/core/images/units/monsters/fireghost-attack1.png
- copied, changed from r46909,
branches/new_addon_server/data/campaigns/Dead_Water/images/units/monsters/fireghost-attack1.png
branches/new_addon_server/data/core/images/units/monsters/fireghost-attack2.png
- copied, changed from r46909,
branches/new_addon_server/data/campaigns/Dead_Water/images/units/monsters/fireghost-attack2.png
branches/new_addon_server/data/core/images/units/monsters/fireghost-death1.png
- copied, changed from r46909,
branches/new_addon_server/data/campaigns/Dead_Water/images/units/monsters/fireghost-death1.png
branches/new_addon_server/data/core/images/units/monsters/fireghost-death2.png
- copied, changed from r46909,
branches/new_addon_server/data/campaigns/Dead_Water/images/units/monsters/fireghost-death2.png
branches/new_addon_server/data/core/images/units/monsters/fireghost-death3.png
- copied, changed from r46909,
branches/new_addon_server/data/campaigns/Dead_Water/images/units/monsters/fireghost-death3.png
branches/new_addon_server/data/core/images/units/monsters/fireghost-death4.png
- copied, changed from r46909,
branches/new_addon_server/data/campaigns/Dead_Water/images/units/monsters/fireghost-death4.png
branches/new_addon_server/data/core/images/units/monsters/fireghost-death5.png
- copied, changed from r46909,
branches/new_addon_server/data/campaigns/Dead_Water/images/units/monsters/fireghost-death5.png
branches/new_addon_server/data/core/images/units/monsters/fireghost-death6.png
- copied, changed from r46909,
branches/new_addon_server/data/campaigns/Dead_Water/images/units/monsters/fireghost-death6.png
branches/new_addon_server/data/core/images/units/monsters/fireghost-defend.png
- copied, changed from r46909,
branches/new_addon_server/data/campaigns/Dead_Water/images/units/monsters/fireghost-defend.png
branches/new_addon_server/data/core/images/units/monsters/fireghost-ranged2.png
- copied, changed from r46909,
branches/new_addon_server/data/campaigns/Dead_Water/images/units/monsters/fireghost-ranged2.png
branches/new_addon_server/data/core/images/units/monsters/fireghost.png
- copied, changed from r46909,
branches/new_addon_server/data/campaigns/Dead_Water/images/units/monsters/fireghost.png
branches/new_addon_server/data/core/images/units/trolls/troll-hero-attack-ne-2.png
branches/new_addon_server/data/core/images/units/trolls/troll-hero-attack-ne-3.png
branches/new_addon_server/data/core/images/units/trolls/troll-hero-attack-ne-4.png
branches/new_addon_server/data/core/images/units/trolls/troll-hero-attack-ne-5.png
branches/new_addon_server/data/core/images/units/trolls/troll-hero-attack-ne-6.png
branches/new_addon_server/data/core/units/monsters/Fire_Guardian.cfg
- copied, changed from r46909,
branches/new_addon_server/data/campaigns/Under_the_Burning_Suns/units/monsters/Lava_Monster.cfg
branches/new_addon_server/data/tools/imgcheck (with props)
branches/new_addon_server/doc/manual/manual.id.html
branches/new_addon_server/src/gui/auxiliary/tips.cpp
branches/new_addon_server/src/gui/auxiliary/tips.hpp
branches/new_addon_server/utils/java/org.wesnoth/src/org/wesnoth/product/ActionWiper.java
Removed:
branches/new_addon_server/data/campaigns/Dead_Water/images/units/monsters/fireghost-attack1.png
branches/new_addon_server/data/campaigns/Dead_Water/images/units/monsters/fireghost-attack2.png
branches/new_addon_server/data/campaigns/Dead_Water/images/units/monsters/fireghost-death1.png
branches/new_addon_server/data/campaigns/Dead_Water/images/units/monsters/fireghost-death2.png
branches/new_addon_server/data/campaigns/Dead_Water/images/units/monsters/fireghost-death3.png
branches/new_addon_server/data/campaigns/Dead_Water/images/units/monsters/fireghost-death4.png
branches/new_addon_server/data/campaigns/Dead_Water/images/units/monsters/fireghost-death5.png
branches/new_addon_server/data/campaigns/Dead_Water/images/units/monsters/fireghost-death6.png
branches/new_addon_server/data/campaigns/Dead_Water/images/units/monsters/fireghost-defend.png
branches/new_addon_server/data/campaigns/Dead_Water/images/units/monsters/fireghost-ranged2.png
branches/new_addon_server/data/campaigns/Dead_Water/images/units/monsters/fireghost.png
branches/new_addon_server/data/campaigns/Dead_Water/units/Fire_Guardian.cfg
branches/new_addon_server/data/campaigns/Under_the_Burning_Suns/units/monsters/Lava_Monster.cfg
branches/new_addon_server/data/campaigns/Under_the_Burning_Suns/units/monsters/Lava_Monster2.cfg
branches/new_addon_server/data/campaigns/Under_the_Burning_Suns/units/monsters/Lava_Monster3.cfg
branches/new_addon_server/data/campaigns/Under_the_Burning_Suns/utils/traits.cfg
Modified:
branches/new_addon_server/SConstruct
branches/new_addon_server/changelog
branches/new_addon_server/data/campaigns/Eastern_Invasion/maps/04c_Mal-Ravanals_Capital.map
branches/new_addon_server/data/campaigns/Eastern_Invasion/maps/05_Northern_Outpost.map
branches/new_addon_server/data/campaigns/Eastern_Invasion/maps/12_Evacuation.map
branches/new_addon_server/data/campaigns/Eastern_Invasion/maps/17a_The_Duel.map
branches/new_addon_server/data/campaigns/Heir_To_The_Throne/maps/13_The_Dwarven_Doors.map
branches/new_addon_server/data/campaigns/Heir_To_The_Throne/maps/19a_Snow_Plains.map
branches/new_addon_server/data/campaigns/Heir_To_The_Throne/maps/19c_Cliffs_of_Thoria.map
branches/new_addon_server/data/campaigns/Heir_To_The_Throne/maps/20b_Underground_Channels.map
branches/new_addon_server/data/campaigns/Heir_To_The_Throne/maps/22_Return_to_Wesnoth.map
branches/new_addon_server/data/campaigns/Legend_of_Wesmere/maps/Kalian_map.cfg
branches/new_addon_server/data/campaigns/Legend_of_Wesmere/scenarios/01_The_Uprooting.cfg
branches/new_addon_server/data/campaigns/Legend_of_Wesmere/scenarios/02_Hostile_mountains.cfg
branches/new_addon_server/data/campaigns/Legend_of_Wesmere/scenarios/03_Kalian.cfg
branches/new_addon_server/data/campaigns/Legend_of_Wesmere/scenarios/04_Elvish_Treasury.cfg
branches/new_addon_server/data/campaigns/Legend_of_Wesmere/scenarios/08_Council_of_hard_choices.cfg
branches/new_addon_server/data/campaigns/Legend_of_Wesmere/scenarios/09_Bounty_hunters.cfg
branches/new_addon_server/data/campaigns/Legend_of_Wesmere/scenarios/10_Cliffs_of_Thoria.cfg
branches/new_addon_server/data/campaigns/Legend_of_Wesmere/scenarios/14_Human_Alliance.cfg
branches/new_addon_server/data/campaigns/Legend_of_Wesmere/scenarios/15_The_Treaty.cfg
branches/new_addon_server/data/campaigns/Legend_of_Wesmere/utils/characters.cfg
branches/new_addon_server/data/campaigns/Legend_of_Wesmere/utils/low-macros.cfg
branches/new_addon_server/data/campaigns/Liberty/maps/01_The_Raid.map
branches/new_addon_server/data/campaigns/Liberty/maps/02_Civil_Disobedience.map
branches/new_addon_server/data/campaigns/Liberty/maps/08_Glory.map
branches/new_addon_server/data/campaigns/Liberty/units/Rogue_Mage.cfg
branches/new_addon_server/data/campaigns/Liberty/units/Shadow_Lord.cfg
branches/new_addon_server/data/campaigns/Liberty/units/Shadow_Mage.cfg
branches/new_addon_server/data/campaigns/Sceptre_of_Fire/scenarios/2_Closing_the_Gates.cfg
branches/new_addon_server/data/campaigns/Son_Of_The_Black_Eye/maps/04_The_Siege_Of_Barag_Gor.map
branches/new_addon_server/data/campaigns/Son_Of_The_Black_Eye/maps/06_Black_Flag.map
branches/new_addon_server/data/campaigns/Son_Of_The_Black_Eye/maps/07_Desert_Of_Death.map
branches/new_addon_server/data/campaigns/Son_Of_The_Black_Eye/maps/10_Saving_Inarix.map
branches/new_addon_server/data/campaigns/Son_Of_The_Black_Eye/maps/11_Clash_Of_Armies.map
branches/new_addon_server/data/campaigns/Son_Of_The_Black_Eye/maps/12_Giving_Some_Back.map
branches/new_addon_server/data/campaigns/Son_Of_The_Black_Eye/maps/13_Dwarvish_Stand.map
branches/new_addon_server/data/campaigns/Son_Of_The_Black_Eye/maps/14_Back_Home.map
branches/new_addon_server/data/campaigns/Son_Of_The_Black_Eye/maps/16_Coward.map
branches/new_addon_server/data/campaigns/Son_Of_The_Black_Eye/scenarios/03_Towards_Mountains_of_Haag.cfg
branches/new_addon_server/data/campaigns/The_Rise_Of_Wesnoth/scenarios/14_Rough_Landing.cfg
branches/new_addon_server/data/campaigns/The_Rise_Of_Wesnoth/scenarios/19_The_Vanguard.cfg
branches/new_addon_server/data/campaigns/The_South_Guard/images/portraits/mal-mbrin.png
branches/new_addon_server/data/campaigns/Under_the_Burning_Suns/_main.cfg
branches/new_addon_server/data/campaigns/Under_the_Burning_Suns/maps/01_The_Morning_After.map
branches/new_addon_server/data/campaigns/Under_the_Burning_Suns/maps/02_Across_the_Harsh_Sands.map
branches/new_addon_server/data/campaigns/Under_the_Burning_Suns/maps/03_A_Stirring_in_the_Night.map
branches/new_addon_server/data/campaigns/Under_the_Burning_Suns/maps/04_Descending_into_Darkness.map
branches/new_addon_server/data/campaigns/Under_the_Burning_Suns/maps/05_A_Subterranean_Struggle.map
branches/new_addon_server/data/campaigns/Under_the_Burning_Suns/maps/06a_In_the_Tunnels_of_the_Trolls.map
branches/new_addon_server/data/campaigns/Under_the_Burning_Suns/maps/06b_In_the_Domain_of_the_Dwarves.map
branches/new_addon_server/data/campaigns/Under_the_Burning_Suns/maps/08_Out_of_the_Frying_Pan.map
branches/new_addon_server/data/campaigns/Under_the_Burning_Suns/maps/09_Blood_is_Thicker_Than_Water.map
branches/new_addon_server/data/campaigns/Under_the_Burning_Suns/maps/10_Speaking_with_the_Fishes.map
branches/new_addon_server/data/campaigns/Under_the_Burning_Suns/maps/11_Battle_for_Zocthanol_Isle.map
branches/new_addon_server/data/campaigns/Under_the_Burning_Suns/scenarios/01_The_Morning_After.cfg
branches/new_addon_server/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg
branches/new_addon_server/data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg
branches/new_addon_server/data/campaigns/Under_the_Burning_Suns/scenarios/04_Descending_into_Darkness.cfg
branches/new_addon_server/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg
branches/new_addon_server/data/campaigns/Under_the_Burning_Suns/scenarios/06a_In_the_Tunnels_of_Trolls.cfg
branches/new_addon_server/data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg
branches/new_addon_server/data/campaigns/Under_the_Burning_Suns/scenarios/07a_Dealing_with_Dwarves.cfg
branches/new_addon_server/data/campaigns/Under_the_Burning_Suns/scenarios/07b_Talking_with_Trolls.cfg
branches/new_addon_server/data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
branches/new_addon_server/data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg
branches/new_addon_server/data/campaigns/Under_the_Burning_Suns/scenarios/10_Speaking_with_the_Fishes.cfg
branches/new_addon_server/data/campaigns/Under_the_Burning_Suns/scenarios/11_Battle_for_Zocthanol_Isle.cfg
branches/new_addon_server/data/campaigns/Under_the_Burning_Suns/scenarios/12_The_Final_Confrontation.cfg
branches/new_addon_server/data/campaigns/Under_the_Burning_Suns/scenarios/13_Epilogue.cfg
branches/new_addon_server/data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Archer.cfg
branches/new_addon_server/data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Fighter.cfg
branches/new_addon_server/data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Hunter.cfg
branches/new_addon_server/data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Scout.cfg
branches/new_addon_server/data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Shaman.cfg
branches/new_addon_server/data/campaigns/Under_the_Burning_Suns/utils/macros.cfg
branches/new_addon_server/data/campaigns/Under_the_Burning_Suns/utils/storytxt.cfg
branches/new_addon_server/data/campaigns/Under_the_Burning_Suns/utils/terrain.cfg
branches/new_addon_server/data/campaigns/Under_the_Burning_Suns/utils/terrain_graphics.cfg
branches/new_addon_server/data/campaigns/Under_the_Burning_Suns/utils/time.cfg
branches/new_addon_server/data/core/about.cfg
branches/new_addon_server/data/core/hotkeys.cfg
branches/new_addon_server/data/core/images/portraits/ARTISTS
branches/new_addon_server/data/core/macros/traits.cfg
branches/new_addon_server/data/core/terrain-graphics.cfg
branches/new_addon_server/data/core/terrain-graphics/new-macros.cfg
branches/new_addon_server/data/core/terrain.cfg
branches/new_addon_server/data/core/units/drakes/Flameheart.cfg
branches/new_addon_server/data/core/units/dwarves/Guardsman.cfg
branches/new_addon_server/data/core/units/humans/Loyalist_Spearman.cfg
branches/new_addon_server/data/core/units/trolls/Hero.cfg
branches/new_addon_server/data/game_config.cfg
branches/new_addon_server/data/gui/default.cfg
branches/new_addon_server/data/lua/helper.lua
branches/new_addon_server/data/lua/location_set.lua
branches/new_addon_server/data/lua/wml-tags.lua
branches/new_addon_server/data/lua/wml/items.lua
branches/new_addon_server/data/multiplayer/scenarios/ANL_utils/ANL_leader_options.cfg
branches/new_addon_server/data/themes/default.cfg
branches/new_addon_server/data/tools/wesnoth/wmlparser.py
branches/new_addon_server/data/tools/wesnoth/wmlparser2.py
branches/new_addon_server/doc/manual/manual.cs.html
branches/new_addon_server/doc/manual/manual.de.html
branches/new_addon_server/doc/manual/manual.en.html
branches/new_addon_server/doc/manual/[email protected]
branches/new_addon_server/doc/manual/manual.en_GB.html
branches/new_addon_server/doc/manual/manual.et.html
branches/new_addon_server/doc/manual/manual.fi.html
branches/new_addon_server/doc/manual/manual.fr.html
branches/new_addon_server/doc/manual/manual.gl.html
branches/new_addon_server/doc/manual/manual.hu.html
branches/new_addon_server/doc/manual/manual.it.html
branches/new_addon_server/doc/manual/manual.pl.html
branches/new_addon_server/doc/manual/manual.sr.html
branches/new_addon_server/doc/manual/[email protected]
branches/new_addon_server/doc/manual/[email protected]
branches/new_addon_server/doc/manual/[email protected]
branches/new_addon_server/doc/manual/manual.zh_CN.html
branches/new_addon_server/doc/manual/manual.zh_TW.html
branches/new_addon_server/players_changelog
branches/new_addon_server/po/wesnoth-anl/af.po
branches/new_addon_server/po/wesnoth-anl/ar.po
branches/new_addon_server/po/wesnoth-anl/bg.po
branches/new_addon_server/po/wesnoth-anl/ca.po
branches/new_addon_server/po/wesnoth-anl/[email protected]
branches/new_addon_server/po/wesnoth-anl/cs.po
branches/new_addon_server/po/wesnoth-anl/da.po
branches/new_addon_server/po/wesnoth-anl/de.po
branches/new_addon_server/po/wesnoth-anl/el.po
branches/new_addon_server/po/wesnoth-anl/[email protected]
branches/new_addon_server/po/wesnoth-anl/en_GB.po
branches/new_addon_server/po/wesnoth-anl/eo.po
branches/new_addon_server/po/wesnoth-anl/es.po
branches/new_addon_server/po/wesnoth-anl/et.po
[... 5052 lines stripped ...]
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
