biglad
07-30-2009, 10:40 AM
merge
sql/updates/8247_01_mangos_spell_bonus_data.sql.tbd (http://bitbucket.org/Azrael/mgacore2/src/2bb2e0eb21d0/sql/updates/8247_01_mangos_spell_bonus_data.sql.tbd) (0 lines added, 18 lines removed)
sql/updates/8249_01_mangos_spell_proc_item_enchant.sql.tbd (http://bitbucket.org/Azrael/mgacore2/src/2bb2e0eb21d0/sql/updates/8249_01_mangos_spell_proc_item_enchant.sql.tbd) (0 lines added, 13 lines removed)
src/game/World.cpp (http://bitbucket.org/Azrael/mgacore2/src/2bb2e0eb21d0/src/game/World.cpp) (3 lines added, 3 lines removed)
sql/updates/8249_02_mangos_spell_chain.sql.tbd (http://bitbucket.org/Azrael/mgacore2/src/2bb2e0eb21d0/sql/updates/8249_02_mangos_spell_chain.sql.tbd) (0 lines added, 31 lines removed)
src/game/Chat.cpp (http://bitbucket.org/Azrael/mgacore2/src/2bb2e0eb21d0/src/game/Chat.cpp) (0 lines added, 1 lines removed)
src/game/Chat.h (http://bitbucket.org/Azrael/mgacore2/src/2bb2e0eb21d0/src/game/Chat.h) (0 lines added, 1 lines removed)
src/game/SpellEffects.cpp (http://bitbucket.org/Azrael/mgacore2/src/2bb2e0eb21d0/src/game/SpellEffects.cpp) (14 lines added, 4 lines removed)
src/shared/SystemConfig.h (http://bitbucket.org/Azrael/mgacore2/src/2bb2e0eb21d0/src/shared/SystemConfig.h) (1 lines added, 1 lines removed)
src/game/Player.cpp (http://bitbucket.org/Azrael/mgacore2/src/2bb2e0eb21d0/src/game/Player.cpp) (0 lines added, 1 lines removed)
More... (http://bitbucket.org/Azrael/mgacore2/changeset/2bb2e0eb21d0/)
sql/updates/8247_01_mangos_spell_bonus_data.sql.tbd (http://bitbucket.org/Azrael/mgacore2/src/2bb2e0eb21d0/sql/updates/8247_01_mangos_spell_bonus_data.sql.tbd) (0 lines added, 18 lines removed)
sql/updates/8249_01_mangos_spell_proc_item_enchant.sql.tbd (http://bitbucket.org/Azrael/mgacore2/src/2bb2e0eb21d0/sql/updates/8249_01_mangos_spell_proc_item_enchant.sql.tbd) (0 lines added, 13 lines removed)
src/game/World.cpp (http://bitbucket.org/Azrael/mgacore2/src/2bb2e0eb21d0/src/game/World.cpp) (3 lines added, 3 lines removed)
sql/updates/8249_02_mangos_spell_chain.sql.tbd (http://bitbucket.org/Azrael/mgacore2/src/2bb2e0eb21d0/sql/updates/8249_02_mangos_spell_chain.sql.tbd) (0 lines added, 31 lines removed)
src/game/Chat.cpp (http://bitbucket.org/Azrael/mgacore2/src/2bb2e0eb21d0/src/game/Chat.cpp) (0 lines added, 1 lines removed)
src/game/Chat.h (http://bitbucket.org/Azrael/mgacore2/src/2bb2e0eb21d0/src/game/Chat.h) (0 lines added, 1 lines removed)
src/game/SpellEffects.cpp (http://bitbucket.org/Azrael/mgacore2/src/2bb2e0eb21d0/src/game/SpellEffects.cpp) (14 lines added, 4 lines removed)
src/shared/SystemConfig.h (http://bitbucket.org/Azrael/mgacore2/src/2bb2e0eb21d0/src/shared/SystemConfig.h) (1 lines added, 1 lines removed)
src/game/Player.cpp (http://bitbucket.org/Azrael/mgacore2/src/2bb2e0eb21d0/src/game/Player.cpp) (0 lines added, 1 lines removed)
More... (http://bitbucket.org/Azrael/mgacore2/changeset/2bb2e0eb21d0/)