Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 09:44:45 +01:00
Code Issues Packages Projects Releases Wiki Activity
27,998 Commits 4 Branches 146 Tags
834ce504aeef27aeec5e6344d965166df60f8880
Commit Graph

27998 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent-Michael
834ce504ae Core/Objects: Fix typo in 19cab2c508 
(cherry picked from commit dbe854cd31)

Conflicts:
	src/server/game/Globals/ObjectMgr.h
 2016-01-20 21:10:36 +01:00
Shauren
038138592d Merge pull request #15995 from ShinDarth/mmr 
Core/Arena: more arena configs
(cherry picked from commit 776103cfea)

Conflicts:
	src/server/game/Battlegrounds/ArenaTeam.cpp
 2016-01-20 20:59:40 +01:00
Shauren
a6dd6d7841 Core/Logging: Include more info in bad realm log 2016-01-20 17:19:42 +01:00
Shauren
a36d8d54c5 Warning fix 2016-01-19 20:43:35 +01:00
Shauren
3cd3184394 Core/Quests: Implemented new quest objective types 2016-01-19 20:12:09 +01:00
Shauren
a50b1d0924 Core/Items: Updated item socketing opcodes 2016-01-18 19:52:49 +01:00
MitchesD
34a07db263 DB/Creature: fixed invalid spawnMasks for all creatures 
* fixed +- 1500 startup errors
 2016-01-17 20:52:49 +01:00
Killyana
5fd33ef16c DB/Quest: Master and Servant 
Remove unneeded condition to allow quest item usage in all areas as the item can be used only in few npcs
Closes #16136

(cherry picked from commit f4e2fb8f79)
 2016-01-17 14:17:59 +01:00
Killyana
1552fc93bc DB/Creature: Fix Wretched Captive Orientation 
For all branchs

(cherry picked from commit c812b0dbf5)
 2016-01-17 14:16:02 +01:00
Killyana
3294071c79 DB/Creature: Add missing spawns 
(cherry picked from commit 082eeda7fe)
 2016-01-17 14:06:08 +01:00
Killyana
a56f92e889 Script/Creature: Imprisoned Beryl Sorcerer 
Add missing emote state
Move the credit quest on the 5th hit instead of the 7th one

(cherry picked from commit 13e509a622)
 2016-01-17 14:04:51 +01:00
Killyana
e16f695453 DB/Creature: Franclorn Forgewright 
Make the npc visible only for dead players
Remove the SAI and move the aura to Creature addon

(cherry picked from commit 1c877ecbd2)
 2016-01-17 14:04:01 +01:00
Killyana
d7bfacbd65 DB/Quest: An Undead's Best Friend 
Add a sleep effect on Hungering Plaguehound once they are fed to avoid spamming the credit
Fix the Ethereal aura being removed and not set after evade for Eidolon Watcher
Fix Assassinate Restless Lookout, it will only be used on Restless lookout
Closes #16054

(cherry picked from commit bc6c380e7d)
 2016-01-17 14:03:27 +01:00
Killyana
4f2e6d7fd7 DB/Quest: The Stories Dead Men Tell 
By @Rushor
Closes #16055

(cherry picked from commit 91c1de2f43)
 2016-01-17 14:02:53 +01:00
Killyana
7d2cfa2f21 DB/Creature: Remove wrong spawns for Commoners and link some other to Winter Veil 
Closes #16068

(cherry picked from commit 394e0db657)
 2016-01-17 14:02:22 +01:00
Killyana
4da0a6f8e3 DB/Quest: Add missing text for Horns of Nez'ra 
By @tkrokli
Closes #16078

(cherry picked from commit 99f31a2202)
 2016-01-17 14:00:59 +01:00
Killyana
6aa8ab86a8 DB/SAI: Ethereal Spellfilcher and Ethereal Thief 
Closes #16094

(cherry picked from commit 571578dce5)
 2016-01-17 14:00:15 +01:00
