Shauren d0176f985d Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 ...

Conflicts:
	src/server/game/Globals/ObjectMgr.cpp
	src/server/scripts/Commands/cs_reload.cpp
	src/server/shared/Database/Implementation/WorldDatabase.cpp

2014-08-15 20:13:34 +02:00

..

Configuration

Core/Config: User-friendlyfy configuration parsing errors

2014-07-29 01:47:00 +01:00

Cryptography

Core: Fix non build (gcc)

2014-07-20 04:22:20 +02:00

Database

Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4

2014-08-15 20:13:34 +02:00

DataStores

Core/DataStores: Implemented uint64 field type for DBC files and fixed structure of Achievement_Criteria.dbc

2014-06-27 00:37:17 +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/Socket: Added helpers to retrieve the size of currently ready data

2014-08-15 18:43:17 +02:00

Packets

Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4

2014-08-12 00:45:24 +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

Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4

2014-08-12 00:45:24 +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

Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4

2014-08-12 00:45:24 +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

Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4

2014-08-12 00:45:24 +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