mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-18 00:18:43 +01:00
Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4
This commit is contained in:
@@ -9,7 +9,7 @@
|
||||
#define _SOURCE_DIRECTORY R"(@CMAKE_SOURCE_DIR@)"
|
||||
#define _BUILD_DIRECTORY R"(@BUILDDIR@)"
|
||||
#define _MYSQL_EXECUTABLE R"(@MYSQL_EXECUTABLE@)"
|
||||
#define _FULL_DATABASE "TDB_full_world_434.27_2018_02_16.sql"
|
||||
#define _FULL_DATABASE "TDB_full_world_434.28_2018_03_16.sql"
|
||||
#define VER_COMPANYNAME_STR "TrinityCore Developers"
|
||||
#define VER_LEGALCOPYRIGHT_STR "(c)2008-2018 TrinityCore"
|
||||
#define VER_FILEVERSION 0,0,0
|
||||
|
||||
@@ -2004,7 +2004,8 @@ INSERT INTO `updates` VALUES
|
||||
('2018_01_06_00_auth.sql','CD9B826B9D95697DC412DEF780E814FA3991D6CD','ARCHIVED','2018-01-06 01:40:04',0),
|
||||
('2018_01_15_00_auth.sql','1C5C28490B27D86EBC14F6034AA4D34E66D5545D','ARCHIVED','2018-01-15 01:40:04',0),
|
||||
('2018_02_16_00_auth.sql','1AAD2FC649CBE8093ECE5908EBBBB31EC326166A','ARCHIVED','2018-02-16 01:40:04',0),
|
||||
('2018_03_06_00_auth_from_335_was_2018_03_06_00_auth.sql','3F8EA885898CE0F9D47043A832602D77','ARCHIVED','2018-02-16 01:40:04',0);
|
||||
('2018_03_06_00_auth_from_335_was_2018_03_06_00_auth.sql','3F8EA885898CE0F9D47043A832602D77','ARCHIVED','2018-02-16 01:40:04',0),
|
||||
('2018_03_16_00_auth.sql','E77AFBFE7C1DEC8839AECC40140ED1AF55B56A10','ARCHIVED','2018-03-16 01:40:04',0);
|
||||
/*!40000 ALTER TABLE `updates` ENABLE KEYS */;
|
||||
UNLOCK TABLES;
|
||||
|
||||
|
||||
@@ -2876,7 +2876,8 @@ INSERT INTO `updates` VALUES
|
||||
('2017_11_28_00_characters.sql','6FF1F84B8985ADFC7FF97F0BF8E53403CF13C320','ARCHIVED','2017-11-28 00:00:00',0),
|
||||
('2017_12_17_00_characters.sql','937E8F51DC74AC41FF8F213CE36C69DDEB878D6A','ARCHIVED','2017-12-17 00:00:00',0),
|
||||
('2018_01_15_00_characters.sql','43C8E4549E1AA9610B377BC7139C88C63D0DC193','ARCHIVED','2018-01-15 00:00:00',0),
|
||||
('2018_02_16_00_characters.sql','F1254689CE8A0B0AF149E557830287FF583B8D91','ARCHIVED','2018-02-16 00:00:00',0);
|
||||
('2018_02_16_00_characters.sql','F1254689CE8A0B0AF149E557830287FF583B8D91','ARCHIVED','2018-02-16 00:00:00',0),
|
||||
('2018_03_16_00_characters.sql','722EAFB7F508882F584DCAE61F97F1A11EDE126E','ARCHIVED','2018-03-16 00:00:00',0);
|
||||
/*!40000 ALTER TABLE `updates` ENABLE KEYS */;
|
||||
UNLOCK TABLES;
|
||||
|
||||
|
||||
@@ -3186,6 +3186,7 @@ CREATE TABLE `smart_scripts` (
|
||||
`event_param2` int(10) unsigned NOT NULL DEFAULT '0',
|
||||
`event_param3` int(10) unsigned NOT NULL DEFAULT '0',
|
||||
`event_param4` int(10) unsigned NOT NULL DEFAULT '0',
|
||||
`event_param5` int(10) unsigned NOT NULL DEFAULT '0',
|
||||
`action_type` tinyint(3) unsigned NOT NULL DEFAULT '0',
|
||||
`action_param1` int(10) unsigned NOT NULL DEFAULT '0',
|
||||
`action_param2` int(10) unsigned NOT NULL DEFAULT '0',
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
--
|
||||
UPDATE `creature_template_addon` SET `auras`="31261" WHERE `entry` IN (20561);
|
||||
UPDATE `smart_scripts` SET `action_type`=41, `action_param1`=0 WHERE `entryorguid` IN (20561) AND `source_type`=0 AND `id`=2;
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user