Changeset 828

Timestamp:

01/08/08 09:53:03 (11 months ago)

Author:

jritter

Message:

merging for Minions of Mirth 1.26.2 patch

Files:

• trunk/games/minionsofmirth/v1/common/ui/GuiEditorGui.gui (modified) (view diffs)
• trunk/games/minionsofmirth/v1/genesis/crafting/monsterarmor.py (modified) (view diffs)
• trunk/games/minionsofmirth/v1/genesis/dialog/MonsterEpic.py (modified) (view diffs)
• trunk/games/minionsofmirth/v1/genesis/dialog/MonsterEpicMOB.py (modified) (view diffs)
• trunk/games/minionsofmirth/v1/genesis/item/jewelry/unique.py (modified) (view diffs)
• trunk/games/minionsofmirth/v1/genesis/item/quest.py (modified) (view diffs)
• trunk/games/minionsofmirth/v1/genesis/spawn/boss_thugoth.py (modified) (view diffs)
• trunk/games/minionsofmirth/v1/genesis/spawn/elemental.py (modified) (view diffs)
• trunk/games/minionsofmirth/v1/genesis/spawn/spawngen.py (modified) (view diffs)
• trunk/games/minionsofmirth/v1/genesis/spell/shaman/buffs.py (modified) (view diffs)
• trunk/games/minionsofmirth/v1/genesis/zone/field/spawns.py (modified) (view diffs)
• trunk/games/minionsofmirth/v1/genesis/zone/hollow/hollow.py (modified) (view diffs)
• trunk/games/minionsofmirth/v1/genesis/zone/hollow/items.py (copied) (copied from branches/games/minionsofmirth/v1/testing/genesis/zone/hollow/items.py) (view diffs)
• trunk/games/minionsofmirth/v1/genesis/zone/hollow/quests.py (copied) (copied from branches/games/minionsofmirth/v1/testing/genesis/zone/hollow/quests.py) (view diffs)
• trunk/games/minionsofmirth/v1/genesis/zone/hollow/spawngroups.py (copied) (copied from branches/games/minionsofmirth/v1/testing/genesis/zone/hollow/spawngroups.py) (view diffs)
• trunk/games/minionsofmirth/v1/genesis/zone/hollow/spawns.py (copied) (copied from branches/games/minionsofmirth/v1/testing/genesis/zone/hollow/spawns.py) (view diffs)
• trunk/games/minionsofmirth/v1/genesis/zone/talrimhills/quests.py (modified) (view diffs)
• trunk/games/minionsofmirth/v1/genesis/zone/trinst/quests.py (modified) (view diffs)
• trunk/games/minionsofmirth/v1/genesis/zone/trinst/spawns.py (modified) (view diffs)
• trunk/games/minionsofmirth/v1/minions.of.mirth/data/interiors/architecture/cave4.dif (modified) (view diffs)
• trunk/games/minionsofmirth/v1/minions.of.mirth/data/interiors/architecture/cave4.qkm (modified) (view diffs)
• trunk/games/minionsofmirth/v1/minions.of.mirth/data/interiors/architecture/tent1b.dif (copied) (copied from branches/games/minionsofmirth/v1/testing/minions.of.mirth/data/interiors/architecture/tent1b.dif) (view diffs)
• trunk/games/minionsofmirth/v1/minions.of.mirth/data/interiors/architecture/tent1b.qkm (copied) (copied from branches/games/minionsofmirth/v1/testing/minions.of.mirth/data/interiors/architecture/tent1b.qkm) (view diffs)
• trunk/games/minionsofmirth/v1/minions.of.mirth/data/interiors/objects/firept6.dif (copied) (copied from branches/games/minionsofmirth/v1/testing/minions.of.mirth/data/interiors/objects/firept6.dif) (view diffs)
• trunk/games/minionsofmirth/v1/minions.of.mirth/data/interiors/objects/firept6.qkm (copied) (copied from branches/games/minionsofmirth/v1/testing/minions.of.mirth/data/interiors/objects/firept6.qkm) (view diffs)
• trunk/games/minionsofmirth/v1/minions.of.mirth/data/missions/evilcity.mis (modified) (view diffs)
• trunk/games/minionsofmirth/v1/minions.of.mirth/data/missions/hollow.mis (modified) (view diffs)
• trunk/games/minionsofmirth/v1/minions.of.mirth/data/missions/hollow.ter (modified) (view diffs)
• trunk/games/minionsofmirth/v1/minions.of.mirth/data/shapes/character/textures/head/head20.png (copied) (copied from branches/games/minionsofmirth/v1/testing/minions.of.mirth/data/shapes/character/textures/head/head20.png) (view diffs)
• trunk/games/minionsofmirth/v1/minions.of.mirth/data/sound/environment/Ambient_stereo_01.ogg (copied) (copied from branches/games/minionsofmirth/v1/testing/minions.of.mirth/data/sound/environment/Ambient_stereo_01.ogg) (view diffs)
• trunk/games/minionsofmirth/v1/minions.of.mirth/data/sound/environment/bridge_mono_01.ogg (copied) (copied from branches/games/minionsofmirth/v1/testing/minions.of.mirth/data/sound/environment/bridge_mono_01.ogg) (view diffs)
• trunk/games/minionsofmirth/v1/minions.of.mirth/data/sound/environment/crickets_mono_01.ogg (copied) (copied from branches/games/minionsofmirth/v1/testing/minions.of.mirth/data/sound/environment/crickets_mono_01.ogg) (view diffs)
• trunk/games/minionsofmirth/v1/minions.of.mirth/data/sound/environment/dock_mono_01.ogg (copied) (copied from branches/games/minionsofmirth/v1/testing/minions.of.mirth/data/sound/environment/dock_mono_01.ogg) (view diffs)
• trunk/games/minionsofmirth/v1/minions.of.mirth/data/sound/environment/stream_mono_01.ogg (copied) (copied from branches/games/minionsofmirth/v1/testing/minions.of.mirth/data/sound/environment/stream_mono_01.ogg) (view diffs)
• trunk/games/minionsofmirth/v1/minions.of.mirth/data/sound/sfx/Pickup_GemBells20.ogg (copied) (copied from branches/games/minionsofmirth/v1/testing/minions.of.mirth/data/sound/sfx/Pickup_GemBells20.ogg) (view diffs)
• trunk/games/minionsofmirth/v1/minions.of.mirth/data/ui/items/equipment/finger/7 (copied) (copied from branches/games/minionsofmirth/v1/testing/minions.of.mirth/data/ui/items/equipment/finger/7) (view diffs)
• trunk/games/minionsofmirth/v1/minions.of.mirth/data/ui/items/equipment/finger/8 (copied) (copied from branches/games/minionsofmirth/v1/testing/minions.of.mirth/data/ui/items/equipment/finger/8) (view diffs)
• trunk/games/minionsofmirth/v1/minions.of.mirth/data/ui/items/equipment/neck/12 (copied) (copied from branches/games/minionsofmirth/v1/testing/minions.of.mirth/data/ui/items/equipment/neck/12) (view diffs)
• trunk/games/minionsofmirth/v1/minions.of.mirth/data/ui/items/equipment/neck/13 (copied) (copied from branches/games/minionsofmirth/v1/testing/minions.of.mirth/data/ui/items/equipment/neck/13) (view diffs)
• trunk/games/minionsofmirth/v1/minions.of.mirth/datablocks/sgLights/TorchLight2.cs (copied) (copied from branches/games/minionsofmirth/v1/testing/minions.of.mirth/datablocks/sgLights/TorchLight2.cs) (view diffs)
• trunk/games/minionsofmirth/v1/mud/client/gui/helpWnd.py (modified) (view diffs)
• trunk/games/minionsofmirth/v1/mud/client/gui/macro.py (modified) (view diffs)
• trunk/games/minionsofmirth/v1/mud/client/gui/playerSettings.py (modified) (view diffs)
• trunk/games/minionsofmirth/v1/mud/client/gui/worldGui.py (modified) (view diffs)
• trunk/games/minionsofmirth/v1/mud/simulation/simmind.py (modified) (view diffs)
• trunk/games/minionsofmirth/v1/mud/simulation/simobject.py (modified) (view diffs)
• trunk/games/minionsofmirth/v1/mud/world/combat.py (modified) (view diffs)
• trunk/games/minionsofmirth/v1/mud/world/crafting.py (modified) (view diffs)
• trunk/games/minionsofmirth/v1/mud/world/defines.py (modified) (view diffs)
• trunk/games/minionsofmirth/v1/mud/world/effect.py (modified) (view diffs)
• trunk/games/minionsofmirth/v1/mud/world/item.py (modified) (view diffs)
• trunk/games/minionsofmirth/v1/mud/world/mob.py (modified) (view diffs)
• trunk/games/minionsofmirth/v1/mud/world/repair.py (modified) (view diffs)
• trunk/games/minionsofmirth/v1/mud/world/spell.py (modified) (view diffs)
• trunk/games/minionsofmirth/v1/mud/worldserver/embedded.py (modified) (view diffs)