diff options
| author | Shauren <shauren.trinity@gmail.com> | 2014-09-16 21:50:01 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2014-09-16 21:50:01 +0200 |
| commit | 7d1d55124c1e289748d2afefae896c97f710e57b (patch) | |
| tree | dcae6831f97fa1d353233fa7367800af1c4caa98 /sql/base | |
| parent | 6810a4469ebe6600be2f8649e917110a17ce27f3 (diff) | |
| parent | 9b933b4a291e377d4ae124eb8e3d2ba74b37f34f (diff) | |
Merge branch 'ObjectGuid' of https://github.com/TrinityCore/TrinityCore
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
Diffstat (limited to 'sql/base')
| -rw-r--r-- | sql/base/characters_database.sql | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql index 6e3ab43e4ac..f3e013529fc 100644 --- a/sql/base/characters_database.sql +++ b/sql/base/characters_database.sql @@ -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', |