Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-17 08:00:48 +01:00
Code Issues Packages Projects Releases Wiki Activity
30,260 Commits 4 Branches 146 Tags
dd3dd5991d94de67fcb8fae36e857ce0fe045791
Commit Graph

30260 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vincent-michael
dd3dd5991d DB/Areatrigger: Updated areatrigger_template data for 7.1.0 2017-02-19 16:05:23 +01:00
ariel-
b1b150a419 Core/Transport: do not relocate players on board of vehicles when near teleporting. Vehicle should take care of that 
(cherry picked from commit 7470bf6b97)
 2017-02-19 15:34:57 +01:00
ariel-
b239afb0ef Core/Misc: calculate rotation fields from orientation in some places it's impossible to get: 
- SmartScripts: SMART_ACTION_SUMMON_GO
- Spell Effects:
  * SPELL_EFFECT_DUEL
  * SPELL_EFFECT_SUMMON_OBJECT_WILD
  * SPELL_EFFECT_SUMMON_OBJECT_SLOT1
  * SPELL_EFFECT_SUMMON_OBJECT_SLOT2
  * SPELL_EFFECT_SUMMON_OBJECT_SLOT3
  * SPELL_EFFECT_SUMMON_OBJECT_SLOT4
- Command Scripts: .gobject add

Closes #17891

(cherry picked from commit 14445d2202)
 2017-02-19 15:34:57 +01:00
treeston
dd0df772df Scripts/Events: Globally fix all ExecuteEvent loops to check UNIT_STATE_CASTING after each iteration, instead of just checking it once initially. 
Fixes and closes #17892.

(cherry picked from commit ac62d7156f)

Drycoding is bad, mmkay?
(cherry picked from commit ed83a35fbe)
 2017-02-19 15:09:02 +01:00
