biglad
04-03-2010, 11:27 AM
Merge
sql/FULL/world_script_texts.sql (http://bitbucket.org/Azrael/mga-wow-core/src/5dd0753ebae2/sql/FULL/world_script_texts.sql) (61 lines added, 0 lines removed)
src/scripts/northrend/frozen_halls/pit_of_saron/boss_forgemaster_garfrost.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/5dd0753ebae2/src/scripts/northrend/frozen_halls/pit_of_saron/boss_forgemaster_garfrost.cpp) (118 lines added, 68 lines removed)
src/scripts/northrend/frozen_halls/pit_of_saron/boss_scourgelord_tyrannus.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/5dd0753ebae2/src/scripts/northrend/frozen_halls/pit_of_saron/boss_scourgelord_tyrannus.cpp) (145 lines added, 101 lines removed)
src/game/SpellAuraEffects.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/5dd0753ebae2/src/game/SpellAuraEffects.cpp) (7 lines added, 2 lines removed)
src/game/ScriptLoader.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/5dd0753ebae2/src/game/ScriptLoader.cpp) (12 lines added, 8 lines removed)
sql/FULL/world_scripts_full.sql (http://bitbucket.org/Azrael/mga-wow-core/src/5dd0753ebae2/sql/FULL/world_scripts_full.sql) (25 lines added, 0 lines removed)
src/game/Spell.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/5dd0753ebae2/src/game/Spell.cpp) (1 lines added, 1 lines removed)
src/scripts/CMakeLists.txt (http://bitbucket.org/Azrael/mga-wow-core/src/5dd0753ebae2/src/scripts/CMakeLists.txt) (4 lines added, 0 lines removed)
src/game/Unit.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/5dd0753ebae2/src/game/Unit.cpp) (4 lines added, 3 lines removed)
src/game/SpellEffects.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/5dd0753ebae2/src/game/SpellEffects.cpp) (2 lines added, 8 lines removed)
src/scripts/northrend/frozen_halls/pit_of_saron/boss_krickandick.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/5dd0753ebae2/src/scripts/northrend/frozen_halls/pit_of_saron/boss_krickandick.cpp) (408 lines added, 174 lines removed)
win/VC90/game.vcproj (http://bitbucket.org/Azrael/mga-wow-core/src/5dd0753ebae2/win/VC90/game.vcproj) (63 lines added, 255 lines removed)
More... (http://bitbucket.org/Azrael/mga-wow-core/changeset/5dd0753ebae2/)
sql/FULL/world_script_texts.sql (http://bitbucket.org/Azrael/mga-wow-core/src/5dd0753ebae2/sql/FULL/world_script_texts.sql) (61 lines added, 0 lines removed)
src/scripts/northrend/frozen_halls/pit_of_saron/boss_forgemaster_garfrost.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/5dd0753ebae2/src/scripts/northrend/frozen_halls/pit_of_saron/boss_forgemaster_garfrost.cpp) (118 lines added, 68 lines removed)
src/scripts/northrend/frozen_halls/pit_of_saron/boss_scourgelord_tyrannus.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/5dd0753ebae2/src/scripts/northrend/frozen_halls/pit_of_saron/boss_scourgelord_tyrannus.cpp) (145 lines added, 101 lines removed)
src/game/SpellAuraEffects.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/5dd0753ebae2/src/game/SpellAuraEffects.cpp) (7 lines added, 2 lines removed)
src/game/ScriptLoader.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/5dd0753ebae2/src/game/ScriptLoader.cpp) (12 lines added, 8 lines removed)
sql/FULL/world_scripts_full.sql (http://bitbucket.org/Azrael/mga-wow-core/src/5dd0753ebae2/sql/FULL/world_scripts_full.sql) (25 lines added, 0 lines removed)
src/game/Spell.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/5dd0753ebae2/src/game/Spell.cpp) (1 lines added, 1 lines removed)
src/scripts/CMakeLists.txt (http://bitbucket.org/Azrael/mga-wow-core/src/5dd0753ebae2/src/scripts/CMakeLists.txt) (4 lines added, 0 lines removed)
src/game/Unit.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/5dd0753ebae2/src/game/Unit.cpp) (4 lines added, 3 lines removed)
src/game/SpellEffects.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/5dd0753ebae2/src/game/SpellEffects.cpp) (2 lines added, 8 lines removed)
src/scripts/northrend/frozen_halls/pit_of_saron/boss_krickandick.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/5dd0753ebae2/src/scripts/northrend/frozen_halls/pit_of_saron/boss_krickandick.cpp) (408 lines added, 174 lines removed)
win/VC90/game.vcproj (http://bitbucket.org/Azrael/mga-wow-core/src/5dd0753ebae2/win/VC90/game.vcproj) (63 lines added, 255 lines removed)
More... (http://bitbucket.org/Azrael/mga-wow-core/changeset/5dd0753ebae2/)