Skip to content

Commit 485e561

Browse files
author
Github Actions
committed
Merge 3.3.5-base_patch to 3.3.5-tele_npc_3
2 parents 6a82d34 + fde4498 commit 485e561

File tree

258 files changed

+1402
-315
lines changed

Some content is hidden

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

258 files changed

+1402
-315
lines changed

‎revision_data.h.in.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040

4141
// Database updater base information
4242
#define DATABASE_MYSQL_EXECUTABLE R"(@MYSQL_EXECUTABLE@)"
43-
#define DATABASE_FULL_DATABASE "TDB_full_world_335.24111_2024_11_22.sql"
43+
#define DATABASE_FULL_DATABASE "TDB_full_world_335.25101_2025_10_21.sql"
4444

4545
// Windows resource defines
4646
#define TRINITY_COMPANYNAME_STR "TrinityCore Developers"

‎sql/base/auth_database.sql‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
-- MySQL dump 10.13 Distrib 8.0.40, for Linux (x86_64)
1+
-- MySQL dump 10.13 Distrib 8.0.43, for Linux (x86_64)
22
--
33
-- Host: localhost Database: auth
44
-- ------------------------------------------------------
5-
-- Server version 8.0.40-0ubuntu0.22.04.1
5+
-- Server version 8.0.43-0ubuntu0.22.04.2
66

77
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
88
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -2532,7 +2532,8 @@ INSERT INTO `updates` VALUES
25322532
('2024_08_30_00_auth.sql','BD76942F1C29AAA2450E051E7CA552672B5E331B','ARCHIVED','2024-08-30 19:24:30',0),
25332533
('2024_09_26_00_auth.sql','E37C3997FD7851EA360774AC568912846C448272','ARCHIVED','2024-09-26 18:27:26',0),
25342534
('2024_11_22_00_auth.sql','F2C1D1572A3968E9E9D778EF7DC82778DF3EF887','ARCHIVED','2024-11-22 23:18:14',0),
2535-
('2025_02_14_00_auth.sql','4A30E92FF519BB41C520CDBF90019291217C26A2','RELEASED','2025-02-14 17:20:00',0);
2535+
('2025_02_14_00_auth.sql','4A30E92FF519BB41C520CDBF90019291217C26A2','ARCHIVED','2025-02-14 17:20:00',0),
2536+
('2025_10_21_00_auth.sql','1A221989F98337CB285B4328E791F5531CFD2454','ARCHIVED','2025-10-21 18:16:45',0);
25362537
/*!40000 ALTER TABLE `updates` ENABLE KEYS */;
25372538
UNLOCK TABLES;
25382539

@@ -2671,4 +2672,4 @@ SET character_set_client = @saved_cs_client;
26712672
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
26722673
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
26732674

2674-
-- Dump completed on 2024-11-22 23:18:17
2675+
-- Dump completed on 2025-10-21 18:16:58

‎sql/base/characters_database.sql‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
-- MySQL dump 10.13 Distrib 8.0.40, for Linux (x86_64)
1+
-- MySQL dump 10.13 Distrib 8.0.43, for Linux (x86_64)
22
--
33
-- Host: localhost Database: characters
44
-- ------------------------------------------------------
5-
-- Server version 8.0.40-0ubuntu0.22.04.1
5+
-- Server version 8.0.43-0ubuntu0.22.04.2
66

77
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
88
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -2691,8 +2691,9 @@ INSERT INTO `updates` VALUES
26912691
('2024_08_17_00_characters.sql','08705FBCB8504E8B1009FDAF955F56D734FAD782','ARCHIVED','2024-08-17 22:26:12',0),
26922692
('2024_10_03_00_characters.sql','408249A6992999A36EB94089D184972E8E0767A3','ARCHIVED','2024-10-03 11:10:18',0),
26932693
('2024_11_22_00_characters.sql','9EA2A4F88036D1D5F47EE8A6B634D52D0014986E','ARCHIVED','2024-11-22 23:18:14',0),
2694-
('2025_07_20_00_characters_2022_07_03_00_characters.sql','D3F04078C0846BCF7C8330AC20C39B8C3AEE7002','RELEASED','2022-07-03 23:37:24',0),
2695-
('2025_09_09_00_characters.sql','A1A793D656117C31DAA92653DF0BE4AE6354358A','RELEASED','2025-09-09 14:03:38',0);
2694+
('2025_07_20_00_characters_2022_07_03_00_characters.sql','D3F04078C0846BCF7C8330AC20C39B8C3AEE7002','ARCHIVED','2022-07-03 23:37:24',0),
2695+
('2025_09_09_00_characters.sql','A1A793D656117C31DAA92653DF0BE4AE6354358A','ARCHIVED','2025-09-09 14:03:38',0),
2696+
('2025_10_21_00_characters.sql','DAC3249AE0CF374815D6A656489FE7B0AD3AA051','ARCHIVED','2025-10-21 18:16:45',0);
26962697
/*!40000 ALTER TABLE `updates` ENABLE KEYS */;
26972698
UNLOCK TABLES;
26982699

