Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into ShatteredWorld

Browse Source 
# Conflicts:
#	src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
#	src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
#	src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h
This commit is contained in:
Ovahlord committed 2018-01-02 01:23:06 +01:00
2 parents 95d0803a1c 4b9415a916
commit 98fdf72c7b
1535 files changed
+2852 -2917
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.travis.yml
+3
View File
@@ -25,6 +25,9 @@ addons:
- libbz2-dev
- libzmq3-dev
services:
- mysql
before_install:
- git config user.email "travis@build.bot" && git config user.name "Travis CI"
- git tag -a -m "Travis build" init
CMakeLists.txt
+1 -1
View File
@@ -1,4 +1,4 @@
# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
CONTRIBUTING.md
+8 -8
View File
@@ -7,18 +7,18 @@ Contributing is not only about creating fixes, but also reporting bugs. Before r
Issues
======
Read [this](http://www.trinitycore.org/f/topic/37-the-trinitycore-issuetracker-and-you/) before creating a ticket.
If you have problems with TrinityCore installation, read [this](http://www.trinitycore.org/f/topic/1518-trouble-with-your-trinity-install-readme-1st-faqs/).
Read [this](https://www.trinitycore.org/f/topic/37-the-trinitycore-issuetracker-and-you/) before creating a ticket.
If you have problems with TrinityCore installation, read [this](https://www.trinitycore.org/f/topic/1518-trouble-with-your-trinity-install-readme-1st-faqs/).
Mandatory things when creating a ticket:
========================================
- Branch
- commit hash (if you get something like TrinityCore rev. unknown 1970-01-01 00:00:00 +0000 (Archived branch) (Win64, Release), please read this [post](http://www.trinitycore.org/f/topic/345-howto-properly-install-git-on-windows-fix-trinitycore-rev-1970-01-01-000000-0000/) or clone this repository instead downloading the source code.
- commit hash (if you get something like TrinityCore rev. unknown 1970-01-01 00:00:00 +0000 (Archived branch) (Win64, Release), please read this [post](https://www.trinitycore.org/f/topic/345-howto-properly-install-git-on-windows-fix-trinitycore-rev-1970-01-01-000000-0000/) or clone this repository instead downloading the source code.
- entries of affected creatures / items / quests with a link to the relevant wowhead page.
- clear title and description of the bug - if your english is very bad, please use google translate or yandex to translate to english and include one text in your native language.
When reporting a crash, you MUST compile in debug mode because release dumps are useless (not enough information) - if you don't know how to compile in debug, read [this](http://www.trinitycore.org/f/topic/1518-trouble-with-your-trinity-install-readme-1st-faqs/#entry47672)
When reporting a crash, you MUST compile in debug mode because release dumps are useless (not enough information) - if you don't know how to compile in debug, read [this](https://www.trinitycore.org/f/topic/1518-trouble-with-your-trinity-install-readme-1st-faqs/#entry47672)
We sugest the title and body to have the next style:
@@ -39,8 +39,8 @@ Creating Pull Requests:
When creating patches read:
- [TrinityCore Development Standards](http://www.trinitycore.org/f/topic/6-trinitycore-developing-standards/)
- [WDB Fields](http://www.trinitycore.org/f/topic/58-wdb-fields/)
- [TrinityCore Development Standards](https://www.trinitycore.org/f/topic/6-trinitycore-developing-standards/)
- [WDB Fields](https://www.trinitycore.org/f/topic/58-wdb-fields/)
- [Git Squash](https://ariejan.net/2011/07/05/git-squash-your-latests-commits-into-one/)
@@ -53,7 +53,7 @@ Since it's very unlikely that your Pull Request will be merged on the day that y
Wiki
====
The wiki is located at [http://trinitycore.info](http://trinitycore.info).
The wiki is located at [https://trinitycore.info](https://trinitycore.info).
You are welcome to create an account and help us improve and extend the wiki.
@@ -62,7 +62,7 @@ Requirements
============
Software requirements are available in the [wiki](http://www.trinitycore.info/display/tc/Requirements) for
Software requirements are available in the [wiki](https://www.trinitycore.info/display/tc/Requirements) for
Windows, Linux and Mac OSX.
If you choose Linux, we recommend to use Debian 8, since it's the Linux that we use to test compilations.
PreLoad.cmake
+1 -1
View File
@@ -1,4 +1,4 @@
# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
cmake/genrev.cmake
+1 -1
View File
@@ -1,4 +1,4 @@
# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
cmake/macros/AutoCollect.cmake
+1 -1
View File
@@ -1,4 +1,4 @@
# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
cmake/macros/CheckBuildDir.cmake
+1 -1
View File
@@ -1,4 +1,4 @@
# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
cmake/macros/ConfigureScripts.cmake
+1 -1
View File
@@ -1,4 +1,4 @@
# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
cmake/macros/FindGit.cmake
+1 -1
View File
@@ -1,4 +1,4 @@
# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
cmake/macros/GroupSources.cmake
+1 -1
View File
@@ -1,4 +1,4 @@
# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
cmake/options.cmake
+1 -1
View File
@@ -1,4 +1,4 @@
# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
contrib/conf_merge/tc-conf-merger.pl
+1 -1
View File
@@ -1,6 +1,6 @@
#!/usr/bin/perl -w
# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
# Author: leak
# Date: 2010-12-06
# Note: Based on conf file format of rev 10507
dep/CMakeLists.txt
+1 -1
View File
@@ -1,4 +1,4 @@
# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
dep/SFMT/CMakeLists.txt
+1 -1
View File
@@ -1,4 +1,4 @@
# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
dep/bzip2/CMakeLists.txt
+1 -1
View File
@@ -1,4 +1,4 @@
# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
dep/fmt/CMakeLists.txt
+1 -1
View File
@@ -1,4 +1,4 @@
# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
dep/g3dlite/CMakeLists.txt
+1 -1
View File
@@ -1,4 +1,4 @@
# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
dep/gsoap/CMakeLists.txt
+1 -1
View File
@@ -1,4 +1,4 @@
# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
dep/jemalloc/CMakeLists.txt
+1 -1
View File
@@ -1,4 +1,4 @@
# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
dep/mysql/CMakeLists.txt
+1 -1
View File
@@ -1,4 +1,4 @@
# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
dep/openssl/CMakeLists.txt
+1 -1
View File
@@ -1,4 +1,4 @@
# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
dep/process/CMakeLists.txt
+1 -1
View File
@@ -1,4 +1,4 @@
# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
dep/readline/CMakeLists.txt
+1 -1
View File
@@ -1,4 +1,4 @@
# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
dep/recastnavigation/CMakeLists.txt
+1 -1
View File
@@ -1,4 +1,4 @@
# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
# Copyright (C) 2005-2011 MaNGOS project <http://getmangos.com/>
#
# This program is free software; you can redistribute it and/or modify
dep/recastnavigation/Detour/CMakeLists.txt
+1 -1
View File
@@ -1,4 +1,4 @@
# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
dep/recastnavigation/Recast/CMakeLists.txt
+1 -1
View File
@@ -1,4 +1,4 @@
# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
dep/threads/CMakeLists.txt
+1 -1
View File
@@ -1,4 +1,4 @@
# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
dep/utf8cpp/CMakeLists.txt
+1 -1
View File
@@ -1,4 +1,4 @@
# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
dep/valgrind/CMakeLists.txt
+1 -1
View File
@@ -1,4 +1,4 @@
# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
dep/zlib/CMakeLists.txt
+1 -1
View File
@@ -1,4 +1,4 @@
# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
dep/zmq/CMakeLists.txt
+1 -1
View File
@@ -1,4 +1,4 @@
# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
dep/zmqpp/CMakeLists.txt
+1 -1
View File
@@ -1,4 +1,4 @@
# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
doc/UnixInstall.txt
+5 -5
View File
@@ -1,15 +1,15 @@
= TrinityCore -- Linux installation =
Copyright (C) 2008-2017 TrinityCore (http://www.trinitycore.org/)
Copyright (C) 2008-2018 TrinityCore (https://www.trinitycore.org/)
=========================================================
WARNING: THIS DOCUMENTATION IS NOT ALWAYS UP TO DATE.
FOR MORE UP-TO-DATE INFORMATION, CHECK THE TRINITY WIKI.
=========================================================
CHECK http://www.trinitycore.info/How-to:Linux FOR FURTHER HELP
CHECK https://www.trinitycore.info/display/tc/Requirements FOR FURTHER HELP
These are instructions for installation in a Linux environment, if you are
using Windows refer to http://www.trinitycore.info/How-to:Win
using Windows refer to https://trinitycore.atlassian.net/wiki/spaces/tc/pages/10977296/Windows+Requirements
Installing TrinityCore is fairly simple on a Linux machine, assuming you
have all required applications
@@ -17,9 +17,9 @@ have all required applications
The most important ones are:
g++
gcc version 4.3.x or greater
gcc version 6.3.x or greater
make
cmake version 2.6.x or greater
cmake version 3.2.x or greater
libmysql++-dev
git (for checking out the core and database)
openssl
revision_data.h.in.cmake
+1 -1
View File
@@ -9,7 +9,7 @@
#define _MYSQL_EXECUTABLE R"(@MYSQL_EXECUTABLE@)"
#define _FULL_DATABASE "TDB_full_world_434.25_2017_12_17.sql"
#define VER_COMPANYNAME_STR "TrinityCore Developers"
#define VER_LEGALCOPYRIGHT_STR "(c)2008-2017 TrinityCore"
#define VER_LEGALCOPYRIGHT_STR "(c)2008-2018 TrinityCore"
#define VER_FILEVERSION 0,0,0
#define VER_FILEVERSION_STR "@rev_hash@ @rev_date@ (@rev_branch@ branch)"
#define VER_PRODUCTVERSION VER_FILEVERSION
sql/updates/world/4.3.4/2017_12_28_00_world.sql
+12
View File
@@ -0,0 +1,12 @@
--
UPDATE `creature_template` SET `faction`=14 WHERE `entry`=49311;
UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=49043;
UPDATE `gameobject` SET `spawnMask` = 1 WHERE `id` = 185434 AND `map` IN (0,1);
UPDATE `creature_template` SET `maxgold` = 3360 WHERE `entry` = 37662;
UPDATE `creature_template` SET `maxgold` = 5456 WHERE `entry` = 37031;
UPDATE `creature_template` SET `maxgold` = 4747 WHERE `entry` = 37029;
UPDATE `creature_template` SET `maxgold` = 4607 WHERE `entry` = 37028;
UPDATE `creature_template` SET `maxgold` = 837154 WHERE `entry` = 36855;
UPDATE `creature_template` SET `maxgold` = 18320 WHERE `entry` = 36829;
UPDATE `creature_template` SET `maxgold` = 2673 WHERE `entry` = 36805;
sql/updates/world/4.3.4/2018_01_01_00_world_from_335_was_2017_12_27_00_world.sql
+11
View File
@@ -0,0 +1,11 @@
-- Restore deleted pool
SET @POOL_1 := 382;
DELETE FROM `pool_template` WHERE `entry`=@POOL_1;
INSERT INTO `pool_template` VALUES
(@POOL_1, 1, "Eye of DarKhan/Wailer Spawn 1");
DELETE FROM `pool_creature` WHERE `guid` IN (82897, 85744);
INSERT INTO `pool_creature` VALUES
(82897, @POOL_1, 0, "Wailer Spawn 1"),
(85744, @POOL_1, 0, "Eye of DarKhan Spawn 1");
sql/updates/world/4.3.4/2018_01_01_01_world_from_335_was_2017_12_28_00_world_335.sql
+4
View File
@@ -0,0 +1,4 @@
DELETE FROM `lfg_dungeon_template` WHERE `dungeonId` IN (30, 276);
INSERT INTO `lfg_dungeon_template` (`dungeonId`, `name`, `position_x`, `position_y`, `position_z`, `orientation`, `VerifiedBuild`) VALUES
(30, 'Blackrock Depths - Prison', 456.929, 34.0923, -68.0896, 4.712389, 11159),
(276, 'Blackrock Depths - Upper City', 456.929, 34.0923, -68.0896, 4.712389, 11159);
sql/updates/world/4.3.4/2018_01_01_02_world_from_335_was_2017_12_28_01_world.sql
+6
View File
@@ -0,0 +1,6 @@
DELETE FROM `spell_area` WHERE `spell` IN (30550, 30557, 30562, 30567);
INSERT INTO `spell_area` (`spell`, `area`, `quest_start`, `quest_end`, `aura_spell`, `raceMask`, `gender`, `autocast`, `quest_start_status`, `quest_end_status`) VALUES
(30550, 3457, 0, 0, 0, 0, 2, 0, 64, 11),
(30557, 3457, 0, 0, 0, 0, 2, 0, 64, 11),
(30562, 3457, 0, 0, 0, 0, 2, 0, 64, 11),
(30567, 3457, 0, 0, 0, 0, 2, 0, 64, 11);
sql/updates/world/4.3.4/2018_01_01_03_world_from_335_was_2017_12_28_02_world.sql
+1
View File
@@ -0,0 +1 @@
UPDATE `creature_template` SET `flags_extra`=128 WHERE `entry`=23224;
sql/updates/world/4.3.4/2018_01_01_04_world_from_335_was_2017_12_28_03_world.sql
+1
View File
@@ -0,0 +1 @@
UPDATE `reference_loot_template` SET `Chance` = 40 WHERE `Entry` IN (34278,34279) AND `Item` IN (52025,52028);
sql/updates/world/4.3.4/2018_01_01_05_world_from_335_was_2017_12_28_04_world.sql
+3
View File
@@ -0,0 +1,3 @@
DELETE FROM `gameobject` WHERE `id` = 190557 AND `map` = 631;
INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `VerifiedBuild`) VALUES
(1498,190557,631,0,0,15,1,-59.4583,2157.47,30.6542,2.75761,0,0,0,1,6000,100,1,0);
sql/updates/world/4.3.4/2018_01_01_06_world_from_335_was_2017_12_28_05_world.sql
+3
View File
@@ -0,0 +1,3 @@
DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_hor_quel_delars_will';
INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
(70698, 'spell_hor_quel_delars_will');
sql/updates/world/4.3.4/2018_01_01_07_world_from_335_was_2017_12_28_07_world.sql
+2
View File
@@ -0,0 +1,2 @@
-- Update spells for Thunder Bluff Kodo
UPDATE `creature_template` SET `spell1`=62544, `spell3`=62960 WHERE `entry`=33322;
sql/updates/world/4.3.4/2018_01_01_08_world_from_335_was_2017_12_29_00_world.sql
+3
View File
@@ -0,0 +1,3 @@
DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_item_valanyr_hammer_of_ancient_kings';
INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
(64415,'spell_item_valanyr_hammer_of_ancient_kings');
sql/updates/world/4.3.4/2018_01_01_09_world_from_335_was_2017_12_30_00_world.sql
+1
View File
@@ -0,0 +1 @@
UPDATE `creature_template` SET `mechanic_immune_mask` = `mechanic_immune_mask` & 0xFFFFFF7F;
sql/updates/world/4.3.4/2018_01_01_10_world.sql
+2
View File
@@ -0,0 +1,2 @@
--
UPDATE `creature` SET `MovementType` = 0 WHERE `guid` = 82823;
sql/updates/world/4.3.4/2018_01_01_11_world_from_335_was_2018_01_01_00_world.sql
+5
View File
@@ -0,0 +1,5 @@
--
DELETE FROM `smart_scripts` WHERE `entryorguid`=27283 AND `source_type`=0;
INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
(27283, 0, 0, 0, 0, 0, 100, 0, 1000, 2000, 3400, 4800, 11, 9672, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, "Risen Wintergarde Mage - IC - Cast 'Frostbolt'"),
(27283, 0, 1, 0, 0, 0, 100, 0, 8000, 12000, 9000, 14000, 11, 13339, 65, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, "Risen Wintergarde Mage - In Combat - Cast 'Fire Blast'");
sql/updates/world/4.3.4/2018_01_01_12_world_from_335_was_2018_01_01_01_world.sql
+2
View File
@@ -0,0 +1,2 @@
--
UPDATE `creature` SET `position_x`=469.25, `position_y`=12.05, `position_z`=49.299, `orientation`=1.5708 WHERE `guid`=10997 AND `id`=21962;
sql/updates/world/4.3.4/2018_01_01_13_world_from_335_was_2018_01_01_02_world.sql
+2
View File
@@ -0,0 +1,2 @@
--
UPDATE `creature_template` SET `unit_flags`=`unit_flags`|768 WHERE `entry` IN(40495);
src/CMakeLists.txt
+1 -1
View File
@@ -1,4 +1,4 @@
# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
src/common/CMakeLists.txt
+1 -1
View File
@@ -1,4 +1,4 @@
# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
src/common/Collision/BoundingIntervalHierarchy.cpp
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
* Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
*
* This program is free software; you can redistribute it and/or modify it
src/common/Collision/BoundingIntervalHierarchy.h
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
* Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
*
* This program is free software; you can redistribute it and/or modify it
src/common/Collision/BoundingIntervalHierarchyWrapper.h
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
* Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
*
* This program is free software; you can redistribute it and/or modify it
src/common/Collision/DynamicTree.cpp
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
* Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
*
* This program is free software; you can redistribute it and/or modify it
src/common/Collision/DynamicTree.h
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
* Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
*
* This program is free software; you can redistribute it and/or modify it
src/common/Collision/Management/IVMapManager.h
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
* Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
*
* This program is free software; you can redistribute it and/or modify it
src/common/Collision/Management/MMapFactory.cpp
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
* Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
*
* This program is free software; you can redistribute it and/or modify it
src/common/Collision/Management/MMapFactory.h
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
* Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
*
* This program is free software; you can redistribute it and/or modify it
src/common/Collision/Management/MMapManager.cpp
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
* Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
*
* This program is free software; you can redistribute it and/or modify it
src/common/Collision/Management/MMapManager.h
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
* Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
*
* This program is free software; you can redistribute it and/or modify it
src/common/Collision/Management/VMapFactory.cpp
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
* Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
*
* This program is free software; you can redistribute it and/or modify it
src/common/Collision/Management/VMapFactory.h
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
* Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
*
* This program is free software; you can redistribute it and/or modify it
src/common/Collision/Management/VMapManager2.cpp
+3 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
* Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
*
* This program is free software; you can redistribute it and/or modify it
@@ -297,6 +297,8 @@ namespace VMAP
Vector3 pos = convertPositionToInternalRep(x, y, z);
if (instanceTree->second->GetLocationInfo(pos, info))
{
ASSERT(info.hitModel);
ASSERT(info.hitInstance);
data.floorZ = info.ground_Z;
uint32 liquidType = info.hitModel->GetLiquidType();
float liquidLevel;
src/common/Collision/Management/VMapManager2.h
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
* Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
*
* This program is free software; you can redistribute it and/or modify it
src/common/Collision/Maps/MapTree.cpp
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
* Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
*
* This program is free software; you can redistribute it and/or modify it
src/common/Collision/Maps/MapTree.h
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
* Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
*
* This program is free software; you can redistribute it and/or modify it
src/common/Collision/Maps/TileAssembler.cpp
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
* Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
*
* This program is free software; you can redistribute it and/or modify it
src/common/Collision/Maps/TileAssembler.h
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
* Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
*
* This program is free software; you can redistribute it and/or modify it
src/common/Collision/Models/GameObjectModel.cpp
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
* Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
*
* This program is free software; you can redistribute it and/or modify it
src/common/Collision/Models/GameObjectModel.h
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
* Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
*
* This program is free software; you can redistribute it and/or modify it
src/common/Collision/Models/ModelIgnoreFlags.h
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
src/common/Collision/Models/ModelInstance.cpp
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
* Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
*
* This program is free software; you can redistribute it and/or modify it
src/common/Collision/Models/ModelInstance.h
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
* Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
*
* This program is free software; you can redistribute it and/or modify it
src/common/Collision/Models/WorldModel.cpp
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
* Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
*
* This program is free software; you can redistribute it and/or modify it
src/common/Collision/Models/WorldModel.h
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
* Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
*
* This program is free software; you can redistribute it and/or modify it
src/common/Collision/VMapDefinitions.h
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
* Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
*
* This program is free software; you can redistribute it and/or modify it
src/common/Collision/VMapTools.h
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
* Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
*
* This program is free software; you can redistribute it and/or modify it
src/common/Common.cpp
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
* Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
*
* This program is free software; you can redistribute it and/or modify it
src/common/Common.h
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
* Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
*
* This program is free software; you can redistribute it and/or modify it
src/common/CompilerDefs.h
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
* Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
*
* This program is free software; you can redistribute it and/or modify it
src/common/Configuration/BuiltInConfig.cpp
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
src/common/Configuration/BuiltInConfig.h
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
src/common/Configuration/Config.cpp
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
* Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
*
* This program is free software; you can redistribute it and/or modify it
src/common/Configuration/Config.h
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
* Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
*
* This program is free software; you can redistribute it and/or modify it
src/common/Cryptography/ARC4.cpp
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
* Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
*
* This program is free software; you can redistribute it and/or modify it
src/common/Cryptography/ARC4.h
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
* Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
*
* This program is free software; you can redistribute it and/or modify it
src/common/Cryptography/Authentication/PacketCrypt.cpp
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
src/common/Cryptography/Authentication/PacketCrypt.h
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
src/common/Cryptography/Authentication/WorldPacketCrypt.cpp
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
* Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
*
* This program is free software; you can redistribute it and/or modify it
src/common/Cryptography/Authentication/WorldPacketCrypt.h
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
* Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
*
* This program is free software; you can redistribute it and/or modify it
src/common/Cryptography/BigNumber.cpp
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
* Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
*
* This program is free software; you can redistribute it and/or modify it
src/common/Cryptography/BigNumber.h
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
* Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
*
* This program is free software; you can redistribute it and/or modify it
src/common/Cryptography/HmacHash.cpp
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
* Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
*
* This program is free software; you can redistribute it and/or modify it
src/common/Cryptography/HmacHash.h
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
* Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
*
* This program is free software; you can redistribute it and/or modify it
src/common/Cryptography/OpenSSLCrypto.cpp
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
src/common/Cryptography/OpenSSLCrypto.h
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
src/common/Cryptography/SHA1.cpp
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
* Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
*
* This program is free software; you can redistribute it and/or modify it
src/common/Cryptography/SHA1.h
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
* Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
*
* This program is free software; you can redistribute it and/or modify it
src/common/Cryptography/SHA256.cpp
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
Loaded 100 of 1535 files, more files were not shown because too many files have changed in this diff. Show more