Shauren 7d1d55124c Merge branch 'ObjectGuid' of https://github.com/TrinityCore/TrinityCore ...

Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Scripting/MapScripts.cpp
	src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
	src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
	src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
	src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
	src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp
	src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
	src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
	src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
	src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp

2014-09-16 21:50:01 +02:00

..

Configuration

Removed redundant cast to c_str() in ConfigMgr::Reload function.

2014-09-07 21:35:37 +02:00

Cryptography

Core: Fix non pch build (gcc)

2014-07-20 02:54:12 +02:00

Database

Core/DB: Fix crash on shutdown

2014-09-10 22:39:03 +02:00

DataStores

Core/Misc: Remove obsolete C++11 backward compatibility macros

2014-04-29 16:35:11 +02:00

Debugging

Fixed gcc build without pch

2014-07-20 16:06:35 +02:00

Dynamic

Core/Server: Use nullptr instead of 0 where pointers are expected

2014-08-09 21:32:26 +01:00

Logging

Core/Server: Add missing overrides

2014-08-09 20:17:40 +01:00

Networking

Core: Remove whitespace

2014-09-14 21:42:39 +02:00

Packets

Core/Entities: Use new PackedGuid class

2014-09-13 01:12:16 +02:00

PrecompiledHeaders

Core: Adjust precompiled headers: Remove a few already defined/included headers in the shared PCH-file (already included from Common.h)

2010-12-23 17:20:56 +01:00

Threading

Core/Threading: Fixed possible race condition with m_timeOutTime and fixed Thread #1: pthread_cond_{signal,broadcast}: dubious: associated lock is not held by any thread in PCQ

2014-08-12 18:18:52 +02:00

Utilities

Core/Misc: Fix some -Wconversion warnings

2014-08-23 19:56:41 +02:00

CMakeLists.txt

Some ground work for ASIO based RemoteAccess handling

2014-07-02 17:38:44 +02:00

Common.cpp

Update copyright note for 2014.

2014-01-01 00:07:53 +01:00

Common.h

Core/Misc: Fix some -Wconversion warnings

2014-08-23 19:56:41 +02:00

CompilerDefs.h

Core/Misc: Remove remaining COMPILER_HAS_CPP11_SUPPORT related macros

2014-05-01 11:19:32 +02:00

Containers.h

Core/Misc: Added utility method for checking is two sorted containers have a common element

2014-06-01 19:20:49 +02:00

Define.h

Core/Misc: Fix some -Wconversion warnings

2014-08-23 19:56:41 +02:00

Memory.h

Core: Fix non pch build

2013-01-02 13:58:36 +01:00

SystemConfig.h

Update copyright note for 2014.

2014-01-01 00:07:53 +01:00