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

24854 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
pete318
fe2a0fda44 Prevent duplicate spawns for same spawn ID 
If there is an alive instance of the creature upon creature spawn, skip
spawn entirely. If there are only dead instances, despawn them. A new dead
corpse in the creatures home position will be respawned.

Closes: #16462
 2016-02-03 19:27:36 +01:00
Shauren
4611125339 Merge pull request #16465 from Keader/rapture 
Core/Spells: Fixed cooldown check for Rapture (Priest) talent
 2016-02-03 15:57:11 +01:00
Keader
7093c0c769 Fix cooldown check talent Rapture (Priest) 2016-02-03 10:43:57 -03:00
treeston
bf31f26e8c fix crash 2016-02-03 11:15:09 +01:00
Treeston
d5868a7db3 Merge pull request #16345 from Trisjdc/creature_flag_reset_on_respawn 
Core/Creatures: Reset unit flags/dynamic flags on Creature::SetDeathState(JUST_RESPAWNED)
 2016-02-02 20:36:39 +01:00
treeston
9d932e7f0c Merge remote-tracking branch 'tkrokli/npc_disciple_of_naralex' into 3.3.5-base (PR #16437) 2016-02-02 18:15:00 +01:00
treeston
bac463c481 Merge branch '3.3.5-noplayerdamagereq' into 3.3.5-base (PR #16257) 2016-02-02 18:10:18 +01:00
Duarte Duarte
60f8751c64 Merge pull request #16451 from tkrokli/uldaman_at_map_chamber 
Core/Scripts/Uldaman: change hardcoded text to enum
 2016-02-01 21:52:03 +00:00
tkrokli
627ec0e35e Core/Scripts/Uldaman: change hardcoded text to enum 
Change #define to enum {with brackets}

Possibly the smallest change so far in this series of core script changes.
 2016-02-01 22:07:47 +01:00
tkrokli
bc03fedf6d Core/Scripts/DB: remove hardcoded text from 'npc_disciple_of_naralex' 
- moved 2 #define text lines to enum, already in npc_text
- new gossip_menu_option for NPC 3678 Disciple of Naralex
- using `ADD_GOSSIP_ITEM_DB` instead of `ADD_GOSSIP_ITEM`

Tested on both alliance and horde characters, works just like before.
 2016-02-01 02:31:19 +01:00
Aokromes
20a8476cd8 Rename sql/world/2016_01_30_05_world.sql to sql/updates/world/2016_01_30_05_world.sql 
Now yes...
 2016-01-31 20:47:44 +01:00
Aokromes
7c9f0f2056 Rename sql/2016_01_30_05_world.sql to sql/world/2016_01_30_05_world.sql 2016-01-31 19:30:47 +01:00
treeston
bba182428d DB/ModelInfo: Fix the hitbox on Cyanigosa's dragon form. 2016-01-31 15:51:26 +01:00
treeston
815f43be7a Scripts/UtgardeKeep: Bonus Ingvar the Plunderer fixes to reset behavior. There should no longer be weirdness if a reset happens during the RP phase. 2016-01-31 15:14:01 +01:00
treeston
c829fc7de4 Scripts/UtgardeKeep: Ingvar updates: 
- Roar at start of phase two
- Ingvar no longer does a weird move-jump towards his target when resurrecting
- Fixed a duplicate yell on phase one end
 2016-01-31 14:27:18 +01:00
Dr-J
406584839c DB/SAI: Overthane Balargarde 
A couple of updates to previous commit a258e36039

Closes #4841
 2016-01-30 15:22:53 +00:00
Kittnz
771dfe243d DB/Creature: fix Mine Car visible state 
- Still need some SAI fixing when it resets so it continues the path
 2016-01-30 15:31:31 +01:00
Kittnz
ecdeb5cb9c DB/Creature: Bloodmyst Isle 
- Add Pathing and SAI for Bloodcursed Naga
- Add Pathing for Lord Xiz
 2016-01-30 15:30:00 +01:00
Killyana
789470ccf1 Spell/Script: Safirdrang's Chill 
Updates #4841
 2016-01-30 15:20:14 +01:00
Dr-J
a258e36039 DB/Quest: Banshee's Revenge 
Script http://www.wowhead.com/quest=13142/banshees-revenge

Only spell issue remains see original issue https://github.com/TrinityCore/TrinityCore/issues/4841
 2016-01-30 10:59:19 +00:00
Killyana
e249db9777 DB/Object: Add 2 missing traps on Icc 2016-01-30 04:23:03 +01:00
treeston
f0b9ee157b Fix warning. 2016-01-30 00:48:47 +01:00
treeston
d795bd8040 Merge remote-tracking branch 'tkrokli/npc_parqual_fintallas' into 3.3.5-base (PR #16384) 2016-01-30 00:31:38 +01:00
jackpoz
d75469e31f Scripts/Deadmines: Fix issues reported by static analysis 
Fix Coverity issue id 1022474
 2016-01-30 00:13:22 +01:00
tkrokli
7a101bcf00 [3.3.5] Core/Scripts/DB: move core script 'npc_parqual_fintallas' to SAI 
Additional change: menu options are changed from containing only names
to include the text " is my answer.", based on the lines in `broadcast_text`.

- replaced core text with DB SAI script
- created DB creature_text entries for Parqual Fintallas
- created DB gossip_menu_option entries for the NPC
- implemented NPC say lines in reply to all the answers
- added conditions for which gossip should show, depending on quest status
- added conditions to avoid exploits in the time it takes for NPC to say his texts

This PR is tested several times on a horde character (horde-only quest).
It now works as originally intended, with option-specific NPC replies.
 2016-01-29 23:26:08 +01:00
Shauren
cb8f64cb63 Merge pull request #16417 from Keader/kinetic 
Core/Scripts Fix Kinetic Bomb stuck after knockback effect
 2016-01-29 08:47:12 +01:00
Keader
36648d1079 Fix Kinetic Bomb stuck after knockback effect. 2016-01-28 17:20:41 -03:00
Treeston
942403be0c Merge pull request #16314 from Treeston/3.3.5-fixgroupcredit 
Player/Quest: Fix GO group credit
 2016-01-28 13:39:29 +01:00
Treeston
af62cf5939 Merge pull request #15033 from tkrokli/absorb_ignoring_damage 
Unit/CalcAbsorbResist: Sanctified Wrath should pierce absorb effects
 2016-01-28 13:32:53 +01:00
treeston
dbf9f58351 Merge remote-tracking branch 'ariel-/soothsaying_for_dummies' into 3.3.5-base (PR #16152) 2016-01-28 13:21:03 +01:00
treeston
81baffec80 Merge remote-tracking branch 'tkrokli/npcs_dithers_and_arbington' into 3.3.5-base (PR #16276) 2016-01-28 12:39:51 +01:00
Treeston
7e42503244 Merge pull request #16264 from Treeston/3.3.5-noffalooter 
Looting/Group: Do not display looter in tooltip when FFA loot is enabled
 2016-01-28 11:45:17 +01:00
ariel-
8baa447ed0 Implemented Book "Soothsaying for dummies", change of engineering/leatherworking specs possible! 2016-01-26 21:38:24 -03:00
Francesco Borzì
d0e4f281a3 Merge pull request #16287 from GigaDev90/fix_bug_duel_abuse 
Core/Script: fix bug that prevent double spending reset cooldown
 2016-01-26 20:58:09 +01:00
Dr-J
06cc8974a0 DB/Creature: Blightblood Troll 
Update so these are passive until skeptor of suggestion used on unit.
 2016-01-26 17:37:59 +00:00
DDuarte
7a252fc648 Core/SAI: Typo fix of 77087db793 
There's no %b, silly
 2016-01-26 03:43:15 +00:00
DDuarte
77087db793 Core/SAI: Code improvements to SMART_ACTION_RANDOM_SOUND 
Warning fixes and extra sanity checks

Ref #16376
 2016-01-26 03:37:07 +00:00
Lopfest
e4af2baa7e Core/SAI: added SMART_ACTION_RANDOM_SOUND 
Closes #16376
 2016-01-26 03:26:41 +00:00
Killyana
e6a7818a9a DB/Event: Add missing Commoner for Winter Winter Veil 
Update  #16129
 2016-01-24 16:47:39 +01:00
Trisjdc
132be2d25a Core/Creatures: Reset unit flags/dynamic flags on Creature::SetDeathState(JUST_RESPAWNED) 2016-01-24 01:11:19 +00:00
MitchesD
cb8faad211 Merge pull request #16327 from Exodius/BWL-door 
Core/Scripts: Change door ID and name in Blackwing Lair
 2016-01-23 23:43:05 +01:00
jackpoz
0e76d67e49 Scripts/Misc: Fix issues reported by static analysis 2016-01-23 17:42:37 +01:00
treeston
d240ccb38c DB/Creature: Add a new extra_flag CREATURE_FLAG_EXTRA_NO_PLAYER_DAMAGE_REQ (0x00200000) that awards players credit for killing the creature even if less than 50% of damage was dealt by players. 
This can be used to fix quests such as "Heated Battle" or "If Valgarde Falls..." that are currently very hard to complete at the appropriate level due to "friendly" NPCs killing off the required targets too quickly for players to get 50% of damage in.
 2016-01-23 16:41:25 +01:00
treeston
f5bd7b903c Coverity fix for CID 1349782. 2016-01-23 13:30:07 +01:00
Kittnz
62216d6781 DB/Path: Blade of Argus in Bloodmyst Isle 2016-01-23 12:36:06 +01:00
Shauren
3f886025a2 Core/Spells: Ignore category cooldowns for triggered spells. 
* This fixes weird issues where triggered spell fails because it has the same category as the spell triggering it

Closes #15794
Closes #15048

(cherry picked from commit 044edced9a)
 2016-01-22 22:14:28 +01:00
Carbenium
1038df8d5b Core/Util: Add a missing include 2016-01-22 20:22:45 +01:00
Aokromes
9d8c90d9ee Rename 2016_01_20_02_world.sql.sql to 2016_01_20_02_world.sql 2016-01-22 06:39:06 +01:00
tkrokli
29c2a42324 Core/Scripts/DB: remove hardcoded text from 'npcs_dithers_and_arbington' 
- created DB gossip_menu_option entries for both NPCs
- added enum section instead of "magic numbers" in script
- replaced core text with pointers to DB text
- zone_western_plaguelands.cpp is now cleaned up
 2016-01-21 15:02:38 +01:00
treeston
cd625a12e2 Player/Quest: Credit group for gameobject activation if they are in proximity. 2016-01-21 00:00:33 +01:00