Merge branch '3.3.5' into 4.3.4
Conflicts: .gitattributes dep/PackageList.txt sql/base/characters_database.sql sql/updates/world/2015_06_26_01_world_2015_05_15_00.sql sql/updates/world/2015_07_01_03_world_335.sql src/server/game/DungeonFinding/LFGMgr.cpp src/server/game/Entities/GameObject/GameObject.h src/server/game/Entities/Player/Player.cpp src/server/game/Entities/Unit/Unit.cpp src/server/game/Globals/ObjectMgr.cpp src/server/game/Handlers/QueryHandler.cpp src/server/game/Miscellaneous/Language.h src/server/game/Quests/QuestDef.cpp src/server/game/Spells/Spell.cpp src/server/game/Spells/SpellEffects.cpp src/server/game/Spells/SpellMgr.cpp src/server/scripts/Commands/cs_rbac.cpp src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp src/server/scripts/Spells/spell_quest.cpp src/server/shared/Database/Implementation/CharacterDatabase.cpp src/server/shared/Database/Implementation/WorldDatabase.cpp
This commit is contained in:
commit
293658fb13
100 files changed
+79037
-77341
No files matched your search
@@ -0,0 +1,57 @@
|
||||
-- `character_aura`
|
||||
ALTER TABLE `character_aura`
|
||||
CHANGE `caster_guid` `casterGuid` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'Full Global Unique Identifier',
|
||||
CHANGE `item_guid` `itemGuid` bigint(20) unsigned NOT NULL DEFAULT '0',
|
||||
CHANGE `effect_mask` `effectMask` tinyint(3) unsigned NOT NULL DEFAULT '0',
|
||||
CHANGE `recalculate_mask` `recalculateMask` tinyint(3) unsigned NOT NULL DEFAULT '0',
|
||||
CHANGE `stackcount` `stackCount` tinyint(3) unsigned NOT NULL DEFAULT '1',
|
||||
CHANGE `maxduration` `maxDuration` int(11) NOT NULL DEFAULT '0',
|
||||
CHANGE `remaintime` `remainTime` int(11) NOT NULL DEFAULT '0',
|
||||
CHANGE `remaincharges` `remainCharges` tinyint(3) unsigned NOT NULL DEFAULT '0';
|
||||
|
||||
-- `character_glyphs`
|
||||
ALTER TABLE `character_glyphs`
|
||||
CHANGE `spec` `talentGroup` tinyint(3) unsigned NOT NULL DEFAULT '0';
|
||||
|
||||
-- `character_talent`
|
||||
ALTER TABLE `character_talent`
|
||||
CHANGE `spec` `talentGroup` tinyint(3) unsigned NOT NULL DEFAULT '0';
|
||||
|
||||
-- `characters`
|
||||
ALTER TABLE `characters`
|
||||
CHANGE `speccount` `talentGroupsCount` tinyint(3) unsigned NOT NULL DEFAULT '1',
|
||||
CHANGE `activespec` `activeTalentGroup` tinyint(3) unsigned NOT NULL DEFAULT '0';
|
||||
|
||||
-- `gm_subsurveys` -> `gm_subsurvey`
|
||||
RENAME TABLE `gm_subsurveys` TO `gm_subsurvey`;
|
||||
ALTER TABLE `gm_subsurvey`
|
||||
CHANGE `subsurveyId` `questionId` int(10) unsigned NOT NULL DEFAULT '0',
|
||||
CHANGE `rank` `answer` int(10) unsigned NOT NULL DEFAULT '0',
|
||||
CHANGE `comment` `answerComment` text NOT NULL;
|
||||
|
||||
-- `gm_surveys` -> `gm_survey`
|
||||
RENAME TABLE `gm_surveys` TO `gm_survey`;
|
||||
ALTER TABLE `gm_survey`
|
||||
CHANGE `overallComment` `comment` longtext NOT NULL;
|
||||
|
||||
-- `gm_tickets` -> `gm_ticket`
|
||||
RENAME TABLE `gm_tickets` TO `gm_ticket`;
|
||||
ALTER TABLE `gm_ticket`
|
||||
CHANGE `ticketId` `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
|
||||
CHANGE `guid` `playerGuid` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Global Unique Identifier of ticket creator',
|
||||
CHANGE `message` `description` text NOT NULL,
|
||||
CHANGE `haveTicket` `needMoreHelp` tinyint(3) unsigned NOT NULL DEFAULT '0';
|
||||
|
||||
-- `groups`
|
||||
ALTER TABLE `groups`
|
||||
CHANGE `raiddifficulty` `raidDifficulty` tinyint(3) unsigned NOT NULL DEFAULT '0';
|
||||
|
||||
-- `pet_aura`
|
||||
ALTER TABLE `pet_aura`
|
||||
CHANGE `caster_guid` `casterGuid` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'Full Global Unique Identifier',
|
||||
CHANGE `effect_mask` `effectMask` tinyint(3) unsigned NOT NULL DEFAULT '0',
|
||||
CHANGE `recalculate_mask` `recalculateMask` tinyint(3) unsigned NOT NULL DEFAULT '0',
|
||||
CHANGE `stackcount` `stackCount` tinyint(3) unsigned NOT NULL DEFAULT '1',
|
||||
CHANGE `maxduration` `maxDuration` int(11) NOT NULL DEFAULT '0',
|
||||
CHANGE `remaintime` `remainTime` int(11) NOT NULL DEFAULT '0',
|
||||
CHANGE `remaincharges` `remainCharges` tinyint(3) unsigned NOT NULL DEFAULT '0';
|
||||
Reference in new issue
Block a user