biglad
05-16-2010, 04:13 PM
Merge
src/game/Language.h (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/src/game/Language.h) (4 lines added, 1 lines removed)
src/game/SpellEffects.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/src/game/SpellEffects.cpp) (33 lines added, 38 lines removed)
src/game/World.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/src/game/World.cpp) (6 lines added, 2 lines removed)
src/game/Chat.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/src/game/Chat.cpp) (1 lines added, 0 lines removed)
src/game/BattleGround.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/src/game/BattleGround.cpp) (0 lines added, 135 lines removed)
src/game/Chat.h (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/src/game/Chat.h) (1 lines added, 0 lines removed)
sql/world.sql (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/sql/world.sql) (11 lines added, 8 lines removed)
sql/updates/8100_world_instance_template.sql (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/sql/updates/8100_world_instance_template.sql) (0 lines added, 61 lines removed)
sql/updates/8062_world_creature_template.sql (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/sql/updates/8062_world_creature_template.sql) (0 lines added, 1 lines removed)
src/game/Player.h (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/src/game/Player.h) (0 lines added, 1 lines removed)
sql/updates/8089_world_gameobject_template.sql (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/sql/updates/8089_world_gameobject_template.sql) (0 lines added, 1 lines removed)
src/game/World.h (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/src/game/World.h) (1 lines added, 0 lines removed)
src/game/GameObject.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/src/game/GameObject.cpp) (2 lines added, 0 lines removed)
src/game/Level2.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/src/game/Level2.cpp) (1 lines added, 1 lines removed)
sql/updates/8063_world_creature_template.sql (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/sql/updates/8063_world_creature_template.sql) (0 lines added, 2 lines removed)
sql/updates/8088_world_gameobject_template.sql (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/sql/updates/8088_world_gameobject_template.sql) (0 lines added, 1 lines removed)
sql/updates/8052_world_creature.sql (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/sql/updates/8052_world_creature.sql) (0 lines added, 3 lines removed)
sql/updates/8053_world_script_waypoint.sql (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/sql/updates/8053_world_script_waypoint.sql) (0 lines added, 28 lines removed)
sql/updates/8060_world_creature_template.sql (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/sql/updates/8060_world_creature_template.sql) (0 lines added, 1 lines removed)
src/game/SpellAuraEffects.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/src/game/SpellAuraEffects.cpp) (1 lines added, 13 lines removed)
sql/updates/8073_world_gameobject_template.sql (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/sql/updates/8073_world_gameobject_template.sql) (0 lines added, 1 lines removed)
sql/updates/8089_world_creature_template.sql (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/sql/updates/8089_world_creature_template.sql) (0 lines added, 1 lines removed)
src/game/Player.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/src/game/Player.cpp) (43 lines added, 18 lines removed)
sql/updates/8053_world_creature_template.sql (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/sql/updates/8053_world_creature_template.sql) (0 lines added, 1 lines removed)
sql/updates/8051_world_creature_template.sql (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/sql/updates/8051_world_creature_template.sql) (0 lines added, 1 lines removed)
sql/FULL/world_script_texts.sql (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/sql/FULL/world_script_texts.sql) (27 lines added, 1 lines removed)
src/game/QuestDef.h (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/src/game/QuestDef.h) (2 lines added, 2 lines removed)
src/game/Map.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/src/game/Map.cpp) (2 lines added, 2 lines removed)
sql/FULL/world_scripts_full.sql (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/sql/FULL/world_scripts_full.sql) (33 lines added, 2 lines removed)
src/game/WorldSession.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/src/game/WorldSession.cpp) (15 lines added, 9 lines removed)
src/game/Creature.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/src/game/Creature.cpp) (3 lines added, 0 lines removed)
src/trinitycore/Master.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/src/trinitycore/Master.cpp) (1 lines added, 3 lines removed)
src/trinitycore/CliRunnable.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/src/trinitycore/CliRunnable.cpp) (1 lines added, 1 lines removed)
sql/updates/8058_world_item_template.sql (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/sql/updates/8058_world_item_template.sql) (0 lines added, 1 lines removed)
src/shared/Database/SqlOperations.h (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/src/shared/Database/SqlOperations.h) (15 lines added, 7 lines removed)
src/game/WorldSession.h (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/src/game/WorldSession.h) (10 lines added, 5 lines removed)
src/trinitycore/trinitycore.conf.dist (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/src/trinitycore/trinitycore.conf.dist) (6 lines added, 0 lines removed)
src/game/SpellMgr.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/src/game/SpellMgr.cpp) (2 lines added, 0 lines removed)
src/game/Unit.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/src/game/Unit.cpp) (31 lines added, 8 lines removed)
sql/updates/8089_world_gameobject.sql (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/sql/updates/8089_world_gameobject.sql) (0 lines added, 1 lines removed)
sql/updates/8052_world_creature_template.sql (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/sql/updates/8052_world_creature_template.sql) (0 lines added, 2 lines removed)
More... (http://bitbucket.org/Azrael/mga-wow-core/changeset/64e9552ff5fd)
src/game/Language.h (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/src/game/Language.h) (4 lines added, 1 lines removed)
src/game/SpellEffects.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/src/game/SpellEffects.cpp) (33 lines added, 38 lines removed)
src/game/World.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/src/game/World.cpp) (6 lines added, 2 lines removed)
src/game/Chat.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/src/game/Chat.cpp) (1 lines added, 0 lines removed)
src/game/BattleGround.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/src/game/BattleGround.cpp) (0 lines added, 135 lines removed)
src/game/Chat.h (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/src/game/Chat.h) (1 lines added, 0 lines removed)
sql/world.sql (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/sql/world.sql) (11 lines added, 8 lines removed)
sql/updates/8100_world_instance_template.sql (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/sql/updates/8100_world_instance_template.sql) (0 lines added, 61 lines removed)
sql/updates/8062_world_creature_template.sql (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/sql/updates/8062_world_creature_template.sql) (0 lines added, 1 lines removed)
src/game/Player.h (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/src/game/Player.h) (0 lines added, 1 lines removed)
sql/updates/8089_world_gameobject_template.sql (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/sql/updates/8089_world_gameobject_template.sql) (0 lines added, 1 lines removed)
src/game/World.h (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/src/game/World.h) (1 lines added, 0 lines removed)
src/game/GameObject.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/src/game/GameObject.cpp) (2 lines added, 0 lines removed)
src/game/Level2.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/src/game/Level2.cpp) (1 lines added, 1 lines removed)
sql/updates/8063_world_creature_template.sql (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/sql/updates/8063_world_creature_template.sql) (0 lines added, 2 lines removed)
sql/updates/8088_world_gameobject_template.sql (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/sql/updates/8088_world_gameobject_template.sql) (0 lines added, 1 lines removed)
sql/updates/8052_world_creature.sql (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/sql/updates/8052_world_creature.sql) (0 lines added, 3 lines removed)
sql/updates/8053_world_script_waypoint.sql (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/sql/updates/8053_world_script_waypoint.sql) (0 lines added, 28 lines removed)
sql/updates/8060_world_creature_template.sql (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/sql/updates/8060_world_creature_template.sql) (0 lines added, 1 lines removed)
src/game/SpellAuraEffects.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/src/game/SpellAuraEffects.cpp) (1 lines added, 13 lines removed)
sql/updates/8073_world_gameobject_template.sql (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/sql/updates/8073_world_gameobject_template.sql) (0 lines added, 1 lines removed)
sql/updates/8089_world_creature_template.sql (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/sql/updates/8089_world_creature_template.sql) (0 lines added, 1 lines removed)
src/game/Player.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/src/game/Player.cpp) (43 lines added, 18 lines removed)
sql/updates/8053_world_creature_template.sql (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/sql/updates/8053_world_creature_template.sql) (0 lines added, 1 lines removed)
sql/updates/8051_world_creature_template.sql (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/sql/updates/8051_world_creature_template.sql) (0 lines added, 1 lines removed)
sql/FULL/world_script_texts.sql (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/sql/FULL/world_script_texts.sql) (27 lines added, 1 lines removed)
src/game/QuestDef.h (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/src/game/QuestDef.h) (2 lines added, 2 lines removed)
src/game/Map.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/src/game/Map.cpp) (2 lines added, 2 lines removed)
sql/FULL/world_scripts_full.sql (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/sql/FULL/world_scripts_full.sql) (33 lines added, 2 lines removed)
src/game/WorldSession.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/src/game/WorldSession.cpp) (15 lines added, 9 lines removed)
src/game/Creature.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/src/game/Creature.cpp) (3 lines added, 0 lines removed)
src/trinitycore/Master.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/src/trinitycore/Master.cpp) (1 lines added, 3 lines removed)
src/trinitycore/CliRunnable.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/src/trinitycore/CliRunnable.cpp) (1 lines added, 1 lines removed)
sql/updates/8058_world_item_template.sql (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/sql/updates/8058_world_item_template.sql) (0 lines added, 1 lines removed)
src/shared/Database/SqlOperations.h (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/src/shared/Database/SqlOperations.h) (15 lines added, 7 lines removed)
src/game/WorldSession.h (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/src/game/WorldSession.h) (10 lines added, 5 lines removed)
src/trinitycore/trinitycore.conf.dist (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/src/trinitycore/trinitycore.conf.dist) (6 lines added, 0 lines removed)
src/game/SpellMgr.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/src/game/SpellMgr.cpp) (2 lines added, 0 lines removed)
src/game/Unit.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/src/game/Unit.cpp) (31 lines added, 8 lines removed)
sql/updates/8089_world_gameobject.sql (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/sql/updates/8089_world_gameobject.sql) (0 lines added, 1 lines removed)
sql/updates/8052_world_creature_template.sql (http://bitbucket.org/Azrael/mga-wow-core/src/64e9552ff5fd/sql/updates/8052_world_creature_template.sql) (0 lines added, 2 lines removed)
More... (http://bitbucket.org/Azrael/mga-wow-core/changeset/64e9552ff5fd)