Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 17:27:36 +01:00
Code Issues Packages Projects Releases Wiki Activity
29,731 Commits 4 Branches 146 Tags
fe48d697fb8dc7a32ecc147dbe35cb71a68d40b5
Commit Graph

29731 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aokromes
fe48d697fb DB/Creature: Apothecary Surlis 
By Malcrom
 2017-01-10 05:04:00 +01:00
Aokromes
72dd954a3e DB/Creature: More Hinterlands fixes 
By Malcrom
 2017-01-10 04:27:11 +01:00
joschiwald
e9af56c4a4 Fixed warning 2017-01-10 03:13:13 +01:00
Aokromes
05ccc08533 DB/Spells: fix Searing Wrath's chain jump targeting 
Ny SnapperRy closes #17216 closes #6671
(cherry picked from commit a5bd790f0f)
 2017-01-09 22:04:45 +01:00
Aokromes
5b204ffe7b DB/Quest: ExclusiveGroup for breadcrumb quests in Mudsprocket, Dustwallow Marsh 
By SnapperRy, closes #17217
(cherry picked from commit ae6b3ebb2c)
 2017-01-09 21:58:40 +01:00
DDuarte
0c511397a4 Revert "Merge pull request #16433 from Tonghost/3.3.5" 
This reverts commit e3d52990dd, reversing
changes made to 6d8e39f59c.

Opens #16759

(cherry picked from commit 5aae01986f)
 2017-01-09 21:50:49 +01:00
Dr-J
7c42e426b2 DB/Quest: Thwart the Dark Conclave 
Closes #11791
(cherry picked from commit 80fc9cce81)
 2017-01-09 21:49:14 +01:00
