Merge branch 'master' into 4.x
Conflicts: src/server/game/Achievements/AchievementMgr.cpp src/server/game/Achievements/AchievementMgr.h src/server/game/Entities/Corpse/Corpse.cpp src/server/game/Entities/Unit/Unit.cpp src/server/game/Quests/QuestDef.cpp src/server/shared/Database/Implementation/CharacterDatabase.cpp src/server/shared/Database/Implementation/CharacterDatabase.h
This commit is contained in:
commit
9c26ce8da5
1155 files changed
+6850
-2233
No files matched your search
@@ -0,0 +1,8 @@
|
||||
DROP TABLE IF EXISTS `character_queststatus_seasonal`;
|
||||
CREATE TABLE `character_queststatus_seasonal` (
|
||||
`guid` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Global Unique Identifier',
|
||||
`quest` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Quest Identifier',
|
||||
`event` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Event Identifier',
|
||||
PRIMARY KEY (`guid`,`quest`),
|
||||
KEY `idx_guid` (`guid`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Player System';
|
||||
Reference in new issue
Block a user