Killyana
4aa1982295 DB/Creature: Fix Crystal Spike react state on Ormorok the Tree-Shaper encounter 
Closes #16097

(cherry picked from commit 70308e3c33)
 2016-01-17 13:59:37 +01:00
Killyana
6e4948a498 Creature/script: William Kielar 
Fix Gossips used for taxi
Closes #16112

(cherry picked from commit 79c9af11b9)
 2016-01-17 13:58:15 +01:00
Killyana
d0047283b8 DB/Creature: Fix InhabitType for Ash'ari Crystals 
By @Saben65
Closes #16121

(cherry picked from commit 4292ff0b54)
 2016-01-17 13:58:07 +01:00
Killyana
44e2a7fbc6 DB/Creature: Remove unneeded SAI for Water Terror and move the aura to creature addon 
Closes #16107

(cherry picked from commit 335ec729bd)
 2016-01-17 13:57:37 +01:00
Killyana
5d7cc696b8 DB: Fix spawn position and equipment for Coilfang Engineers 
By @Saben65
Closes #16104

(cherry picked from commit 17b57453c1)
 2016-01-17 13:57:13 +01:00
Killyana
c9f6bea60d DB/Condition: Add condition to sunwell-blade spell to target only Dar'Khan Drathir 
Closes #16122

(cherry picked from commit cb6a7b7fa6)
 2016-01-17 13:56:48 +01:00
Killyana
178a1dd703 DB/Quest: Fix spell target for Leave Our Mark quest item 
Closes #16081

(cherry picked from commit b269c1f1cb)
 2016-01-17 13:56:21 +01:00
Killyana
19c69a273d DB/Creature: Fix Tournament Druid Spell Target visibility 
Closes #16119

(cherry picked from commit bf8a3b1dfe)
 2016-01-17 13:55:55 +01:00
Killyana
ad28b1e10c DB/Object: Add missing Dirt mound spawn 
(cherry picked from commit 812809a977)
 2016-01-17 13:55:30 +01:00
Killyana
031e1b8358 DB/Creature: Forlorn Soul 
Add missing spawns

(cherry picked from commit b13c7f511e)
 2016-01-17 13:54:52 +01:00
Dr-J
c5d4ea006b DB/Conditions: Judgment Day Comes! 
This optional breadcrumb quest should not be takable if player has already started quest chain it leads to.
(cherry picked from commit 315123f873)
 2016-01-17 13:54:11 +01:00
Aokromes
80ffb62c48 DB/String: improved output of .ticket view command 
(cherry picked from commit 179f756866)

# Conflicts:
#	sql/updates/world/2015_12_15_01_world.sql
 2016-01-17 13:14:14 +01:00
Shauren
dfceb3dd19 Core/Spells: Fixed crash in spell effect immunity check 
Closes #16299
 2016-01-17 12:52:58 +01:00
joschiwald
09adf4d0ad Scripts/Spells: fixed Beacon of Light 
# Conflicts:
#	src/server/game/Entities/Unit/Unit.cpp
#	src/server/game/Entities/Unit/Unit.h
#	src/server/scripts/Spells/spell_paladin.cpp
 2016-01-17 01:52:22 +01:00
MitchesD
2940872b16 DB: fix import 2016-01-16 13:30:34 +01:00
Killyana
69dd2d4c44 DB/Creature_text: Fix probability inside a group 
Closes #16093

(cherry picked from commit b5eb675710)
 2016-01-16 13:23:32 +01:00
Kittnz
defcf46f2e DB/Event: Add all remaining Feast of Winter Veil spawns in whole Outland and Dalaran 
(cherry picked from commit 68033fa467)
 2016-01-16 13:21:30 +01:00
treeston
e1fae18417 Spells/Penance: If hostile target is not in front, now fails in the initial cast rather than the triggered cast, thus not erroneously causing a cooldown. 
(cherry picked from commit 403ff21324)
 2016-01-16 13:16:57 +01:00
Killyana
6252980f66 DB/Quest: Quest: The Air Stands Still 
Closes #16032

