biglad
12-21-2009, 03:50 AM
merge
sql/FULL/world_script_texts.sql (http://bitbucket.org/Azrael/mga-322a/src/8d0c39d2da0b/sql/FULL/world_script_texts.sql) (3 lines added, 0 lines removed)
src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp (http://bitbucket.org/Azrael/mga-322a/src/8d0c39d2da0b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp) (2 lines added, 1 lines removed)
src/trinityrealm/CMakeLists.txt (http://bitbucket.org/Azrael/mga-322a/src/8d0c39d2da0b/src/trinityrealm/CMakeLists.txt) (1 lines added, 0 lines removed)
src/game/Creature.cpp (http://bitbucket.org/Azrael/mga-322a/src/8d0c39d2da0b/src/game/Creature.cpp) (9 lines added, 7 lines removed)
src/game/World.cpp (http://bitbucket.org/Azrael/mga-322a/src/8d0c39d2da0b/src/game/World.cpp) (3 lines added, 0 lines removed)
sql/FULL/world_scripts_full.sql (http://bitbucket.org/Azrael/mga-322a/src/8d0c39d2da0b/sql/FULL/world_scripts_full.sql) (1 lines added, 0 lines removed)
src/game/SpellEffects.cpp (http://bitbucket.org/Azrael/mga-322a/src/8d0c39d2da0b/src/game/SpellEffects.cpp) (11 lines added, 1 lines removed)
src/bindings/scripts/scripts/northrend/zuldrak.cpp (http://bitbucket.org/Azrael/mga-322a/src/8d0c39d2da0b/src/bindings/scripts/scripts/northrend/zuldrak.cpp) (34 lines added, 1 lines removed)
src/trinityrealm/AuthSocket.cpp (http://bitbucket.org/Azrael/mga-322a/src/8d0c39d2da0b/src/trinityrealm/AuthSocket.cpp) (12 lines added, 23 lines removed)
src/game/SpellAuras.cpp (http://bitbucket.org/Azrael/mga-322a/src/8d0c39d2da0b/src/game/SpellAuras.cpp) (27 lines added, 9 lines removed)
src/shared/SystemConfig.h (http://bitbucket.org/Azrael/mga-322a/src/8d0c39d2da0b/src/shared/SystemConfig.h) (1 lines added, 1 lines removed)
More... (http://bitbucket.org/Azrael/mga-322a/changeset/8d0c39d2da0b/)
sql/FULL/world_script_texts.sql (http://bitbucket.org/Azrael/mga-322a/src/8d0c39d2da0b/sql/FULL/world_script_texts.sql) (3 lines added, 0 lines removed)
src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp (http://bitbucket.org/Azrael/mga-322a/src/8d0c39d2da0b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp) (2 lines added, 1 lines removed)
src/trinityrealm/CMakeLists.txt (http://bitbucket.org/Azrael/mga-322a/src/8d0c39d2da0b/src/trinityrealm/CMakeLists.txt) (1 lines added, 0 lines removed)
src/game/Creature.cpp (http://bitbucket.org/Azrael/mga-322a/src/8d0c39d2da0b/src/game/Creature.cpp) (9 lines added, 7 lines removed)
src/game/World.cpp (http://bitbucket.org/Azrael/mga-322a/src/8d0c39d2da0b/src/game/World.cpp) (3 lines added, 0 lines removed)
sql/FULL/world_scripts_full.sql (http://bitbucket.org/Azrael/mga-322a/src/8d0c39d2da0b/sql/FULL/world_scripts_full.sql) (1 lines added, 0 lines removed)
src/game/SpellEffects.cpp (http://bitbucket.org/Azrael/mga-322a/src/8d0c39d2da0b/src/game/SpellEffects.cpp) (11 lines added, 1 lines removed)
src/bindings/scripts/scripts/northrend/zuldrak.cpp (http://bitbucket.org/Azrael/mga-322a/src/8d0c39d2da0b/src/bindings/scripts/scripts/northrend/zuldrak.cpp) (34 lines added, 1 lines removed)
src/trinityrealm/AuthSocket.cpp (http://bitbucket.org/Azrael/mga-322a/src/8d0c39d2da0b/src/trinityrealm/AuthSocket.cpp) (12 lines added, 23 lines removed)
src/game/SpellAuras.cpp (http://bitbucket.org/Azrael/mga-322a/src/8d0c39d2da0b/src/game/SpellAuras.cpp) (27 lines added, 9 lines removed)
src/shared/SystemConfig.h (http://bitbucket.org/Azrael/mga-322a/src/8d0c39d2da0b/src/shared/SystemConfig.h) (1 lines added, 1 lines removed)
More... (http://bitbucket.org/Azrael/mga-322a/changeset/8d0c39d2da0b/)