PDA

View Full Version : Merge tc


biglad
08-29-2010, 09:22 AM
Merge tc

dep/g3dlite/G3D/ConvexPolyhedron.h (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/dep/g3dlite/G3D/ConvexPolyhedron.h) (0 lines added, 180 lines removed)
src/server/game/DataStores/DBCfmt.h (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/src/server/game/DataStores/DBCfmt.h) (1 lines added, 1 lines removed)
dep/g3dlite/G3D/Color3uint8.h (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/dep/g3dlite/G3D/Color3uint8.h) (0 lines added, 110 lines removed)
src/server/game/DataStores/DBCStructure.h (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/src/server/game/DataStores/DBCStructure.h) (3 lines added, 3 lines removed)
cmake/FindReadline.cmake (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/cmake/FindReadline.cmake) (0 lines added, 22 lines removed)
dep/g3dlite/G3D/Array.h (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/dep/g3dlite/G3D/Array.h) (0 lines added, 1274 lines removed)
cmake/OptimizeForArchitecture.cmake (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/cmake/OptimizeForArchitecture.cmake) (0 lines added, 222 lines removed)
dep/g3dlite/G3D/Any.h (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/dep/g3dlite/G3D/Any.h) (0 lines added, 570 lines removed)
dep/g3dlite/BinaryFormat.cpp (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/dep/g3dlite/BinaryFormat.cpp) (0 lines added, 81 lines removed)
dep/g3dlite/G3D/BinaryOutput.h (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/dep/g3dlite/G3D/BinaryOutput.h) (0 lines added, 421 lines removed)
cmake/AddCompilerFlag.cmake (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/cmake/AddCompilerFlag.cmake) (0 lines added, 12 lines removed)
THANKS (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/THANKS) (3 lines added, 3 lines removed)
dep/g3dlite/Capsule.cpp (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/dep/g3dlite/Capsule.cpp) (0 lines added, 179 lines removed)
dep/g3dlite/G3D/AtomicInt32.h (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/dep/g3dlite/G3D/AtomicInt32.h) (0 lines added, 164 lines removed)
dep/g3dlite/G3D/Box.h (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/dep/g3dlite/G3D/Box.h) (0 lines added, 195 lines removed)
dep/g3dlite/G3D/Color4.h (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/dep/g3dlite/G3D/Color4.h) (0 lines added, 338 lines removed)
dep/g3dlite/G3D/BinaryInput.h (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/dep/g3dlite/G3D/BinaryInput.h) (0 lines added, 441 lines removed)
src/server/game/World/World.cpp (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/src/server/game/World/World.cpp) (6 lines added, 6 lines removed)
dep/g3dlite/G3D/EqualsTrait.h (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/dep/g3dlite/G3D/EqualsTrait.h) (0 lines added, 26 lines removed)
cmake/FindOpenSSL.cmake (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/cmake/FindOpenSSL.cmake) (0 lines added, 88 lines removed)
dep/g3dlite/G3D/BumpMapPreprocess.h (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/dep/g3dlite/G3D/BumpMapPreprocess.h) (0 lines added, 61 lines removed)
src/server/game/Scripting/ScriptLoader.cpp (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/src/server/game/Scripting/ScriptLoader.cpp) (2 lines added, 0 lines removed)
dep/g3dlite/G3D/CoordinateFrame.h (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/dep/g3dlite/G3D/CoordinateFrame.h) (0 lines added, 331 lines removed)
dep/g3dlite/G3D/Capsule.h (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/dep/g3dlite/G3D/Capsule.h) (0 lines added, 90 lines removed)
dep/g3dlite/G3D/BoundsTrait.h (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/dep/g3dlite/G3D/BoundsTrait.h) (0 lines added, 20 lines removed)
src/server/game/Battlegrounds/BattlegroundMgr.h (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/src/server/game/Battlegrounds/BattlegroundMgr.h) (2 lines added, 2 lines removed)
cmake/FindSSE.cmake (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/cmake/FindSSE.cmake) (0 lines added, 104 lines removed)
cmake/cmake_uninstall.cmake.in (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/cmake/cmake_uninstall.cmake.in) (0 lines added, 23 lines removed)
dep/g3dlite/BinaryInput.cpp (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/dep/g3dlite/BinaryInput.cpp) (0 lines added, 568 lines removed)
src/server/game/Chat/Chat.cpp (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/src/server/game/Chat/Chat.cpp) (3 lines added, 0 lines removed)
dep/g3dlite/G3D/Cylinder.h (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/dep/g3dlite/G3D/Cylinder.h) (0 lines added, 92 lines removed)
dep/g3dlite/G3D/AreaMemoryManager.h (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/dep/g3dlite/G3D/AreaMemoryManager.h) (0 lines added, 93 lines removed)
src/server/game/Battlegrounds/Battleground.cpp (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/src/server/game/Battlegrounds/Battleground.cpp) (33 lines added, 15 lines removed)
src/server/worldserver/worldserver.conf.dist (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/src/server/worldserver/worldserver.conf.dist) (6 lines added, 0 lines removed)
dep/g3dlite/Box.cpp (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/dep/g3dlite/Box.cpp) (0 lines added, 393 lines removed)
dep/g3dlite/G3D/CollisionDetection.h (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/dep/g3dlite/G3D/CollisionDetection.h) (0 lines added, 1205 lines removed)
dep/g3dlite/G3D/Color1.h (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/dep/g3dlite/G3D/Color1.h) (0 lines added, 144 lines removed)
dep/g3dlite/Crypto.cpp (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/dep/g3dlite/Crypto.cpp) (0 lines added, 70 lines removed)
dep/g3dlite/G3D/BinaryFormat.h (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/dep/g3dlite/G3D/BinaryFormat.h) (0 lines added, 140 lines removed)
src/server/game/Entities/Player/Player.cpp (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/src/server/game/Entities/Player/Player.cpp) (24163 lines added, 24146 lines removed)
cmake/SSETests.cmake (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/cmake/SSETests.cmake) (0 lines added, 33 lines removed)
dep/g3dlite/AABox.cpp (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/dep/g3dlite/AABox.cpp) (0 lines added, 366 lines removed)
dep/g3dlite/Cylinder.cpp (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/dep/g3dlite/Cylinder.cpp) (0 lines added, 176 lines removed)
src/server/game/CMakeLists.txt (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/src/server/game/CMakeLists.txt) (3 lines added, 3 lines removed)
dep/g3dlite/CollisionDetection.cpp (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/dep/g3dlite/CollisionDetection.cpp) (0 lines added, 2455 lines removed)
dep/g3dlite/G3D/Color3.h (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/dep/g3dlite/G3D/Color3.h) (0 lines added, 432 lines removed)
cmake/FindPlatform.cmake (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/cmake/FindPlatform.cmake) (0 lines added, 16 lines removed)
dep/g3dlite/BinaryOutput.cpp (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/dep/g3dlite/BinaryOutput.cpp) (0 lines added, 522 lines removed)
cmake/FindMySQL.cmake (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/cmake/FindMySQL.cmake) (0 lines added, 156 lines removed)
dep/g3dlite/CoordinateFrame.cpp (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/dep/g3dlite/CoordinateFrame.cpp) (0 lines added, 436 lines removed)
dep/g3dlite/G3D/Box2D.h (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/dep/g3dlite/G3D/Box2D.h) (0 lines added, 121 lines removed)
cmake/FindPCHSupport.cmake (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/cmake/FindPCHSupport.cmake) (0 lines added, 315 lines removed)
cmake/FindACE.cmake (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/cmake/FindACE.cmake) (0 lines added, 65 lines removed)
dep/g3dlite/G3D/Cone.h (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/dep/g3dlite/G3D/Cone.h) (0 lines added, 68 lines removed)
src/server/game/Chat/Chat.h (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/src/server/game/Chat/Chat.h) (3 lines added, 0 lines removed)
dep/g3dlite/G3D/Crypto.h (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/dep/g3dlite/G3D/Crypto.h) (0 lines added, 96 lines removed)
dep/g3dlite/Any.cpp (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/dep/g3dlite/Any.cpp) (0 lines added, 1237 lines removed)
cmake/MacroEnsureVersion.cmake (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/cmake/MacroEnsureVersion.cmake) (0 lines added, 117 lines removed)
dep/g3dlite/G3D/AnyVal.h (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/dep/g3dlite/G3D/AnyVal.h) (0 lines added, 512 lines removed)
dep/g3dlite/G3D/Color4uint8.h (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/dep/g3dlite/G3D/Color4uint8.h) (0 lines added, 115 lines removed)
src/server/game/Battlegrounds/BattlegroundQueue.cpp (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/src/server/game/Battlegrounds/BattlegroundQueue.cpp) (14 lines added, 10 lines removed)
dep/g3dlite/G3D/AABox.h (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/dep/g3dlite/G3D/AABox.h) (0 lines added, 272 lines removed)
dep/g3dlite/G3D/Color1uint8.h (http://bitbucket.org/AzraelTBC/mga335/src/9a04d3c4f256/dep/g3dlite/G3D/Color1uint8.h) (0 lines added, 91 lines removed)



More... (http://bitbucket.org/AzraelTBC/mga335/changeset/9a04d3c4f256)