Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-26 20:02:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
30,201 Commits 4 Branches 146 Tags
df0d32be819ab4af7af400dabcc8d009b30a336e
Commit Graph

2107 Commits

Author SHA1 Message Date
treeston
df0d32be81 Merge remote-tracking branch 'Treeston/3.3.5-kelthuzad' into 3.3.5 (PR #16634) 
(cherry picked from commit 47a9cb1e56)

...Huh. Wonder how this one didn't make travis complain on the PR.
(cherry picked from commit 93a68d5881)

Was Travis completely napping on this one?
(cherry picked from commit 2d7dec0d39)
 2017-02-18 15:57:19 +01:00
treeston
ab6f8f9fb7 Scripts/HallsOfLightning: Fix Volkhan healing. 
(cherry picked from commit 5da3ae0489)
 2017-02-18 15:49:06 +01:00
SnapperRy
2574667854 Scripts/ArgentTournament: improve training dummy script 
Now the ranged and charge target dummies will cast their spells and behave correctly for the related quests
(cherry picked from commit 433beb77e3)
 2017-02-18 14:38:42 +01:00
Treeston
8b7934f718 Core/Spells: Fix orientation- and targeting-related issues if the creature isn't currently engaged in combat. (#17120) 
Also disable spell focus system for vehicle control auras.

Closes #16572
Closes #17016
(cherry picked from commit 6f85422f0b)
 2017-02-12 17:04:08 +01:00
Alan Deutscher
cd811271d9 Scripts: UNIT_FLAG_REMOVE_CLIENT_CONTROL no longer used as a method for preventing a unit from moving 
UNIT_FLAG_REMOVE_CLIENT_CONTROL (formerly UNIT_FLAG_DISABLE_MOVE) is a client-only feature that should not be used for NPC scripting. All applications of this flag in scripts/ have been replaced with applications/removals of the UNIT_STATE_ROOT state.

Closes #17311

(cherry picked from commit 061b62a97d)
 2017-02-12 16:52:18 +01:00
Aokromes
3b67401f6a Update boss_jedoga_shadowseeker.cpp 
(cherry picked from commit 153b797182)
 2017-02-11 21:37:42 +01:00
ariel-
c429e7d489 Core/Entities: debloat SummonGameObject parameter list using proper wrappers and enable GO rotation in scripts 
- There's still an overload allowing for x, y, z, o to be passed directly
- Fixed default animstate for GameObject creation in many places, it should be 255, not 100 (checked in sniffs)

(cherry picked from commit 62bfee37cb)

# Conflicts:
#	src/server/game/Battlefield/Battlefield.cpp
#	src/server/game/Battlegrounds/Battleground.cpp
#	src/server/game/Entities/GameObject/GameObject.cpp
#	src/server/game/Entities/GameObject/GameObject.h
#	src/server/game/Entities/Object/Object.cpp
#	src/server/game/Entities/Object/Object.h
#	src/server/game/Spells/SpellEffects.cpp
#	src/server/scripts/Commands/cs_gobject.cpp
#	src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp
#	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
#	src/server/scripts/Kalimdor/zone_feralas.cpp
#	src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
#	src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
#	src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp
 2017-02-11 20:50:29 +01:00
ariel-
02cef6f034 Core/GameObjects: Gameobject rotation (from cmangos/mangos-wotlk@2bcbc0f) (#14146) 
cmangos/mangos-wotlk@0fe88f35df: [11531] Normalize gameobject's quaternion, thanks to zergtmn for pointing
cmangos/mangos-wotlk@060dfb791b: [11667] Implement transport path rotation
cmangos/mangos-wotlk@565f52c6c1: [11806] A bit gameobject code refactoring
cmangos/mangos-wotlk@6874951: [11807] Add gameobject_addon table

Closes #14146

(cherry picked from commit 2967bf59b4)

# Conflicts:
#	src/server/game/Battlefield/Battlefield.cpp
#	src/server/game/Battlegrounds/Battleground.cpp
#	src/server/game/Entities/GameObject/GameObject.cpp
#	src/server/game/Entities/GameObject/GameObject.h
#	src/server/game/Entities/Object/Object.cpp
#	src/server/game/Globals/ObjectMgr.cpp
#	src/server/game/Spells/SpellEffects.cpp
#	src/server/scripts/Commands/cs_gobject.cpp
#	src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
#	src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp
 2017-02-11 19:10:43 +01:00
ForesterDev
97f65d9b4d Scripts / Naxxramas : add missing null pointer check. Fixes CID 1354738 (#17628) 
(cherry picked from commit d57c177d0b)

# Conflicts:
#	src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp
 2017-02-11 15:29:22 +01:00
robinsch
3ef1f2c531 Script/Archavon: Implement EMOTE_LEAP (#17588) 
(cherry picked from commit 8a2df73a82)

Script/Archavon: Implement EMOTE_LEAP

By robinsch
(cherry picked from commit 1a2bd0dc3a)
 2017-02-05 17:31:54 +01:00
Warpten
3cd73a36e3 Scripts/RubySanctum: Fix missing break reported by Coverity. 
(cherry picked from commit 07ce570be8)
 2017-02-05 16:37:36 +01:00
Snapper
a3096cc1c1 Core/Misc: use enum for UNIIT_NPC_FLAGS' zero values 
(cherry picked from commit ebb33bbfc1)

# Conflicts:
#	src/server/game/Entities/Player/Player.cpp
 2017-02-05 16:27:55 +01:00
Snapper
c639153567 Core/Misc: kill whitespace and use enum instead of hardcoded value. 
(cherry picked from commit 21797c6c4f)
 2017-02-05 00:57:20 +01:00
SnapperRy
caf744ad02 Core/Script: small improvement for quest "The Hunt is On". (#17537) 
Reset emotestate when the event starts.
(cherry picked from commit eb1cd4c907)
 2017-02-05 00:57:16 +01:00
joschiwald
e774c29c21 Fixed build 2017-02-05 00:16:58 +01:00
Gustavo
e55420af86 Core/Scripts Corrections on Halion's Encounter (#16725) 
Core/Scripts: Updates to Halion

* Fixed Combustion and Consumption.
* Fixed Living Embers and Blazing Auras.
* Timer changes.
(cherry picked from commit dfe278459d)

# Conflicts:
#	src/server/game/Spells/SpellMgr.cpp
#	src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp

Fix sql for merged PR
(cherry picked from commit 7f944695dd)

Derp.

github editor is bad.
(cherry picked from commit 1829049461)
 2017-02-04 23:33:26 +01:00
tkrokli
604b8bfab1 Core/Scripts: Tom Hegger must target player in Say text (#17395) 
File: zone_borean_tundra.cpp
Script: npc_hidden_cultist
Quest: The Hunt is On, 11794
NPC:  Tom Hegger, 25827

Before this change, Tom Hegger does not target player when saying his
aggro text "You don't know who you're messing with, $c!   Death beckons!"
and hence the text $c will be shown instead of the player class.
(cherry picked from commit 736843fbb5)
 2017-01-29 21:51:04 +01:00
treeston
5baf6ea4d9 Merge branch '3.3.5-frogger' into 3.3.5 (PR #17261) 
(cherry picked from commit 90ff3ce8c8)
 2017-01-29 21:51:03 +01:00
treeston
6c6f86d34c Instances/DrakTharonKeep: Fix Novos the Summoner. Fixes #17331. 
(cherry picked from commit 813e33b927)
 2017-01-13 00:56:41 +01:00
Aokromes
b52c1b35a5 Scripts/UtgardePinacle: Adjust King Ymiron boundaries 
(cherry picked from commit cc521d49dc)
 2017-01-13 00:44:14 +01:00
Keader
b8757aa8e4 Core/Scripts Fixed Anubarak issues related with Leeching Swarm spell 
(cherry picked from commit 3c35ce06af)
 2017-01-12 23:40:24 +01:00
treeston
e2710bc232 Scripts/Instances: Fix a bug that would cause the Hodir encounter to never properly begin. Tagging issue #17302. 
(cherry picked from commit e5382ee215)
 2017-01-12 03:19:38 +01:00
treeston
5e99388981 Scripts/Instances: More #16346 follow-ups. Fixed this time: Halls of Reflection, Ignis the Furnace Master, Mimiron and Rend Blackhand. 
(cherry picked from commit 27a3eaab33)

Scripts/MoltenCore: Fix Ragnaros (#16346 follow-up).
(cherry picked from commit 83e5df5638)

Scripts/BlackrockMountain: Nefarian. (#16346 f-u)
(cherry picked from commit 650d7ab596)
 2017-01-12 00:28:10 +01:00
jackpoz
954b3c9617 Core/VMaps: Fix some vmap height edge cases 
Fix Map::GetWaterOrGroundLevel() checking dynamic object only in phase 1 instead of current Unit phase.
Improve DynamicMapTree::getHeight() dynamic object check by casting the ray at +0.5f from the passed Z coordinate, this value will be tuned to improve even more the results.

(cherry picked from commit 1347d7cf7a)
 2017-01-12 00:13:55 +01:00
treeston
1eb9f8edab Scripts/TotC: More follow-up to #16346. Also code style cleanup. Who names all their creature pointers "temp"? 
(cherry picked from commit 4407877f36)

Compiler warning fix.
(cherry picked from commit 7fbd70d4c4)
 2017-01-12 00:07:19 +01:00
treeston
8b4435c96c Scripts/Instances: Follow-up to #16346. Fix Illidan and Northrend Beasts. 
(cherry picked from commit 4e922a5146)

# Conflicts:
#	src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
 2017-01-12 00:02:30 +01:00
Trisjdc
781c5a3b82 Core/Creatures: Remove resetting of UNIT_FLAG_IMMUNE_TO_PC on combat clearing 
(cherry picked from commit 34ef05ce0b)
 2017-01-12 00:02:30 +01:00
Keader
6ca75ef039 Core/Scripts Improve Felflame Infernal of Lord Jaraxxus fight (#16998) 
(cherry picked from commit 43855b47d8)

Rename 9999_99_99_world.sql to 2016_06_02_01_world.sql
(cherry picked from commit 7f0e1caf72)
 2017-01-12 00:02:29 +01:00
Keader
7f2b5f3859 Core/Scripts Improve Jormungars fight 
(cherry picked from commit 0912df258d)

Rename spell_snakes_spray for spell_jormungars_snakes_spray and cleanup
(cherry picked from commit 2c9c8afc0f)

Fixing the issue
(cherry picked from commit 81083a8593)

Changing remove aura method
(cherry picked from commit b88d49be24)

changing creature_text (tk feedback)
(cherry picked from commit 9b444877dd)

Override and tkrokli again :D
(cherry picked from commit 7205b4dd65)

Fix SQL name
(cherry picked from commit cae19692ab)
 2017-01-12 00:02:29 +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
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
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
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
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
Kito
4fa7cd0c30 Scripts/Icecrown Citadel: Sindragosa - Ice Tomb should always deal damage to all other ice tombs too 
Closes #7808
Merges #16863
 2017-01-07 20:20:41 +01:00
vincent-michael
86b98686a9 Update copyright note for 2017 
Happy new year
 2017-01-01 16:23:13 +01:00
Shauren
ac1dc758b9 Core/Units: Cleanup hardcoded magic numbers for byte field offsets 2016-12-13 20:58:22 +01:00
Duarte Duarte
7eb4512eee Scripts: Minimize duplicated enum names in header files (#18346) 
This reduces the number of cache resets with the Zapcc compiler

Standard followed is instance/raid TLA + DataTypes/CreaturesIds/etc
 2016-12-01 01:51:07 +00:00
Shauren
189455d2fb Build fix 2016-10-22 02:04:53 +02:00
Ivan Beňovic
8ff5b35be1 Core/Spells: Add SpellMissInfo argument to BeforeHit hooks and call them also when the spell doesn't hit. (#17613) 2016-07-20 09:08:58 +02:00
Shauren
2056ce4d66 Scripts: Build fix 2016-07-17 15:20:56 +02:00
Shauren
70137b8f3a Merge branch '6.x' of https://github.com/TrinityCore/TrinityCore into legion 2016-07-06 00:05:13 +02:00
Aokromes
be0ce1c4d3 Scripts/Ulduar: Remove removed achievement 
Closes #17387
 2016-06-16 15:49:27 +02:00
Shauren
d2733eb6f1 Merge branch '6.x' of https://github.com/TrinityCore/TrinityCore into legion 2016-06-13 21:00:25 +02:00
Shauren
c529566ac4 Core/GameObejcts: Fixed disconnects happening when viewing nearby players on elevators 
Closes #17335
 2016-06-12 00:11:00 +02:00
Shauren
8396dabdad Core/Misc: Fixed coverity issues 
Uninitialized fields: CID 1354593, 1354595, 1354738
Unchecked return value: CID 1354558
Out of bounds access: CID 1352989, 1352993
Null pointer dereference: CID 1296286
 2016-06-06 09:16:59 +02:00
Shauren
c95f4a5070 Core/GameObjects: Updated GameObjectTemplate to 7.0.3.21796 2016-05-30 23:49:35 +02:00
Shocker
b539ac6afa Core/GameObjects: Add isUse parameter to GossipHello for distinction between CMSG_GAMEOBJECT_USE and CMSG_GAMEOBJECT_REPORT_USE 2016-05-26 13:09:56 +03:00
joschiwald
c194daf0b5 Scripts/Freya: removed obsolete code 
(cherry picked from commit d812505fc2)

Makes travis happy
(cherry picked from commit ab2466ac01)
 2016-05-17 21:22:06 +02:00