MitchesD 63f253e95c Merge pull request #15697 from ShinDarth/cd ...

Core/Player rewritten duel CD reset system
(cherry picked from commit 4204805d47)

Conflicts:
	src/server/game/Spells/SpellHistory.cpp
	src/server/game/Spells/SpellHistory.h
	src/server/game/World/World.h

2015-11-07 00:35:24 +01:00

..

bnetserver

Core/Misc: Fix for builds linked with libc++ instead of libstdc++

2015-10-24 15:39:32 +02:00

database

Merge pull request #15707 from ShinDarth/pvpstats

2015-11-06 23:46:03 +01:00

game

Merge pull request #15697 from ShinDarth/cd

2015-11-07 00:35:24 +01:00

ipc

Core/Battle.net:

2015-10-06 00:30:47 +02:00

scripts

Scripts/Commands: Add taxinodes cheat status to

2015-11-06 20:17:38 +01:00

shared

Core/Battle.net:

2015-10-06 00:30:47 +02:00

worldserver

Merge pull request #15697 from ShinDarth/cd

2015-11-07 00:35:24 +01:00

CMakeLists.txt

Core/Build: Merge common library and move database out of shared

2015-08-21 17:52:42 +02:00