郑佩茹 67e9f2fd35 Fix merge conflicts

2022-06-21 13:24:33 -06:00

..

Accounts

Big update.

2022-03-12 22:28:00 +01:00

Achievements

Big update.

2022-03-12 22:28:00 +01:00

Addons

Big update.

2022-03-12 22:28:00 +01:00

AI

refactor(Core/Unit): PC&NPC Immunity (#11986)

2022-06-18 08:16:45 -04:00

ArenaSpectator

feat(Core/Battleground): rework bg queue system (#10817)

2022-03-15 14:36:49 -03:00

AuctionHouse

fix(Core): Crashfix. (#11495)

2022-04-25 09:26:03 -03:00

Battlefield

fix(Core/Wintergrasp): Reimplement Wintergrasp quests and fix vendors (#11533)

2022-04-25 18:20:10 -03:00

Battlegrounds

Merge branch 'master' of https://github.com/ZhengPeiRu21/azerothcore-wotlk into Playerbot

2022-06-21 09:19:50 -06:00

Cache

Big update.

2022-03-12 22:28:00 +01:00

Calendar

Big update.

2022-03-12 22:28:00 +01:00

Chat

Big update.

2022-03-12 22:28:00 +01:00

Combat

Merge branch 'azerothcore:master' into Playerbot

2022-05-23 09:04:16 -06:00

Conditions

feat(Core/Conditions): CONDITION_STAND_STATE (#10287)

2022-04-18 19:33:10 +02:00

DataStores

Merge branch 'azerothcore:master' into Playerbot

2022-06-16 10:04:30 -06:00

DungeonFinding

Merge branch 'azerothcore:master' into Playerbot

2022-03-25 10:48:58 -06:00

Entities

Fix merge conflicts

2022-06-21 13:24:33 -06:00

Events

feat(Core/Unit): NPCFlags helpers (#11286)

2022-04-05 13:52:42 +02:00

Globals

Merge branch 'azerothcore:master' into Playerbot

2022-06-16 10:04:30 -06:00

Grids

refactor(Core/Unit): PC&NPC Immunity (#11986)

2022-06-18 08:16:45 -04:00

Groups

Merge branch 'master' of https://github.com/ZhengPeiRu21/azerothcore-wotlk into Playerbot

2022-06-21 13:23:18 -06:00

Guilds

Fix corrupt item cache crashes, bot whispers, trade crashes

2022-03-22 10:51:50 -06:00

Handlers

Merge branch 'master' of https://github.com/ZhengPeiRu21/azerothcore-wotlk into Playerbot

2022-06-21 13:23:18 -06:00

Instances

refactor(Core/Instances): Update CHAR_DELETE_INSTANCE_SAVED_DATA (#11866)

2022-05-30 15:27:50 -03:00

Loot

Big update.

2022-03-12 22:28:00 +01:00

Mails

feat(Core/Mail): Server mail (#10628)

2022-04-19 23:43:14 +02:00

Maps

Merge branch 'master' of https://github.com/ZhengPeiRu21/azerothcore-wotlk into Playerbot

2022-06-21 09:19:50 -06:00

Misc

Merge branch 'azerothcore:master' into Playerbot

2022-04-22 09:13:49 -06:00

Miscellaneous

fix(Core/Pets): Mob "soloed" by pet should not grant exp/loot to its … (#11969)

2022-06-19 07:46:23 -04:00

Modules

Big update.

2022-03-12 22:28:00 +01:00

Motd

Big update.

2022-03-12 22:28:00 +01:00

Movement

Merge branch 'master' of https://github.com/ZhengPeiRu21/azerothcore-wotlk into Playerbot

2022-06-21 13:23:18 -06:00

OutdoorPvP

Big update.

2022-03-12 22:28:00 +01:00

Petitions

Big update.

2022-03-12 22:28:00 +01:00

Pools

Big update.

2022-03-12 22:28:00 +01:00

PrecompiledHeaders

feat(License): add new headers information about license (#7941)

2021-09-30 13:40:52 +07:00

Quests

feat(Core/Maps): AreaBoundary (#10525)

2022-04-15 14:10:41 +02:00

Reputation

Big update.

2022-03-12 22:28:00 +01:00

Scripting

Merge branch 'azerothcore:master' into Playerbot

2022-05-06 16:13:01 -06:00

Server

Merge branch 'azerothcore:master' into Playerbot

2022-05-12 09:41:56 -06:00

Skills

Big update.

2022-03-12 22:28:00 +01:00

Spells

fix(Core/ZulGurub): Mandokir charge and chained spirits (#12072)

2022-06-19 07:50:52 -04:00

Texts

Big update.

2022-03-12 22:28:00 +01:00

Tickets

Big update.

2022-03-12 22:28:00 +01:00

Time

Big update.

2022-03-12 22:28:00 +01:00

Tools

Big update.

2022-03-12 22:28:00 +01:00

Warden

feat(Core/Maps): AreaBoundary (#10525)

2022-04-15 14:10:41 +02:00

Weather

Big update.

2022-03-12 22:28:00 +01:00

World

Merge branch 'breathTimerConfig' into Playerbot

2022-06-16 10:06:05 -06:00

CMakeLists.txt

feat(Core/Modules): add separated lib for modules (#9281)

2021-12-02 20:28:58 +07:00