@@ -2863,4 +2864,4 @@ UNLOCK TABLES;
28632864
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
28642865
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
28652866

2866-
-- Dump completed on 2024-11-22 23:18:18
2867+
-- Dump completed on 2025-10-21 18:16:58

‎sql/base/dev/world_database.sql‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
-- MySQL dump 10.13 Distrib 8.0.40, for Linux (x86_64)
1+
-- MySQL dump 10.13 Distrib 8.0.43, for Linux (x86_64)
22
--
33
-- Host: localhost Database: world
44
-- ------------------------------------------------------
5-
-- Server version 8.0.40-0ubuntu0.22.04.1
5+
-- Server version 8.0.43-0ubuntu0.22.04.2
66

77
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
88
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -384,11 +384,11 @@ DROP TABLE IF EXISTS `creature_classlevelstats`;
384384
CREATE TABLE `creature_classlevelstats` (
385385
`level` tinyint unsigned NOT NULL,
386386
`class` tinyint unsigned NOT NULL,
387-
`basehp0` smallint unsigned NOT NULL DEFAULT '1',
388-
`basehp1` smallint unsigned NOT NULL DEFAULT '1',
389-
`basehp2` smallint unsigned NOT NULL DEFAULT '1',
390-
`basemana` smallint unsigned NOT NULL DEFAULT '0',
391-
`basearmor` smallint unsigned NOT NULL DEFAULT '1',
387+
`basehp0` int unsigned NOT NULL DEFAULT '1',
388+
`basehp1` int unsigned NOT NULL DEFAULT '1',
389+
`basehp2` int unsigned NOT NULL DEFAULT '1',
390+
`basemana` int unsigned NOT NULL DEFAULT '1',
391+
`basearmor` int unsigned NOT NULL DEFAULT '1',
392392
`attackpower` smallint unsigned NOT NULL DEFAULT '0',
393393
`rangedattackpower` smallint unsigned NOT NULL DEFAULT '0',
394394
`damage_base` float NOT NULL DEFAULT '0',
@@ -1225,7 +1225,7 @@ CREATE TABLE `gameobject` (
12251225
`animprogress` tinyint unsigned NOT NULL DEFAULT '0',
12261226
`state` tinyint unsigned NOT NULL DEFAULT '0',
12271227
`ScriptName` char(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '',
1228-
`StringId` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
1228+
`StringId` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
12291229
`VerifiedBuild` int DEFAULT NULL,
12301230
PRIMARY KEY (`guid`)
12311231
) ENGINE=InnoDB AUTO_INCREMENT=2134507 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Gameobject System';
@@ -1347,33 +1347,33 @@ CREATE TABLE `gameobject_template` (
13471347
`castBarCaption` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
13481348
`unk1` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
13491349
`size` float NOT NULL DEFAULT '1',
1350-
`Data0` int unsigned NOT NULL DEFAULT '0',
1350+
`Data0` int NOT NULL DEFAULT '0',
13511351
`Data1` int NOT NULL DEFAULT '0',
1352-
`Data2` int unsigned NOT NULL DEFAULT '0',
1353-
`Data3` int unsigned NOT NULL DEFAULT '0',
1354-
`Data4` int unsigned NOT NULL DEFAULT '0',
1355-
`Data5` int unsigned NOT NULL DEFAULT '0',
1352+
`Data2` int NOT NULL DEFAULT '0',
1353+
`Data3` int NOT NULL DEFAULT '0',
1354+
`Data4` int NOT NULL DEFAULT '0',
1355+
`Data5` int NOT NULL DEFAULT '0',
13561356
`Data6` int NOT NULL DEFAULT '0',
1357-
`Data7` int unsigned NOT NULL DEFAULT '0',
1358-
`Data8` int unsigned NOT NULL DEFAULT '0',
1359-
`Data9` int unsigned NOT NULL DEFAULT '0',
1360-
`Data10` int unsigned NOT NULL DEFAULT '0',
1361-
`Data11` int unsigned NOT NULL DEFAULT '0',
1362-
`Data12` int unsigned NOT NULL DEFAULT '0',
1363-
`Data13` int unsigned NOT NULL DEFAULT '0',
1364-
`Data14` int unsigned NOT NULL DEFAULT '0',
1365-
`Data15` int unsigned NOT NULL DEFAULT '0',
1366-
`Data16` int unsigned NOT NULL DEFAULT '0',
1367-
`Data17` int unsigned NOT NULL DEFAULT '0',
1368-
`Data18` int unsigned NOT NULL DEFAULT '0',
1369-
`Data19` int unsigned NOT NULL DEFAULT '0',
1370-
`Data20` int unsigned NOT NULL DEFAULT '0',
1371-
`Data21` int unsigned NOT NULL DEFAULT '0',
1372-
`Data22` int unsigned NOT NULL DEFAULT '0',
1373-
`Data23` int unsigned NOT NULL DEFAULT '0',
1357+
`Data7` int NOT NULL DEFAULT '0',
1358+
`Data8` int NOT NULL DEFAULT '0',
1359+
`Data9` int NOT NULL DEFAULT '0',
1360+
`Data10` int NOT NULL DEFAULT '0',
1361+
`Data11` int NOT NULL DEFAULT '0',
1362+
`Data12` int NOT NULL DEFAULT '0',
1363+
`Data13` int NOT NULL DEFAULT '0',
1364+
`Data14` int NOT NULL DEFAULT '0',
1365+
`Data15` int NOT NULL DEFAULT '0',
1366+
`Data16` int NOT NULL DEFAULT '0',
1367+
`Data17` int NOT NULL DEFAULT '0',
1368+
`Data18` int NOT NULL DEFAULT '0',
1369+
`Data19` int NOT NULL DEFAULT '0',
1370+
`Data20` int NOT NULL DEFAULT '0',
1371+
`Data21` int NOT NULL DEFAULT '0',
1372+
`Data22` int NOT NULL DEFAULT '0',
1373+
`Data23` int NOT NULL DEFAULT '0',
13741374
`AIName` char(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
13751375
`ScriptName` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
1376-
`StringId` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
1376+
`StringId` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
13771377
`VerifiedBuild` int DEFAULT NULL,
13781378
PRIMARY KEY (`entry`),
13791379
KEY `idx_name` (`name`)
@@ -2828,7 +2828,7 @@ CREATE TABLE `quest_template` (
28282828
`RewardFactionValue5` int NOT NULL DEFAULT '0',
28292829
`RewardFactionOverride5` int NOT NULL DEFAULT '0',
28302830
`TimeAllowed` int unsigned NOT NULL DEFAULT '0',
2831-
`AllowableRaces` smallint unsigned NOT NULL DEFAULT '0',
2831+
`AllowableRaces` int unsigned NOT NULL DEFAULT '0',
28322832
`LogTitle` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
28332833
`LogDescription` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
28342834
`QuestDescription` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
@@ -4071,4 +4071,4 @@ CREATE TABLE `waypoints` (
40714071
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
40724072
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
40734073

4074-
-- Dump completed on 2024-11-22 23:18:19
4074+
-- Dump completed on 2025-10-21 18:16:59

‎sql/updates/auth/3.3.5/2024_11_22_00_auth.sql‎ renamed to ‎sql/old/3.3.5a/auth/24111_2025_10_21/2024_11_22_00_auth.sql‎

File renamed without changes.

‎sql/updates/auth/3.3.5/2025_02_14_00_auth.sql‎ renamed to ‎sql/old/3.3.5a/auth/24111_2025_10_21/2025_02_14_00_auth.sql‎

File renamed without changes.

‎sql/updates/characters/3.3.5/2024_11_22_00_characters.sql‎ renamed to ‎sql/old/3.3.5a/characters/24111_2025_10_21/2024_11_22_00_characters.sql‎

File renamed without changes.

‎sql/updates/characters/3.3.5/2025_07_20_00_characters_2022_07_03_00_characters.sql‎ renamed to ‎sql/old/3.3.5a/characters/24111_2025_10_21/2025_07_20_00_characters_2022_07_03_00_characters.sql‎

File renamed without changes.

‎sql/updates/characters/3.3.5/2025_09_09_00_characters.sql‎ renamed to ‎sql/old/3.3.5a/characters/24111_2025_10_21/2025_09_09_00_characters.sql‎

File renamed without changes.

‎sql/updates/world/3.3.5/2024_11_22_01_world.sql‎ renamed to ‎sql/old/3.3.5a/world/24111_2025_10_21/2024_11_22_01_world.sql‎

File renamed without changes.

0 commit comments

Comments
 (0)