Skip to content

Commit edb5fa7

Browse files
ShaurenShauren
authored
Merge branch 'master' into patch-11
2 parents d385a9d + db85525 commit edb5fa7

44 files changed

Lines changed: 2884 additions & 291 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎cmake/genrev.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ if(WIN32)
134134
OUTPUT_STRIP_TRAILING_WHITESPACE
135135
)
136136
# Remove "Microsoft Windows" from the result
137-
string(REGEX REPLACE "^.* Windows " "" TRINITY_BUILD_HOST_SYSTEM_RELEASE ${TRINITY_BUILD_HOST_SYSTEM_RELEASE})
137+
string(REGEX REPLACE "^.* Windows " "" TRINITY_BUILD_HOST_SYSTEM_RELEASE "${TRINITY_BUILD_HOST_SYSTEM_RELEASE}")
138138
endif()
139139

140140
if(CMAKE_SCRIPT_MODE_FILE)

‎sql/base/auth_database.sql‎

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -459,6 +459,30 @@ LOCK TABLES `battlenet_account_transmog_illusions` WRITE;
459459
/*!40000 ALTER TABLE `battlenet_account_transmog_illusions` ENABLE KEYS */;
460460
UNLOCK TABLES;
461461

462+
--
463+
-- Table structure for table `battlenet_account_transmog_outfits`
464+
--
465+
466+
DROP TABLE IF EXISTS `battlenet_account_transmog_outfits`;
467+
/*!40101 SET @saved_cs_client = @@character_set_client */;
468+
/*!50503 SET character_set_client = utf8mb4 */;
469+
CREATE TABLE `battlenet_account_transmog_outfits` (
470+
`battlenetAccountId` int unsigned NOT NULL,
471+
`transmogOutfitId` int NOT NULL DEFAULT '0',
472+
PRIMARY KEY (`battlenetAccountId`,`blobIndex`),
473+
CONSTRAINT `fk_battlenet_account_transmog_outfits` FOREIGN KEY (`battlenetAccountId`) REFERENCES `battlenet_accounts` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT
474+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
475+
/*!40101 SET character_set_client = @saved_cs_client */;
476+
477+
--
478+
-- Dumping data for table `battlenet_account_transmog_outfits`
479+
--
480+
481+
LOCK TABLES `battlenet_account_transmog_outfits` WRITE;
482+
/*!40000 ALTER TABLE `battlenet_account_transmog_outfits` DISABLE KEYS */;
483+
/*!40000 ALTER TABLE `battlenet_account_transmog_outfits` ENABLE KEYS */;
484+
UNLOCK TABLES;
485+
462486
--
463487
-- Table structure for table `battlenet_account_warband_scenes`
464488
--
@@ -4147,7 +4171,8 @@ INSERT INTO `updates` VALUES
41474171
('2026_03_10_00_auth.sql','4BB4EBC719F80F7BEA667E6DA49815B358956FEA','RELEASED','2026-03-10 20:42:13',0),
41484172
('2026_03_14_00_auth.sql','4CE4AF3D9E1BF173832B25F4D1A730A93ED016FA','RELEASED','2026-03-14 12:03:14',0),
41494173
('2026_03_18_00_auth.sql','7A755DADF9AAC9016FD01B26ACEC714FAB5E3269','RELEASED','2026-03-18 12:36:48',0),
4150-
('2026_03_20_00_auth.sql','9083386953291DA3D0634E90D40863F7625FF37E','RELEASED','2026-03-20 01:11:00',0);
4174+
('2026_03_20_00_auth.sql','9083386953291DA3D0634E90D40863F7625FF37E','RELEASED','2026-03-20 01:11:00',0),
4175+
('2026_03_21_00_auth.sql','6D47EFD7FBCD159F5BC5B5A6020E61824280E92A','RELEASED','2026-03-21 00:08:26',0);
41514176
/*!40000 ALTER TABLE `updates` ENABLE KEYS */;
41524177
UNLOCK TABLES;
41534178

‎sql/base/characters_database.sql‎

Lines changed: 87 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1891,6 +1891,89 @@ LOCK TABLES `character_trait_entry` WRITE;
18911891
/*!40000 ALTER TABLE `character_trait_entry` ENABLE KEYS */;
18921892
UNLOCK TABLES;
18931893

1894+
--
1895+
-- Table structure for table `character_transmog_outfit`
1896+
--
1897+
1898+
DROP TABLE IF EXISTS `character_transmog_outfit`;
1899+
/*!40101 SET @saved_cs_client = @@character_set_client */;
1900+
/*!50503 SET character_set_client = utf8mb4 */;
1901+
CREATE TABLE `character_transmog_outfit` (
1902+
`guid` bigint NOT NULL,
1903+
`transmogOutfitId` int NOT NULL,
1904+
`name` varchar(16) COLLATE utf8mb4_unicode_ci NOT NULL,
1905+
`icon` int NOT NULL,
1906+
`situationsEnabled` tinyint(1) NOT NULL,
1907+
PRIMARY KEY (`guid`,`transmogOutfitId`)
1908+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
1909+
/*!40101 SET character_set_client = @saved_cs_client */;
1910+
1911+
--
1912+
-- Dumping data for table `character_transmog_outfit`
1913+
--
1914+
1915+
LOCK TABLES `character_transmog_outfit` WRITE;
1916+
/*!40000 ALTER TABLE `character_transmog_outfit` DISABLE KEYS */;
1917+
/*!40000 ALTER TABLE `character_transmog_outfit` ENABLE KEYS */;
1918+
UNLOCK TABLES;
1919+
1920+
--
1921+
-- Table structure for table `character_transmog_outfit_situation`
1922+
--
1923+
1924+
DROP TABLE IF EXISTS `character_transmog_outfit_situation`;
1925+
/*!40101 SET @saved_cs_client = @@character_set_client */;
1926+
/*!50503 SET character_set_client = utf8mb4 */;
1927+
CREATE TABLE `character_transmog_outfit_situation` (
1928+
`guid` bigint NOT NULL,
1929+
`transmogOutfitId` int NOT NULL,
1930+
`situationID` int NOT NULL,
1931+
`specID` int NOT NULL,
1932+
`loadoutID` int NOT NULL,
1933+
`equipmentSetID` int NOT NULL,
1934+
PRIMARY KEY (`guid`,`transmogOutfitId`,`situationID`,`specID`,`loadoutID`,`equipmentSetID`)
1935+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
1936+
/*!40101 SET character_set_client = @saved_cs_client */;
1937+
1938+
--
1939+
-- Dumping data for table `character_transmog_outfit_situation`
1940+
--
1941+
1942+
LOCK TABLES `character_transmog_outfit_situation` WRITE;
1943+
/*!40000 ALTER TABLE `character_transmog_outfit_situation` DISABLE KEYS */;
1944+
/*!40000 ALTER TABLE `character_transmog_outfit_situation` ENABLE KEYS */;
1945+
UNLOCK TABLES;
1946+
1947+
--
1948+
-- Table structure for table `character_transmog_outfit_slot`
1949+
--
1950+
1951+
DROP TABLE IF EXISTS `character_transmog_outfit_slot`;
1952+
/*!40101 SET @saved_cs_client = @@character_set_client */;
1953+
/*!50503 SET character_set_client = utf8mb4 */;
1954+
CREATE TABLE `character_transmog_outfit_slot` (
1955+
`guid` bigint NOT NULL,
1956+
`transmogOutfitId` int NOT NULL,
1957+
`slot` tinyint NOT NULL,
1958+
`slotOption` tinyint NOT NULL,
1959+
`itemModifiedAppearanceID` int NOT NULL,
1960+
`appearanceDisplayType` tinyint NOT NULL,
1961+
`spellItemEnchantmentID` int NOT NULL,
1962+
`illusionDisplayType` tinyint NOT NULL,
1963+
`flags` int NOT NULL,
1964+
PRIMARY KEY (`guid`,`transmogOutfitId`,`slot`,`slotOption`)
1965+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
1966+
/*!40101 SET character_set_client = @saved_cs_client */;
1967+
1968+
--
1969+
-- Dumping data for table `character_transmog_outfit_slot`
1970+
--
1971+
1972+
LOCK TABLES `character_transmog_outfit_slot` WRITE;
1973+
/*!40000 ALTER TABLE `character_transmog_outfit_slot` DISABLE KEYS */;
1974+
/*!40000 ALTER TABLE `character_transmog_outfit_slot` ENABLE KEYS */;
1975+
UNLOCK TABLES;
1976+
18941977
--
18951978
-- Table structure for table `character_transmog_outfits`
18961979
--
@@ -2043,6 +2126,8 @@ CREATE TABLE `characters` (
20432126
`personalTabardBorderStyle` int NOT NULL DEFAULT '-1',
20442127
`personalTabardBorderColor` int NOT NULL DEFAULT '-1',
20452128
`personalTabardBackgroundColor` int NOT NULL DEFAULT '-1',
2129+
`transmogOutfitEquippedId` int NOT NULL DEFAULT '2',
2130+
`transmogOutfitLocked` tinyint(1) NOT NULL DEFAULT '0',
20462131
PRIMARY KEY (`guid`),
20472132
UNIQUE KEY `idx_name` (`name`),
20482133
KEY `idx_account` (`account`),
@@ -3832,7 +3917,8 @@ INSERT INTO `updates` VALUES
38323917
('2025_11_25_00_characters.sql','A0C04B2404B1832421402F78436DDC4AA18EBAD8','ARCHIVED','2025-11-25 22:28:32',0),
38333918
('2026_01_14_00_characters.sql','FF5D889A41BBD9F9827489DEC08BCA9DB457933E','ARCHIVED','2026-01-14 23:40:33',0),
38343919
('2026_01_28_00_characters.sql','807B6622970E81089806C3B45C6C7A32EF531BCA','ARCHIVED','2026-01-25 21:53:51',0),
3835-
('2026_02_06_00_characters.sql','90735F4481A137E79B8371F291008CF6051657AC','ARCHIVED','2026-02-06 12:45:48',0);
3920+
('2026_02_06_00_characters.sql','90735F4481A137E79B8371F291008CF6051657AC','ARCHIVED','2026-02-06 12:45:48',0),
3921+
('2026_03_21_00_characters.sql','87963F4E341B195D4B4C4514A3119092DF127431','RELEASED','2026-03-21 00:42:13',0);
38363922
/*!40000 ALTER TABLE `updates` ENABLE KEYS */;
38373923
UNLOCK TABLES;
38383924

‎sql/updates/auth/master/2026_03_21_00_auth.sql‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
--
2+
-- Table structure for table `battlenet_account_transmog_outfits`
3+
--
4+
DROP TABLE IF EXISTS `battlenet_account_transmog_outfits`;
5+
CREATE TABLE `battlenet_account_transmog_outfits` (
6+
`battlenetAccountId` int unsigned NOT NULL,
7+
`transmogOutfitId` int NOT NULL DEFAULT '0',
8+
PRIMARY KEY (`battlenetAccountId`,`transmogOutfitId`),
9+
CONSTRAINT `fk_battlenet_account_transmog_outfits` FOREIGN KEY (`battlenetAccountId`) REFERENCES `battlenet_accounts` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT
10+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;

‎sql/updates/characters/master/2026_03_21_00_characters.sql‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
ALTER TABLE `characters`
2+
ADD `transmogOutfitEquippedId` int NOT NULL DEFAULT 2 AFTER `personalTabardBackgroundColor`,
3+
ADD `transmogOutfitLocked` tinyint(1) NOT NULL DEFAULT 0 AFTER `transmogOutfitEquippedId`;
4+
5+
--
6+
-- Table structure for table `character_transmog_outfit`
7+
--
8+
DROP TABLE IF EXISTS `character_transmog_outfit`;
9+
CREATE TABLE `character_transmog_outfit` (
10+
`guid` bigint NOT NULL,
11+
`transmogOutfitId` int NOT NULL,
12+
`name` varchar(16) COLLATE utf8mb4_unicode_ci NOT NULL,
13+
`icon` int NOT NULL,
14+
`situationsEnabled` tinyint(1) NOT NULL,
15+
PRIMARY KEY (`guid`,`transmogOutfitId`)
16+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
17+
18+
--
19+
-- Table structure for table `character_transmog_outfit_situation`
20+
--
21+
DROP TABLE IF EXISTS `character_transmog_outfit_situation`;
22+
CREATE TABLE `character_transmog_outfit_situation` (
23+
`guid` bigint NOT NULL,
24+
`transmogOutfitId` int NOT NULL,
25+
`situationID` int NOT NULL,
26+
`specID` int NOT NULL,
27+
`loadoutID` int NOT NULL,
28+
`equipmentSetID` int NOT NULL,
29+
PRIMARY KEY (`guid`,`transmogOutfitId`,`situationID`,`specID`,`loadoutID`,`equipmentSetID`)
30+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
31+
32+
--
33+
-- Table structure for table `character_transmog_outfit_slot`
34+
--
35+
DROP TABLE IF EXISTS `character_transmog_outfit_slot`;
36+
CREATE TABLE `character_transmog_outfit_slot` (
37+
`guid` bigint NOT NULL,
38+
`transmogOutfitId` int NOT NULL,
39+
`slot` tinyint NOT NULL,
40+
`slotOption` tinyint NOT NULL,
41+
`itemModifiedAppearanceID` int NOT NULL,
42+
`appearanceDisplayType` tinyint NOT NULL,
43+
`spellItemEnchantmentID` int NOT NULL,
44+
`illusionDisplayType` tinyint NOT NULL,
45+
`flags` int NOT NULL,
46+
PRIMARY KEY (`guid`,`transmogOutfitId`,`slot`,`slotOption`)
47+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;

0 commit comments

Comments
 (0)