Merge branch '6.x' of https://github.com/TrinityCore/TrinityCore into 6.x

Conflicts:
	src/server/collision/Management/MMapManager.cpp
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/Conditions/ConditionMgr.h

21 files changed, 0 insertions, 170 deletions

diff --git a/sql/updates/auth/2014_10_04_00_auth.sql b/sql/updates/auth/2014_10_04_00_auth.sql
deleted file mode 100644
index 61731b408b6..00000000000
--- a/sql/updates/auth/2014_10_04_00_auth.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-DELETE FROM `battlenet_components` WHERE `Build`=18973 AND `Program`!='Bnet';
-DELETE FROM `battlenet_components` WHERE `Build`=37165 AND `Program`='Bnet';
-INSERT INTO `battlenet_components` VALUES
-('Bnet','Win',37165),
-('Bnet','Wn64',37165),
-('WoW','base',18973),
-('WoWB','Win',18973),
-('WoWB','Wn64',18973);
diff --git a/sql/updates/auth/2014_10_19_00_auth.sql b/sql/updates/auth/2014_10_19_00_auth.sql
deleted file mode 100644
index a0a28f91359..00000000000
--- a/sql/updates/auth/2014_10_19_00_auth.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE account MODIFY COLUMN expansion TINYINT(3) UNSIGNED DEFAULT 5 NOT NULL;
-UPDATE account SET expansion = 5;
diff --git a/sql/updates/auth/2014_10_26_00_auth.sql b/sql/updates/auth/2014_10_26_00_auth.sql
deleted file mode 100644
index db24968656e..00000000000
--- a/sql/updates/auth/2014_10_26_00_auth.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `logs_ip_actions` CHANGE `character_guid` `character_guid` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0';
diff --git a/sql/updates/auth/2014_11_03_00_auth.sql b/sql/updates/auth/2014_11_03_00_auth.sql
deleted file mode 100644
index 1e0f0835ed5..00000000000
--- a/sql/updates/auth/2014_11_03_00_auth.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `battlenet_accounts` ADD COLUMN `LastCharacterUndelete` INT(10) UNSIGNED DEFAULT 0  NOT NULL AFTER `os`;
diff --git a/sql/updates/auth/2014_11_04_00_auth.sql b/sql/updates/auth/2014_11_04_00_auth.sql
deleted file mode 100644
index 5214034fd21..00000000000
--- a/sql/updates/auth/2014_11_04_00_auth.sql
+++ /dev/null
@@ -1,19 +0,0 @@
-TRUNCATE `battlenet_components`;
-INSERT INTO `battlenet_components` VALUES
-('Bnet','Mc64',37165),
-('Bnet','Win',37165),
-('Bnet','Wn64',37165),
-('WoW','base',19057),
-('WoW','deDE',0),
-('WoW','enGB',0),
-('WoW','enUS',0),
-('WoW','esES',0),
-('WoW','esMX',0),
-('WoW','frFR',0),
-('WoW','koKR',0),
-('WoW','Mc64',19116),
-('WoW','ruRU',0),
-('WoW','Win',19116),
-('WoW','Wn64',19116),
-('WoW','zhCN',0),
-('WoW','zhTW',0);
diff --git a/sql/updates/auth/2014_11_09_00_auth.sql b/sql/updates/auth/2014_11_09_00_auth.sql
deleted file mode 100644
index 8cbe649b440..00000000000
--- a/sql/updates/auth/2014_11_09_00_auth.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-UPDATE `realmlist` SET `gamebuild`=19057;
-ALTER TABLE `realmlist` CHANGE `gamebuild` `gamebuild` INT(10) UNSIGNED NOT NULL DEFAULT '19057';
diff --git a/sql/updates/auth/2014_11_10_00_auth.sql b/sql/updates/auth/2014_11_10_00_auth.sql
deleted file mode 100644
index ce4d814f620..00000000000
--- a/sql/updates/auth/2014_11_10_00_auth.sql
+++ /dev/null
@@ -1,11 +0,0 @@
-DELETE FROM `rbac_permissions` WHERE `id` IN (214,215,216);
-INSERT INTO `rbac_permissions` (`id`, `name`) VALUES
-(214, 'Command: bnetaccount link'),
-(215, 'Command: bnetaccount unlink'),
-(216, 'Command: bnetaccount gameaccountcreate');
-
-DELETE FROM `rbac_linked_permissions` WHERE `linkedId` IN (214,215,216);
-INSERT INTO `rbac_linked_permissions` (`id`, `linkedId`) VALUES
-(196, 214),
-(196, 215),
-(196, 216);
diff --git a/sql/updates/auth/2014_11_10_00_auth_from_335.sql b/sql/updates/auth/2014_11_10_00_auth_from_335.sql
deleted file mode 100644
index 088c5cc71b5..00000000000
--- a/sql/updates/auth/2014_11_10_00_auth_from_335.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-DELETE FROM rbac_permissions WHERE id = 797;
-INSERT INTO rbac_permissions (`id`, `name`) VALUES
-(797, 'Command: pvpstats');
-
-DELETE FROM rbac_linked_permissions WHERE `linkedId` = 797;
-INSERT INTO rbac_linked_permissions (`id`, `linkedId`) VALUES
-(199, 797);
diff --git a/sql/updates/auth/2014_11_10_01_auth.sql b/sql/updates/auth/2014_11_10_01_auth.sql
deleted file mode 100644
index 0f89140ecf4..00000000000
--- a/sql/updates/auth/2014_11_10_01_auth.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-/* add rbac permissions to new commands */
-DELETE FROM `rbac_permissions` WHERE `id`=798;
-INSERT INTO `rbac_permissions` (`id`,`name`) VALUES
-(798, 'Command: .mod xp');
-
-DELETE FROM `rbac_linked_permissions` WHERE `id`=798;
-INSERT INTO `rbac_linked_permissions` (`id`,`linkedId`) VALUES
-/* add mod xp to gms */
-(194, 798);
diff --git a/sql/updates/auth/2014_11_23_00_auth.sql b/sql/updates/auth/2014_11_23_00_auth.sql
deleted file mode 100644
index 1c68d6a8e06..00000000000
--- a/sql/updates/auth/2014_11_23_00_auth.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `account` CHANGE `os` `os` VARCHAR(4) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT  '';
diff --git a/sql/updates/auth/2014_11_25_00_auth.sql b/sql/updates/auth/2014_11_25_00_auth.sql
deleted file mode 100644
index 6594fe0c4fa..00000000000
--- a/sql/updates/auth/2014_11_25_00_auth.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `battlenet_accounts` CHANGE `os` `os` VARCHAR(4) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT  '';
diff --git a/sql/updates/auth/2014_12_05_00_auth.sql b/sql/updates/auth/2014_12_05_00_auth.sql
deleted file mode 100644
index 95507c411f4..00000000000
--- a/sql/updates/auth/2014_12_05_00_auth.sql
+++ /dev/null
@@ -1 +0,0 @@
-UPDATE `battlenet_components` SET `Build`=19243 WHERE `Build`=19116;
diff --git a/sql/updates/auth/2014_12_10_00_auth.sql b/sql/updates/auth/2014_12_10_00_auth.sql
deleted file mode 100644
index 8068fd3c459..00000000000
--- a/sql/updates/auth/2014_12_10_00_auth.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE `rbac_default_permissions` 
-ADD COLUMN `realmId` INT(11) NOT NULL DEFAULT '-1' COMMENT 'Realm Id, -1 means all',
-DROP PRIMARY KEY, ADD PRIMARY KEY (`secId`, `permissionId`, `realmId`);
diff --git a/sql/updates/auth/2014_12_19_00_auth.sql b/sql/updates/auth/2014_12_19_00_auth.sql
deleted file mode 100644
index 1a975e766e5..00000000000
--- a/sql/updates/auth/2014_12_19_00_auth.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-DELETE FROM `rbac_permissions` WHERE `id`=692;
-DELETE FROM `rbac_linked_permissions` WHERE `linkedId`=692;
diff --git a/sql/updates/auth/2014_12_20_00_auth.sql b/sql/updates/auth/2014_12_20_00_auth.sql
deleted file mode 100644
index d5e29712246..00000000000
--- a/sql/updates/auth/2014_12_20_00_auth.sql
+++ /dev/null
@@ -1 +0,0 @@
-UPDATE `battlenet_components` SET `Build`=19342 WHERE `Build`=19243;
diff --git a/sql/updates/auth/2014_12_25_00_auth.sql b/sql/updates/auth/2014_12_25_00_auth.sql
deleted file mode 100644
index 2ab5127e699..00000000000
--- a/sql/updates/auth/2014_12_25_00_auth.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-DELETE FROM `rbac_permissions` WHERE `id`=614;
-DELETE FROM `rbac_linked_permissions` WHERE `linkedId`=614;
diff --git a/sql/updates/auth/2014_12_27_00_auth.sql b/sql/updates/auth/2014_12_27_00_auth.sql
deleted file mode 100644
index ddea3d335ff..00000000000
--- a/sql/updates/auth/2014_12_27_00_auth.sql
+++ /dev/null
@@ -1,9 +0,0 @@
--- Add rbac_permissions
-DELETE FROM `rbac_permissions` WHERE `id` = 51;
-INSERT INTO `rbac_permissions` (`id`,`name`) VALUES
-(51, 'Allow trading between factions');
-
--- Add rbac_linked_permissions
-DELETE FROM `rbac_linked_permissions` WHERE `linkedId` = 51;
-INSERT INTO `rbac_linked_permissions` (`id`,`linkedId`) VALUES
-(194, 51);
diff --git a/sql/updates/auth/2014_12_28_00_auth.sql b/sql/updates/auth/2014_12_28_00_auth.sql
deleted file mode 100644
index 4017474c6f7..00000000000
--- a/sql/updates/auth/2014_12_28_00_auth.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-DELETE FROM `battlenet_components` WHERE `Platform` IN ('ptBR', 'ptPT', 'itIT', 'enCN', 'enTW') AND `Program` = 'WoW';
-INSERT INTO `battlenet_components` (`Program`, `Platform`, `Build`) VALUES
-('WoW', 'ptBR', 0),
-('WoW', 'ptPT', 0),
-('WoW', 'itIT', 0),
-('WoW', 'enCN', 0),
-('WoW', 'enTW', 0);
diff --git a/sql/updates/auth/2015_02_22_00_auth.sql b/sql/updates/auth/2015_02_22_00_auth.sql
deleted file mode 100644
index dee634ba52e..00000000000
--- a/sql/updates/auth/2015_02_22_00_auth.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-DELETE FROM `rbac_linked_permissions` WHERE `linkedId`=662;
-DELETE FROM `rbac_permissions` WHERE `id`=662;
diff --git a/sql/updates/auth/2015_03_01_00_auth.sql b/sql/updates/auth/2015_03_01_00_auth.sql
deleted file mode 100644
index 1f3fb944e0b..00000000000
--- a/sql/updates/auth/2015_03_01_00_auth.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-UPDATE `realmlist` SET `gamebuild`=19634 WHERE `id`=1;
-
-UPDATE `battlenet_components` SET `Build`=19634 WHERE `Program`='WoW' AND `Platform`='base' AND `Build`=19057;
-UPDATE `battlenet_components` SET `Build`=19702 WHERE `Program`='WoW' AND `Platform` IN ('Win','Wn64','Mc64') AND `Build`=19342;
diff --git a/sql/updates/auth/2015_03_10_00_auth.sql b/sql/updates/auth/2015_03_10_00_auth.sql
deleted file mode 100644
index 3206edcbd8d..00000000000
--- a/sql/updates/auth/2015_03_10_00_auth.sql
+++ /dev/null
@@ -1,77 +0,0 @@
-UPDATE `rbac_permissions` SET `name`='Command: reload support' WHERE  `id`=650;
-
-DELETE FROM `rbac_permissions` WHERE `id` IN (799,800,801,802,803,804,805,806,807,808,809,810,811,812,813,814,815,816,817,818,819,820,821,822,823,824,825,826,827,828,829,830,831,832,833);
-INSERT INTO `rbac_permissions` (`id`, `name`) VALUES 
-(799, 'Command: .go bugticket'),
-(800, 'Command: .go complaintticket'),
-(801, 'Command: .go suggestionticket'),
-(802, 'Command: .ticket bug'),
-(803, 'Command: .ticket complaint'),
-(804, 'Command: .ticket suggestion'),
-(805, 'Command: .ticket bug assign'),
-(806, 'Command: .ticket bug close'),
-(807, 'Command: .ticket bug closedlist'),
-(808, 'Command: .ticket bug comment'),
-(809, 'Command: .ticket bug delete'),
-(810, 'Command: .ticket bug list'),
-(811, 'Command: .ticket bug unassign'),
-(812, 'Command: .ticket bug view'),
-(813, 'Command: .ticket complaint assign'),
-(814, 'Command: .ticket complaint close'),
-(815, 'Command: .ticket complaint closedlist'),
-(816, 'Command: .ticket complaint comment'),
-(817, 'Command: .ticket complaint delete'),
-(818, 'Command: .ticket complaint list'),
-(819, 'Command: .ticket complaint unassign'),
-(820, 'Command: .ticket complaint view'),
-(821, 'Command: .ticket suggestion assign'),
-(822, 'Command: .ticket suggestion close'),
-(823, 'Command: .ticket suggestion closedlist'),
-(824, 'Command: .ticket suggestion comment'),
-(825, 'Command: .ticket suggestion delete'),
-(826, 'Command: .ticket suggestion list'),
-(827, 'Command: .ticket suggestion unassign'),
-(828, 'Command: .ticket suggestion view'),
-(829, 'Command: .ticket reset all'),
-(830, 'Command: .ticket reset gm'),
-(831, 'Command: .ticket reset bug'),
-(832, 'Command: .ticket reset complaint'),
-(833, 'Command: .ticket reset suggestion');
-
-DELETE FROM `rbac_linked_permissions` WHERE `id` = 198 AND `linkedId` IN (799,800,801,892,803,804,805,806,807,808,809,810,811,812,813,814,815,816,817,818,819,820,821,822,823,824,825,826,827,828,829,830,831,832,833);
-INSERT INTO `rbac_linked_permissions` (`id`, `linkedId`) VALUES 
-(198, 799),
-(198, 800),
-(198, 801),
-(198, 802),
-(198, 803),
-(198, 804),
-(197, 805),
-(198, 806),
-(198, 807),
-(198, 808),
-(196, 809),
-(198, 810),
-(197, 811),
-(198, 812),
-(197, 813),
-(198, 814),
-(198, 815),
-(198, 816),
-(196, 817),
-(198, 818),
-(197, 819),
-(198, 820),
-(197, 821),
-(198, 822),
-(198, 823),
-(198, 824),
-(196, 825),
-(198, 826),
-(197, 827),
-(198, 828),
-(196, 829),
-(196, 830),
-(196, 831),
-(196, 832),
-(196, 833);