treeston
5654fb9343 Merge branch '3.3.5-goshdangitsmartai' into 3.3.5 (PR #17738) 
(cherry picked from commit e9eacae7b2)

Core/SmartScripts: Add missing break, 5f43e7b follow-up.
(cherry picked from commit a4623efaa6)
 2017-02-19 15:07:42 +01:00
r00ty-tc
8a71e4255e [Core/Maps] Activate creatures and objects during opening cinematics and other flyby cameras (sunwell etc). 
Requires re-running map extractor to extract camera m2 files from data
files. These are very small.
 2017-02-19 14:47:20 +01:00
Gacko
438d090c8d Fix non-PCH build. 
What else?
 2017-02-19 14:36:21 +01:00
Shauren
5dbe9e7890 Core/Creatures: Implemented all creature equipment modifiers 
* It is now possible to give creatures a mythic/heroic weapon

Closes #19160
 2017-02-19 10:58:08 +01:00
vincent-michael
7b5bbf2c35 DB/Quests: Updated quest_template data for 7.1.5 part 4 2017-02-19 03:05:29 +01:00
vincent-michael
050f95043a DB/Areatrigger: Fix typo in 21006f82ef 2017-02-19 02:32:05 +01:00
vincent-michael
21006f82ef DB/Areatrigger: Updated areatrigger_template data for 7.0.3 2017-02-19 01:18:17 +01:00
Shauren
8db72348ee Build fix 2017-02-19 00:59:43 +01:00
Shauren
5e437f5d3d Core/Movement: Implement SpellEffectExtraData curve modifiers 2017-02-18 21:55:28 +01:00
ariel-
255dd29562 Core/Spell: no need to bloat existing parameter lists. (f81754a306 follow up) 
(cherry picked from commit 4829cca9fb)

Note to self: drycoding is bad
(cherry picked from commit 7e8a08c351)

Another build fix.

(it was probably better to just revert the commit instead)
(cherry picked from commit be8d113699)
 2017-02-18 18:07:07 +01:00
ariel-
ced908d835 DB: Add missing racial mounts to faction change 
(cherry picked from commit 54c6fdba3f)
 2017-02-18 18:05:46 +01:00
ariel-
33ce2a8c82 DB/Creature: Hardened Steel Skycaller 
Fix correct spell, was 52775 Summon Escort
(cherry picked from commit c4cb2d4e35)
 2017-02-18 18:03:19 +01:00
treeston
cb5ec8fccf DB/Creature: Make Coldarra Spellweavers cast Arcane Missiles (channel) instead of Arcane Missile (triggered spell). 
(cherry picked from commit 69d871fc53)
 2017-02-18 18:02:29 +01:00
treeston
b47b9a2913 DB/Creature: More fixes for that poor Cabal Abjurist! Plus bonus content for Bleeding Hollow Darkcaster. 
I feel like a DB dev now.

(cherry picked from commit f5cbc17387)
 2017-02-18 18:01:40 +01:00
treeston
39a7a71494 DB/Creature: Fix Cabal Abjurist SAI 
(cherry picked from commit 5f43e7b964)
 2017-02-18 18:00:37 +01:00
ariel-
163f5b02af Core/Spell: Workaround cobra strikes into a charged aura instead of stacked. 
Fixes #754

(cherry picked from commit 65d0a9478d)
 2017-02-18 17:59:17 +01:00
ariel-
7a971d7ed2 Core/Spells: register SPELLMOD_CRITICAL_CHANCE in casting spell modifiers. 
(cherry picked from commit f81754a306)
 2017-02-18 17:57:55 +01:00
ariel-
13562184e3 Core/Spells: Remove spellmods from SpellMod owner instead of caster (needed so pet casts properly remove aura charges) 
(cherry picked from commit 3aa145cbe1)
 2017-02-18 17:57:38 +01:00
ariel-
c71a04d0f0 Core/Spells: fix Bullheaded immunities 
Closes #421

(cherry picked from commit 11f6801a5c)
 2017-02-18 17:57:08 +01:00
treeston
7b3b333dd5 Core/Position: Allow implicit casting to G3D::Vector. Also, add a utility overload to MotionMaster. 
(cherry picked from commit 9f15482b84)
 2017-02-18 17:55:40 +01:00
treeston
ebbcd601b9 DB/Creature: Fix random inhabittype that was making an Outland world elite permanently rooted. 
(cherry picked from commit b7112d0fbe)
 2017-02-18 17:55:05 +01:00
treeston
52f400226e Replace a leftover const char* with a std::string const&. 
(cherry picked from commit c0de28b045)
 2017-02-18 17:54:11 +01:00
Trond B Krokli
02757118f2 Core/Scripts/DB: remove hardcoded text from npc_beaten_corpse (#16907) 
- remove hardcoded text from script npc_beaten_corpse
- remove OnGossipHello() hook, gossip text moved to DB
- use sGossipSelect() hook instead of OnGossipSelect()
- add npc_text 3557 and 3558 as text_id to gossip_menu
- add gossip_menu_option 2871 to NPC 10668 Beaten Corpse
- add condition for gossip_menu_option 2871 in Quest ID 4921

Tested on 4 different characters/classes, male & female.
Thanks to joschiwald for the sGossipSelect() script change.
(cherry picked from commit d82534a7bb)
 2017-02-18 17:53:48 +01:00
treeston
bbbf8df8e5 Entities/Gossip: The Big One™ that gets rid of all uses of The Bad™ and The Ugly™, e.g. gossip preprocessor macros, and replaces them with the new-and-shiny gossip functions. 
(cherry picked from commit d55426f5b4)
 2017-02-18 17:50:00 +01:00
treeston
f94dc007ae Fix dynamic build. 
(cherry picked from commit 54f923fdee)
 2017-02-18 17:30:23 +01:00
tkrokli
a714fe98f6 Core/Scripts: remove forgotten #define in boss_kalecgos.cpp 
This #define was originally supposed to be removed in my PR #17832,
but for some reason it remained undeleted. This commit corrects it.

Also aligned all the enum values to the same column for readability,
based on a common multiple of 4 spaces.

(cherry picked from commit 068656af06)
 2017-02-18 17:29:54 +01:00
Gustavo
cc39c11d7f Whitespace clean-up 
(cherry picked from commit 6ee35734e4)
 2017-02-18 17:25:36 +01:00
Gustavo
c4f2012ef5 Core/Spells Make credit for quests "The Grand Melee" and "Among the Champions" a triggered cast (#17870) 
Fix a problem where the credit wasn't casted due to CGD
(cherry picked from commit e1761a24ce)
 2017-02-18 17:23:20 +01:00
treeston
a0d48b92d5 Creature/Gossip: offer replacement functions for the existing preprocessor gossip macros 
(cherry picked from commit 175db157f7)

You saw nothing (build fix).
(cherry picked from commit 72a7f4b507)

Build fix. Again. Oops.
(cherry picked from commit 61eb70fd82)

....right, I actually went through a full rebuild now just to make sure it works.
(cherry picked from commit 8531f012a2)

Last one. For real. Please. (Build fix #5).
(cherry picked from commit a32536d490)
 2017-02-18 17:22:53 +01:00
Dr-J
00fed3d44f DB/SAI: Ahab Wheathoof 
* NPC should turn towards invoker and stay facing for a short duration before turning back towards pillar when says line asking about his dog.
* Npc should only have fork equipped when he turns towards player at all other times has hammer equipped
* Added script for when periodically hammers the notice pillar
(cherry picked from commit 2b992d4cb0)
 2017-02-18 17:22:25 +01:00
jackpoz
3cd6e1dd82 Core/Loot: Fix group loot if player loot recipient disconnects 
Fixes #13300

(cherry picked from commit 38f8a03781)
 2017-02-18 17:21:00 +01:00
ariel-
d4a2a725e4 Update SpellEffects.cpp 
(cherry picked from commit 5b81f55141)
 2017-02-18 17:20:42 +01:00
ariel-
27208252ee Core/Spell: Calculate GO rotation for SPELL_EFFECT_TRANS_DOOR 
(cherry picked from commit f5a0342913)

# Conflicts:
#	src/server/game/Spells/SpellEffects.cpp
 2017-02-18 17:19:40 +01:00
ariel-
8a3f053a2f Core/GameObject: save spawn GOState and reset to it instead of toggling from whatever current state we have 
Prevents exploit of SMART_ACTION_ACTIVATE_GOBJECT

(cherry picked from commit be3199314a)
 2017-02-18 17:17:18 +01:00
ariel-
54b038fe2f Core/Entities: Added possibility to construct a Position using a G3D::Vector3 
(cherry picked from commit 17917171f3)
 2017-02-18 17:16:11 +01:00
ariel-
b3f993894a Core/Scripts: Professor Putricide oozes, reapply passive proc auras on reset, and register them as PP summons since they're summoned by a trigger. (f183ed3c50 follow-up) 
(cherry picked from commit 27590fbb98)
 2017-02-18 17:16:11 +01:00
treeston
e0b557c858 Entities/Unit: Add overload to NearTeleportTo taking Position const&. 
(cherry picked from commit 211eee0fce)
 2017-02-18 17:16:10 +01:00
treeston
5c01d14056 Entities/Creature: Add arg2 to DespawnOrUnsummon to allow overriding respawn time. This matches changes that will be merged as part of dynamic spawning, allowing scripts to transition early. 
(cherry picked from commit 4bcc8078d7)
 2017-02-18 17:16:10 +01:00
SnapperRy
668abbf18b Core/Unit: do not refresh last damaged timer if hit by SPELL_AURA_DAMAGE_SHIELD. 
Fixes spells like Retribution Aura, Thorns and Damage Shield that were preventing units from evading.

(cherry picked from commit 42a32a3c7c)
 2017-02-18 17:16:10 +01:00
Ryan
e20f44146e Core/Instance: Fix GetInstanceSave sometimes checking the wrong map (#17856) 
(cherry picked from commit 9c504c8a8e)
 2017-02-18 17:16:05 +01:00
ariel-
7f66c730ec Update boss_kelthuzad.cpp 
(cherry picked from commit 7e4abce820)

Core/Scripts: fix math error that would not select points on the entire circle
(cherry picked from commit cd9226e755)
 2017-02-18 16:54:56 +01:00
treeston
77ecafaa42 Entities/GameObject: Expose GO rotation to scripting. 
(cherry picked from commit bdbe3f22e0)
 2017-02-18 16:53:44 +01:00
Dr-J
5aa7e2a133 DB/Quest: The Journey Has Just Begun 
http://www.wowhead.com/quest=7493/the-journey-has-just-begun should become available when either level 60 or 80 version of Onyxias head quest is turned not only the level 60 version
(cherry picked from commit 01e5a5b4e7)
 2017-02-18 16:53:29 +01:00
Dr-J
2a105e5c9f DB/Loot: Summoned Zombie 
Remove all loot from summoned zombie http://www.wowhead.com/npc=10698/summoned-zombie as these npcs where rather generous on TC as they are meant to drop no loot.
(cherry picked from commit 0a4b4dec09)
 2017-02-18 16:52:34 +01:00
SnapperRy
565e2555b9 DB/SAI: remove wrong dynamicflag from creature Proto-Drake Egg 
Made the tooltip appear as if a Hunter used Beast Lore on them
(cherry picked from commit 59f340b751)
 2017-02-18 16:51:22 +01:00
Gustavo
accbb587b8 Core/Scripts Boss Skadi the Ruthless rework 
(cherry picked from commit 40114cacd3)

Rename 2016_99_99_00_world.sql to 2016_08_25_06_world.sql
(cherry picked from commit 738e3cf002)

travis is lazy
(cherry picked from commit 92876278fe)
 2017-02-18 16:44:24 +01:00