PDA

View Full Version : merge


biglad
08-18-2009, 05:42 AM
merge

src/bindings/scripts/VC90/90ScriptDev2.vcproj (http://bitbucket.org/Azrael/mgacore2/src/9d818ea30027/src/bindings/scripts/VC90/90ScriptDev2.vcproj) (4 lines added, 0 lines removed)
src/bindings/scripts/VC80/80ScriptDev2.vcproj (http://bitbucket.org/Azrael/mgacore2/src/9d818ea30027/src/bindings/scripts/VC80/80ScriptDev2.vcproj) (4 lines added, 0 lines removed)
src/bindings/scripts/CMakeLists.txt (http://bitbucket.org/Azrael/mgacore2/src/9d818ea30027/src/bindings/scripts/CMakeLists.txt) (1 lines added, 0 lines removed)
src/game/SpellEffects.cpp (http://bitbucket.org/Azrael/mgacore2/src/9d818ea30027/src/game/SpellEffects.cpp) (28 lines added, 5 lines removed)
src/game/SpellAuras.cpp (http://bitbucket.org/Azrael/mgacore2/src/9d818ea30027/src/game/SpellAuras.cpp) (51 lines added, 23 lines removed)
src/shared/SystemConfig.h (http://bitbucket.org/Azrael/mgacore2/src/9d818ea30027/src/shared/SystemConfig.h) (1 lines added, 1 lines removed)
src/bindings/scripts/system/ScriptLoader.cpp (http://bitbucket.org/Azrael/mgacore2/src/9d818ea30027/src/bindings/scripts/system/ScriptLoader.cpp) (2 lines added, 0 lines removed)
src/game/Player.cpp (http://bitbucket.org/Azrael/mgacore2/src/9d818ea30027/src/game/Player.cpp) (13 lines added, 1 lines removed)


More... (http://bitbucket.org/Azrael/mgacore2/changeset/9d818ea30027/)