Machiavelli fe69bd654a Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.x ...

Conflicts:
	src/server/game/Entities/Creature/GossipDef.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Quests/QuestDef.cpp

2011-12-06 12:01:51 +01:00

..

CMakeLists.txt

Scripts/Commands: Added .dev command to show <Dev> tag in nickname

2011-09-21 11:35:29 -03:00

cs_account.cpp

Core/Commands: Fixed .account set gmlevel to correctly use realmId specified instead of id of the realm that the command was executed on

2011-11-13 18:52:46 +01:00

cs_achievement.cpp

Script/Commands: Codestyle and cleanups

2011-10-10 10:33:13 -03:00

cs_debug.cpp

Initial Commit for client version change to 4.2.2 (14545)

2011-11-20 18:28:18 +01:00

cs_event.cpp

Script/Commands: Codestyle and cleanups

2011-10-10 10:33:13 -03:00

cs_gm.cpp

Initial Commit for client version change to 4.2.2 (14545)

2011-11-20 18:28:18 +01:00

cs_go.cpp

Script/Commands: Codestyle and cleanups

2011-10-10 10:33:13 -03:00

cs_gobject.cpp

Delete obj if it is not successfully added to grid. More to fix.

2011-11-28 14:05:25 -05:00

cs_gps.cpp

Core/DataStores:

2011-11-24 13:43:41 +01:00

cs_honor.cpp

Script/Commands: Codestyle and cleanups

2011-10-24 08:35:33 -02:00

cs_learn.cpp

Script/Commands: Codestyle and cleanups

2011-10-24 08:35:33 -02:00

cs_misc.cpp

Cosmetic: Multiple cosmetic changes

2011-09-29 12:43:05 +02:00

cs_modify.cpp

Core/Misc: Fix compile and char creation

2011-11-26 01:46:41 +01:00

cs_npc.cpp

Revert 81fea2d7b5.

2011-11-28 14:34:30 -05:00

cs_quest.cpp

Core|DB/Quests: Rename and re-order fields in quest_template table, for the sake of consistency

2011-11-26 03:00:06 +00:00

cs_reload.cpp

Cosmetic: Multiple cosmetic changes

2011-09-29 12:43:05 +02:00

cs_tele.cpp

Core: Fixed remaining C6246: Local declaration of 'x' hides declaration of the same name in outer scope. from previous commit

2011-11-23 19:17:33 +01:00

cs_titles.cpp

Core/DataStores:

2011-11-24 13:43:41 +01:00

cs_wp.cpp

Delete obj if it is not successfully added to grid. More to fix.

2011-11-28 14:05:25 -05:00