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

Conflicts:
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Spells/SpellInfo.h
	src/server/game/World/World.cpp

2013-12-15 03:47:21 +01:00

..

CMakeLists.txt

Core/RBAC: Move group commands to RBAC (using individual permissions)

2013-09-10 11:45:59 +02:00

cs_account.cpp

Core/Logging: Remove LOG_FILTER_XXX defines with it's value (remember logger names are case-sensitive)

2013-11-08 10:50:51 +01:00

cs_achievement.cpp

Core/RBAC: Move RBAC code to namespace rbac

2013-09-27 13:35:45 +02:00

cs_arena.cpp

Core/Logging: Remove LOG_FILTER_XXX defines with it's value (remember logger names are case-sensitive)

2013-11-08 10:50:51 +01:00

cs_ban.cpp

Core/RBAC: Move RBAC code to namespace rbac

2013-09-27 13:35:45 +02:00

cs_bf.cpp

Core/RBAC: Move RBAC code to namespace rbac

2013-09-27 13:35:45 +02:00

cs_cast.cpp

Core/RBAC: Move RBAC code to namespace rbac

2013-09-27 13:35:45 +02:00

cs_character.cpp

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

2013-10-07 14:30:37 +02:00

cs_cheat.cpp

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

2013-10-07 14:30:37 +02:00

cs_debug.cpp

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

2013-12-11 20:34:44 +01:00

cs_deserter.cpp

Core/RBAC: Move RBAC code to namespace rbac

2013-09-27 13:35:45 +02:00

cs_disable.cpp

Core/RBAC: Move RBAC code to namespace rbac

2013-09-27 13:35:45 +02:00

cs_event.cpp

Core/RBAC: Move RBAC code to namespace rbac

2013-09-27 13:35:45 +02:00

cs_gm.cpp

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

2013-10-07 14:30:37 +02:00

cs_go.cpp

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

2013-10-07 14:30:37 +02:00

cs_gobject.cpp

Merge branch 'master' into 4.3.4

2013-11-08 11:12:17 +01:00

cs_group.cpp

Scripts/Misc: Coding Style unification? (by Aokromes)

2013-10-22 20:24:05 +02:00

cs_guild.cpp

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

2013-10-07 14:30:37 +02:00

cs_honor.cpp

Core/RBAC: Move RBAC code to namespace rbac

2013-09-27 13:35:45 +02:00

cs_instance.cpp

Core/RBAC: Move RBAC code to namespace rbac

2013-09-27 13:35:45 +02:00

cs_learn.cpp

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

2013-10-07 14:30:37 +02:00

cs_lfg.cpp

Core/RBAC: Move RBAC code to namespace rbac

2013-09-27 13:35:45 +02:00

cs_list.cpp

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

2013-10-07 14:30:37 +02:00

cs_lookup.cpp

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

2013-10-07 14:30:37 +02:00

cs_message.cpp

Core/RBAC: Move RBAC code to namespace rbac

2013-09-27 13:35:45 +02:00

cs_misc.cpp

Merge branch 'master' into 4.3.4

2013-11-08 11:12:17 +01:00

cs_mmaps.cpp

Core/RBAC: Move RBAC code to namespace rbac

2013-09-27 13:35:45 +02:00

cs_modify.cpp

Merge branch 'master' into 4.3.4

2013-11-08 11:12:17 +01:00

cs_npc.cpp

Merge branch 'master' into 4.3.4

2013-11-08 11:12:17 +01:00

cs_pet.cpp

Core/Logging: Remove LOG_FILTER_XXX defines with it's value (remember logger names are case-sensitive)

2013-11-08 10:50:51 +01:00

cs_quest.cpp

Core/AI: Fix an issue where the OnQuestAccept hooks were not called for auto-completed quests.

2013-12-14 19:39:47 +01:00

cs_rbac.cpp

Fix compile under linux and update auth db with latest changes

2013-09-29 14:15:58 +02:00

cs_reload.cpp

Core/AI: Good bye, Good bye my beloved EventAI system :(

2013-12-01 01:27:08 +01:00

cs_reset.cpp

Merge branch 'master' into 4.3.4

2013-11-08 11:12:17 +01:00

cs_send.cpp

Core/RBAC: Move RBAC code to namespace rbac

2013-09-27 13:35:45 +02:00

cs_server.cpp

Core/RBAC: Move RBAC code to namespace rbac

2013-09-27 13:35:45 +02:00

cs_tele.cpp

Core/Chat Commands: Allow to add overlapping teles .

2013-10-25 21:50:52 +02:00

cs_ticket.cpp

Core/RBAC: Move RBAC code to namespace rbac

2013-09-27 13:35:45 +02:00

cs_titles.cpp

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

2013-10-07 14:30:37 +02:00

cs_wp.cpp

Core: Fix build

2013-12-11 20:48:40 +01:00