Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-18 16:09:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ObjectGuid' of https://github.com/TrinityCore/TrinityCore

Browse Source 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Scripting/MapScripts.cpp
	src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
	src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
	src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
	src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
	src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp
	src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
	src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
	src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
	src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
This commit is contained in:
Shauren
2014-09-16 21:50:01 +02:00
parent 6810a4469e 9b933b4a29
commit 7d1d55124c
545 changed files with 6733 additions and 7486 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sql/base/characters_database.sql
View File

@@ -1621,14 +1621,14 @@ CREATE TABLE `groups` (
`lootMethod` tinyint(3) unsigned NOT NULL,
`looterGuid` int(10) unsigned NOT NULL,
`lootThreshold` tinyint(3) unsigned NOT NULL,
`icon1` int(10) unsigned NOT NULL,
`icon2` int(10) unsigned NOT NULL,
`icon3` int(10) unsigned NOT NULL,
`icon4` int(10) unsigned NOT NULL,
`icon5` int(10) unsigned NOT NULL,
`icon6` int(10) unsigned NOT NULL,
`icon7` int(10) unsigned NOT NULL,
`icon8` int(10) unsigned NOT NULL,
`icon1` bigint(20) unsigned NOT NULL,
`icon2` bigint(20) unsigned NOT NULL,
`icon3` bigint(20) unsigned NOT NULL,
`icon4` bigint(20) unsigned NOT NULL,
`icon5` bigint(20) unsigned NOT NULL,
`icon6` bigint(20) unsigned NOT NULL,
`icon7` bigint(20) unsigned NOT NULL,
`icon8` bigint(20) unsigned NOT NULL,
`groupType` tinyint(3) unsigned NOT NULL,
`difficulty` tinyint(3) unsigned NOT NULL DEFAULT '0',
`raiddifficulty` tinyint(3) unsigned NOT NULL DEFAULT '0',

9
sql/updates/characters/2014_09_16_00_characters_groups.sql Normal file
View File

@@ -0,0 +1,9 @@
ALTER TABLE `groups`
MODIFY `icon1` BIGINT(20) UNSIGNED NOT NULL,
MODIFY `icon2` BIGINT(20) UNSIGNED NOT NULL,
MODIFY `icon3` BIGINT(20) UNSIGNED NOT NULL,
MODIFY `icon4` BIGINT(20) UNSIGNED NOT NULL,
MODIFY `icon5` BIGINT(20) UNSIGNED NOT NULL,
MODIFY `icon6` BIGINT(20) UNSIGNED NOT NULL,
MODIFY `icon7` BIGINT(20) UNSIGNED NOT NULL,
MODIFY `icon8` BIGINT(20) UNSIGNED NOT NULL;