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

..

Accounts

Typo fix of previous commit (:S)

2011-09-08 18:41:43 +02:00

Achievements

Core/Achievements: Implement ACHIEVEMENT_CRITERIA_TYPE_CURRENCY

2011-11-27 00:29:44 +02:00

Addons

[Cosmetic] Apply codestyle "XXX * " and "XXX *" changed to "XXX* " (with some exceptions)

2011-09-15 14:12:57 +02:00

AI

Merge branch 'master' into 4.x

2011-11-26 03:19:37 +00:00

AuctionHouse

Core/DataStores:

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

Battlegrounds

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

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

Calendar

Update copyright note for 2011.

2011-01-01 15:01:13 +01:00

Chat

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

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

Combat

Cosmetic: Multiple cosmetic changes

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

Conditions

Core/DB: Fix character creation in Player::SaveToDB.

2011-11-26 01:53:44 +01:00

DataStores

Core/Misc:

2011-11-30 21:25:20 +01:00

DungeonFinding

Core: Fixed more warnings (C6246: Local declaration of 'x' hides declaration of the same name in outer scope.)

2011-11-23 17:55:16 +01:00

Entities

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

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

Events

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

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

Globals

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

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

Grids

Core/Packets: updated update_object structure

2011-11-27 16:06:29 +01:00

Groups

Core: Codestyle clean-up

2011-11-07 11:18:00 -06:00

Guilds

Core/Player: Store guild id inside protected integer instead of fetching from db. Still have method GetGuildIdFromGuid though if player is offline.

2011-11-27 03:40:03 +01:00

Instances

Merge branch 'master' of github.com:TrinityCore/TrinityCore

2011-11-23 20:23:26 +01:00

Loot

Core/Items

2011-11-25 23:24:40 +01:00

Mails

Cosmetic: Multiple cosmetic changes

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

Maps

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

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

Miscellaneous

Core/Misc:

2011-11-30 21:25:20 +01:00

Movement

Core/MovementHandler: added new packet handler for movement

2011-11-29 17:57:38 +01:00

OutdoorPvP

Core: Codestyle clean-up

2011-11-07 11:06:39 -06:00

Pools

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

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

PrecompiledHeaders

Removing SQLStorage class leftovers

2011-04-28 23:03:02 +02:00

Quests

Core/Quest: Consistency, god damn..

2011-12-06 10:56:37 +00:00

Reputation

Core/Misc: Added 'f' after float values

2011-10-17 07:38:27 -03:00

Scripting

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

Server

Core/Packets: Re-add ticket related to opcodes to opcode enum (thanks Fabi for confirming them, I guess);

2011-11-29 18:45:22 +00:00

Skills

[Cosmetic] Apply codestyle "XXX * " and "XXX *" changed to "XXX* " (with some exceptions)

2011-09-15 14:12:57 +02:00

Spells

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

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

Texts

Core: Codestyle clean-up

2011-11-07 11:06:39 -06:00

Tickets

Core/Commands: Added '.ticket reset' for resetting ticket-id counter. Author: Bizzy

2011-10-04 17:41:55 +02:00

Tools

Core: Fixed a few warnings and silly typos in scripts

2011-11-23 16:57:08 +01:00

Weather

Cosmetic: Multiple cosmetic changes

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

World

Core/Items

2011-11-25 23:24:40 +01:00

CMakeLists.txt

This reverts commit f580cddc09.

2011-06-28 13:05:15 +02:00