biglad
07-24-2009, 06:03 AM
merge
src/bindings/scripts/VC90/90ScriptDev2.vcproj (http://bitbucket.org/Azrael/mgacore2/src/7fb5dc0b9162/src/bindings/scripts/VC90/90ScriptDev2.vcproj) (20 lines added, 0 lines removed)
src/bindings/scripts/ScriptMgr.cpp (http://bitbucket.org/Azrael/mgacore2/src/7fb5dc0b9162/src/bindings/scripts/ScriptMgr.cpp) (12 lines added, 0 lines removed)
src/bindings/scripts/VC80/80ScriptDev2.vcproj (http://bitbucket.org/Azrael/mgacore2/src/7fb5dc0b9162/src/bindings/scripts/VC80/80ScriptDev2.vcproj) (20 lines added, 0 lines removed)
src/bindings/scripts/CMakeLists.txt (http://bitbucket.org/Azrael/mgacore2/src/7fb5dc0b9162/src/bindings/scripts/CMakeLists.txt) (3 lines added, 0 lines removed)
src/trinitycore/trinitycore.conf.dist (http://bitbucket.org/Azrael/mgacore2/src/7fb5dc0b9162/src/trinitycore/trinitycore.conf.dist) (2 lines added, 2 lines removed)
win/VC80/game.vcproj (http://bitbucket.org/Azrael/mgacore2/src/7fb5dc0b9162/win/VC80/game.vcproj) (2 lines added, 2 lines removed)
src/game/SpellEffects.cpp (http://bitbucket.org/Azrael/mgacore2/src/7fb5dc0b9162/src/game/SpellEffects.cpp) (79 lines added, 26 lines removed)
src/shared/SystemConfig.h (http://bitbucket.org/Azrael/mgacore2/src/7fb5dc0b9162/src/shared/SystemConfig.h) (1 lines added, 1 lines removed)
src/bindings/scripts/scripts/zone/eastern_plaguelands/the_scarlet_enclave.cpp (http://bitbucket.org/Azrael/mgacore2/src/7fb5dc0b9162/src/bindings/scripts/scripts/zone/eastern_plaguelands/the_scarlet_enclave.cpp) (1 lines added, 1 lines removed)
win/VC90/game.vcproj (http://bitbucket.org/Azrael/mgacore2/src/7fb5dc0b9162/win/VC90/game.vcproj) (167 lines added, 167 lines removed)
win/VC80/TrinityCore.vcproj (http://bitbucket.org/Azrael/mgacore2/src/7fb5dc0b9162/win/VC80/TrinityCore.vcproj) (2 lines added, 2 lines removed)
src/game/Player.cpp (http://bitbucket.org/Azrael/mgacore2/src/7fb5dc0b9162/src/game/Player.cpp) (42 lines added, 16 lines removed)
More... (http://bitbucket.org/Azrael/mgacore2/changeset/7fb5dc0b9162/)
src/bindings/scripts/VC90/90ScriptDev2.vcproj (http://bitbucket.org/Azrael/mgacore2/src/7fb5dc0b9162/src/bindings/scripts/VC90/90ScriptDev2.vcproj) (20 lines added, 0 lines removed)
src/bindings/scripts/ScriptMgr.cpp (http://bitbucket.org/Azrael/mgacore2/src/7fb5dc0b9162/src/bindings/scripts/ScriptMgr.cpp) (12 lines added, 0 lines removed)
src/bindings/scripts/VC80/80ScriptDev2.vcproj (http://bitbucket.org/Azrael/mgacore2/src/7fb5dc0b9162/src/bindings/scripts/VC80/80ScriptDev2.vcproj) (20 lines added, 0 lines removed)
src/bindings/scripts/CMakeLists.txt (http://bitbucket.org/Azrael/mgacore2/src/7fb5dc0b9162/src/bindings/scripts/CMakeLists.txt) (3 lines added, 0 lines removed)
src/trinitycore/trinitycore.conf.dist (http://bitbucket.org/Azrael/mgacore2/src/7fb5dc0b9162/src/trinitycore/trinitycore.conf.dist) (2 lines added, 2 lines removed)
win/VC80/game.vcproj (http://bitbucket.org/Azrael/mgacore2/src/7fb5dc0b9162/win/VC80/game.vcproj) (2 lines added, 2 lines removed)
src/game/SpellEffects.cpp (http://bitbucket.org/Azrael/mgacore2/src/7fb5dc0b9162/src/game/SpellEffects.cpp) (79 lines added, 26 lines removed)
src/shared/SystemConfig.h (http://bitbucket.org/Azrael/mgacore2/src/7fb5dc0b9162/src/shared/SystemConfig.h) (1 lines added, 1 lines removed)
src/bindings/scripts/scripts/zone/eastern_plaguelands/the_scarlet_enclave.cpp (http://bitbucket.org/Azrael/mgacore2/src/7fb5dc0b9162/src/bindings/scripts/scripts/zone/eastern_plaguelands/the_scarlet_enclave.cpp) (1 lines added, 1 lines removed)
win/VC90/game.vcproj (http://bitbucket.org/Azrael/mgacore2/src/7fb5dc0b9162/win/VC90/game.vcproj) (167 lines added, 167 lines removed)
win/VC80/TrinityCore.vcproj (http://bitbucket.org/Azrael/mgacore2/src/7fb5dc0b9162/win/VC80/TrinityCore.vcproj) (2 lines added, 2 lines removed)
src/game/Player.cpp (http://bitbucket.org/Azrael/mgacore2/src/7fb5dc0b9162/src/game/Player.cpp) (42 lines added, 16 lines removed)
More... (http://bitbucket.org/Azrael/mgacore2/changeset/7fb5dc0b9162/)