(cherry picked from commit 0f8743a541)
 2016-01-16 13:15:02 +01:00
Killyana
85c6a8ce55 DB/Creature: Remove a duplicate spawn for Lovely Liddia 
Closes #16036

(cherry picked from commit ba72fd863c)
 2016-01-16 13:14:28 +01:00
Killyana
773791a638 DB/Creature: Add Magic immunity to Mana Feeders 
Closes #16050

(cherry picked from commit c282e9ae35)
 2016-01-16 13:14:01 +01:00
Killyana
b4a144d5d1 DB/SAI: Fix a target typo in a previous commit 
(cherry picked from commit e1bcd10c9b)
 2016-01-16 13:13:31 +01:00
Dr-J
2c09bc682d DB/Misc: Completion script for Delivery to Krenna 
Closes #15982
(cherry picked from commit 3685be2fb6)
 2016-01-16 13:13:07 +01:00
ShinDarth
cb29fa74d8 Core/Quest: code style: 
- Removed 11 useless for iterations (for each quest loaded)

(cherry picked from commit 4a532a71b6)

# Conflicts:
#	src/server/game/Quests/QuestDef.cpp
 2016-01-16 13:05:59 +01:00
Rushor
05f0badd40 DB/Creature: Sulaa Waypointscript 
closes #16009

(cherry picked from commit b013eb1925)
 2016-01-16 12:59:02 +01:00
Golrag
6e832dd92b Scripts/ICC: * Bosses now enter when in aggro range. 
* Removed some of the MoveInLineOfSight calls
* Added more AreaTriggerScripts

(cherry picked from commit ce90e30a80)
 2016-01-16 12:58:22 +01:00
Shauren
6fb8655844 Core/DataStores: Optimized item toy check by using a better container for this 2016-01-16 12:45:15 +01:00
treeston
8d428e4b6b Scripts/Naxxramas: Instructor Razuvious rework: 
- Fix missing yells
- Rearrange existing yells to match live
- Sniffed positions for adds
- Improve add respawn handling
- Make adds not fight the player for control (don't use their spells on their own etc.)
- Update adds' hotbar keys to match live (this will affect other creatures with nonsequential possess keys as well)
- Fix adds' movement when mind controlled, they no longer move automatically when right-clicking (this affects all mind-controlled creatures)
- Blizzlike timers

(cherry picked from commit 54d583b0fb)

# Conflicts:
#	src/server/game/Spells/SpellMgr.cpp
 2016-01-16 12:26:13 +01:00
chaodhib
1bee732e66 Core/Spells: Make players immune to the taunt aura. 
(cherry picked from commit 6d080d0c44)

# Conflicts:
#	src/server/game/Entities/Player/Player.h
 2016-01-16 12:13:56 +01:00
treeston
d3ea8c5750 Scripts/Naxxramas: Maexxna cleanup: 
- Improved Web Wrap target selection
- Added missing text
- Cleanup of web wrap positioning - two players will never be flung to the same position (25-man)
- Further improvement to web wrap spawn behavior - targetable web wrap now only spawns after the player has finished being flung to the respective position (blizzlike)
- Add additional web wrap positions (sniff)

(cherry picked from commit 5dd6163387)

# Conflicts:
#	src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp
 2016-01-15 21:09:46 +01:00
Killyana
f48469496e DB/SAI: Reduce the LOS for snow mounds from 15 to 7 yards 
(cherry picked from commit b6942cd090)
 2016-01-15 20:37:33 +01:00
jackpoz
bb97e888ff Core/Player: Fix crash related to vehicles 
Fix assertion triggered when entering a vehicle while channelling a shared vision spell.
Fix #15953

(cherry picked from commit 2cb54d5606)

# Conflicts:
#	src/server/game/Entities/Player/Player.cpp
 2016-01-15 20:36:16 +01:00
jackpoz
1ab8f0b00e Core/Quest: Fix issues reported by static analysis 
(cherry picked from commit 5b8b32dac7)
 2016-01-15 20:35:24 +01:00