SnapperRy
6444bb9a14 Core/Quests: Remove wrong call to SendQuestComplete(). (#17200) 
(cherry picked from commit 9480a210f2)
 2017-01-09 21:40:06 +01:00
sirikfoll
04ff2e195f Core/Achievement A-bomb-inable and A-bomb-ination 
(cherry picked from commit e016bf8d06)

DB: SQL rename
(cherry picked from commit 71081c2576)
 2017-01-09 21:36:03 +01:00
sirikfoll
31e08b9722 Core/Unit Do not allow addition of threat to units in evade mode 
(cherry picked from commit 7d769006aa)
 2017-01-09 21:33:32 +01:00
Kittnz
f22776f439 DB/Creature: Add missing aura for Snorts 
by Kodekc
Closes #17194

(cherry picked from commit bd13475697)
 2017-01-09 21:31:46 +01:00
Shauren
dad19df69d Core/Units: Renamed and documented UNIT_FLAG_DISABLE_MOVE to prevent people from trying to use this flag to root a creature leaving them wondering why it doesn't do anything 
(cherry picked from commit b36da77185)

Core/Scripts: build fix

(cherry picked from commit 258368a2bd)
 2017-01-09 21:16:36 +01:00
Shocker
0cddecf2d4 Merge pull request #17138 from ForesterDev/creature_family 
Core/Misc: Define CREATURE_FAMILY_NONE to avoid magic numbers in code
(cherry picked from commit 62635f07d0)
 2017-01-09 20:52:48 +01:00
Shauren
5d4569a11b SQL: Fix import 2017-01-09 18:56:14 +01:00
Aokromes
490c2c8db0 DB/Creature: Pathing Hinterlands 
By Malcrom
 2017-01-09 15:18:38 +01:00
Aokromes
43ed4ff53a DB/Gameobject: Spawn Rite of the Winds spellfocus 
Updates #18262
 2017-01-09 14:35:14 +01:00
Kittnz
56797f1da5 DB/Creature: Mebok Mizzyrix SAI 
by tkrokli
Closes #17179

(cherry picked from commit 4ebed6e586)
 2017-01-09 03:23:19 +01:00
Kittnz
63bcae75a3 DB/Creature: Add missing Ornery Plainstrider SAI 
by Kodekc
Closes #17146

(cherry picked from commit c461e21e20)
 2017-01-09 03:21:29 +01:00
Kittnz
12298a500c DB/Creature: Add flag guard Deathguard Elite 
by Kodekc
Closes #17147

(cherry picked from commit 4f7911465b)
 2017-01-09 03:20:09 +01:00
Kittnz
571fbbdecf DB/Creature: Pathing for Houndmaster Grebmar 
by Kodekc

(cherry picked from commit 9e797e48ea)
 2017-01-09 03:18:34 +01:00
joschiwald
e8430af7b1 Sorry, it's too late... 2017-01-09 03:16:37 +01:00
Kittnz
fc5ae81997 DB/Creature: Clam Master K Waypoints 
by Saben65

(cherry picked from commit 5536a9632e)
 2017-01-09 03:11:23 +01:00
Shauren
b999d8c5ac Core/Loot: Fixed resaving looted items from containers 
Closes #15299

(cherry picked from commit 4a074ca470)
 2017-01-09 02:10:28 +01:00
Shauren
6393e80129 Core/Spells: Implemented SPELL_ATTR1_DISMISS_PET 
Closes #7372

(cherry picked from commit 9246189b98)
 2017-01-09 02:10:08 +01:00
Golrag
e9e3daa30c Core/Object: Use object edges to calculate LoS 
(cherry picked from commit da6065db00)
 2017-01-09 02:07:42 +01:00
ForesterDev
5c2705fadc Core: updated creature type flags enum (#17128) 
Core/Misc: Update CreatureTypeFlags enum according to TrinityCoreWiki
(cherry picked from commit fb0881398a)

# Conflicts:
#	src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp
#	src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp
#	src/server/game/AI/SmartScripts/SmartAI.cpp
#	src/server/game/Entities/Unit/Unit.cpp
#	src/server/game/Miscellaneous/SharedDefines.h
 2017-01-09 02:00:17 +01:00
Aokromes
a31f79d7de DB/Creature: Cabal Ritualists don't cast Crystal Channel 
By Saben65, closes #16986
(cherry picked from commit b0f9a998e1)
 2017-01-09 02:00:16 +01:00
treeston
dfaf4542e6 Conditions/ConditionMgr: Add a comment so MitchesD can go away. 
(cherry picked from commit 759aae56ad)
 2017-01-09 02:00:10 +01:00
clintskie
84166c385b DB/trainers: Engineering trainers & spells 
By clintskie

Updates #14682
 2017-01-09 01:35:29 +01:00
Kittnz
6dd6bbcbb6 DB/Object: Add missing object spawns in Ghostlands & Eversong Woods 
Bonfire, Cauldron & Campfire

(cherry picked from commit 7427ca5f8e)
 2017-01-09 01:26:42 +01:00
Kittnz
42f73f11d3 DB/Creature: Add missing creature spawns in Ghostlands & Eversong Woods 
Added the following NPC's : Toad, Snake, Frog, Lesser Scourgebat, Greater Spindleweb, Ghostclaw Ravager, Ghostclaw Lynx, Vampiric Mistbat, Whitetail Frenzy, Yellowgill Frenzy, Rabbit, Feral Dragonhawk Hatchling, Springpaw Stalker, Crazed Dragonhawk, Ghostlands Guardian, Spider

(cherry picked from commit 7c8c3b96fe)
 2017-01-09 01:26:41 +01:00
Shauren
8045907c14 Core/Chat: Don't check item suffix name when validating item links when the item has ITEM_FLAG3_HIDE_NAME_SUFFIX 2017-01-08 23:28:00 +01:00
Shauren
4799e5841d Core/Auras: Fixed cooldowns for procs calling PreventDefaultAction() in aura proc script 
* This also fixes proc cooldows unneccessarily being sent to client
* Also removes the need for cooldown hacks when the proc trigger is selected randomly like for Deathbringer's Will

(cherry picked from commit 1e1fcd6847)
 2017-01-08 23:24:51 +01:00
mik1893
5a93f2b974 Core/Spells: Proc handler script converions (#17122) 
* Blazing Speed (Mage)
* Blessed Recovery (Priest)
* Druid Forms Trinket
* Idol Of Mutilation
* Nature's Guardian (Shaman)
* Nether Protection (Warlock)
* Piercing Shots and Bonus 4P T9 Hunter
* Lightning Shield (Shaman)
* Acclimation (DK)
* Move DK T10 4P Melee Bonus
* Move DK Improved Blood Presence triggered heal (DK)
* Rogue T10 2P Bonus
* Illumination (Paladin)
* Soul Preserver
* Death Choice trinket
* stack trinket scripts (ToC25 Caster Trinket, Lightning Capacitor, Thunder Capacitor)
* Battle Experience (ICC - Gunship)
* Blood Reserve (enchant proc)
* Darkmoon Card Greatness
* Charm of the Amani Witch Doctor
* Mana Drain

(cherry picked from commit 5b8e68ee63)
 2017-01-08 22:37:18 +01:00
Alan Deutscher
1c60553df0 Core/Spells Make certain spells (e.g. Mind Control) properly flag the caster for PvP (#17145) 
* This issue was caused by PvP-flagging being done calculated after the target's flag was turned off by becoming a pet.

(cherry picked from commit e7a12edb83)
 2017-01-08 19:41:37 +01:00
vincent-michael
a2ee7e16ec Core/Quests: Fixed issue reported by static analysis 
Coverity defect ID: 1355241

(cherry picked from commit a01fd52267)
 2017-01-08 19:35:02 +01:00
mik1893
4c60bbea0e Core/Unit: Pet shouldn't be notified for DOT damage on the owner (#17133) 
- Fix by @MrSmite
- Closes #16894
(cherry picked from commit 4de1426d08)
 2017-01-08 19:32:51 +01:00
treeston
ae11329e71 Add a LOG_WARN when attempting to summon a non-existing summon group. 
(cherry picked from commit 4d4d2f5665)

Seriously, who doesn't support std::string instead of char* in 2016?
(cherry picked from commit a012b37d66)
 2017-01-08 18:12:33 +01:00
Nawuko
955bfae5ef Core/Movement: Fix issues where creatures cancel spell casts chasing target and Implement SPELL_ATTR5_CAN_CHANNEL_WHEN_MOVING 
(cherry picked from commit bf2cee8cce)
 2017-01-08 18:06:43 +01:00
treeston
86aa3997e4 Allow BossAI::_DespawnAtEvade to work on creatures other than the boss itself (optional argument). 
(cherry picked from commit 6040e30fa3)
 2017-01-08 17:31:42 +01:00
treeston
bef9683a30 Core/Scripts: Added reasonable default params to GetCreatureListWithEntryInGrid/GetGameObjectListWithEntryInGrid for ease of use. Also, entry = 0 means no filter now, since we lacked an easy way to get a list of all creatures in grid. 
(cherry picked from commit 0d5adf356e)
 2017-01-08 16:56:21 +01:00
Aokromes
473efd5f35 Rename 2017_01_08_00_world.sql to 2017_01_08_04_world.sql 2017-01-08 06:59:51 +01:00
Aokromes
b38f28d67a DB/Gameobject: Add 2 missing spawns 
By Girib Dragos
 2017-01-08 06:59:25 +01:00
treeston
233c3a3845 Core/AI: Add DoCastSelf helper. 
(I have no idea why I never bothered to do this before, really. It had crossed my mind a few times.)

(cherry picked from commit ab0abdbde5)

This discussion is more effort than it takes to change it.
(cherry picked from commit b52a6b8570)
 2017-01-08 03:06:39 +01:00
treeston
416afdfec5 Creature/CreatureAI: 
- Default range for DoZoneInCombat: 50.0f -> 250.0f.
- Add optional second arg to SummonList::DoZoneInCombat to specify range.
- Also a bunch of random NULL -> nullptr cleanup.

(cherry picked from commit b7f2c87d37)

Too many damn stars in that damn argument list.
(cherry picked from commit afbda04767)
 2017-01-08 03:01:51 +01:00
Shauren
182c390ae7 Core/Auras: Renamed fields of SpellProcEntry structure and change types to more appropriate ones 
(cherry picked from commit ef7df65256)

Build fix
(cherry picked from commit c03e7ecd05)

SQL fix
(cherry picked from commit 7a41467cf7)
 2017-01-08 02:42:07 +01:00
Sirikfoll
5993f91630 Script/SWP Full Rework on M'uru Encounter 
(cherry picked from commit 6002acf376)

Another sql fix
(cherry picked from commit 204acbb5b7)
 2017-01-08 02:21:10 +01:00
asterc
882106d169 Core/Battleground Script for Isle of Conquest Bosses 
by @gerripeach
(cherry picked from commit c1ed002b4b)

SQL file name fix
(cherry picked from commit 74f3a84a01)
 2017-01-08 02:10:37 +01:00
sirikfoll
037e9053d3 Implement Quest Riding the Red Rocket 
(cherry picked from commit 20b3feb559)

Fix SQL name
(cherry picked from commit 2329648cad)
 2017-01-08 01:33:48 +01:00
Elimination
48b74f0f6a Core/Spells: Fix wrong totem placement 
(cherry picked from commit 37b2f590b6)
 2017-01-08 00:54:08 +01:00