Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 18:36:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
28,952 Commits 4 Branches 146 Tags
d8861342a3a526b94de42fe4f8b7c726d12f509a
Commit Graph

4768 Commits

Author SHA1 Message Date
Vincent-Michael
8adad5ebf4 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_paladin.cpp
	src/server/scripts/Spells/spell_priest.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warlock.cpp
	src/server/scripts/Spells/spell_warrior.cpp
 2013-07-24 03:21:25 +02:00
Vincent-Michael
b2fb740b54 Core/Spells: Fix priest talent "Improved Power Word: Shield" 2013-07-24 02:32:52 +02:00
joschiwald
a522be8108 Merge pull request #10336 from joschiwald/spellscripts5 
Scripts/Spells: backport some SpellScripts from 4.3.4 branch
 2013-07-23 17:21:17 -07:00
joschiwald
99c67c103d Scripts/Spells: backport some SpellScripts from 4.3.4 branch 
- Fix Earth Shield
- Fix Necrotic Touch
- Fix Reflective Shield

Closes #9145, #9163, #9665
 2013-07-24 02:13:49 +02:00
Vincent-Michael
0bff11cc0f Core/Spells: Update rogue "Blade Flurry" for 4.3.4 2013-07-23 21:50:36 +02:00
Vincent-Michael
c08ba7510b Core/Spells: Fix override for warlock "Nether Ward" 2013-07-23 19:17:49 +02:00
keke222
e11714e948 Scripts/Onyxia's Lair: Fixed movement during flight phase and set proper InhabitType 
Closes #10335
 2013-07-23 17:18:46 +02:00
Vincent-Michael
98f51b47b0 DB/Spells: Fix paladin talent "Sanctuary" for 4.3.4 2013-07-23 16:28:23 +02:00
Warpten
059d23de2d Spells/DK: Build fix 2013-07-23 15:44:54 +02:00
Warpten
804204c522 Spells/DK: Fixed Death Strike. 2013-07-23 14:56:03 +02:00
Nay
172c2577a1 Scripts/VH: Refactor commit 999843d 2013-07-23 14:55:57 +02:00
profPlum
52def4143a Scripts/VH: fix for violet hold's activation crystals 
Closes #10129
 2013-07-23 14:55:54 +02:00
Vincent-Michael
97608aeff7 Core/Spells: Fix hunter talent "Kindred Spirits" for 4.3.4 2013-07-23 14:54:21 +02:00
Vincent-Michael
193d71f158 Core/Spells: Fix hunter talent "Master Marksman" for 4.3.4 
Closes #9968
 2013-07-23 13:46:38 +02:00
Nay
a3aa3f65fd Scripts/VH: Refactor commit 999843d 2013-07-23 02:13:09 +01:00
Vincent-Michael
62944c6d8d Core/Spells: Small cleanup 2013-07-23 03:02:42 +02:00
profPlum
999843dfef Scripts/VH: fix for violet hold's activation crystals 
Closes #10129
 2013-07-23 01:51:24 +01:00
Vincent-Michael
7f7852b750 Core/Spells: Fix warlock talent "Improved Soul Fire" 2013-07-23 02:39:25 +02:00
Vincent-Michael
aca68428c2 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/AI/CoreAI/TotemAI.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Handlers/ItemHandler.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warlock.cpp
 2013-07-23 02:03:35 +02:00
Nay
5463f211b4 Merge pull request #10323 from joschiwald/spellranks 
Core/Spells: use SpellInfo class to get spellrank node instead of SpellMgr helpers
 2013-07-22 16:28:35 -07:00
Nay
cd2c33c4eb Merge pull request #10319 from joschiwald/casts 
Core/Misc: replace (Player*) casts with ToPlayer()
 2013-07-22 16:26:41 -07:00
Vincent-Michael
a94bbf3480 Core/Spells: Fix warlock "Health Funnel" self damage with hacky way 2013-07-22 23:43:35 +02:00
Vincent-Michael
c38dcab7d8 Core/Spells: Fix startup error with "spell_warl_health_funnel" 
Note: self dmg need fix
 2013-07-22 22:38:35 +02:00
Vincent-Michael
5ff96b886f Core/Spells: Fix dk "Bloodworms Health Leech" for 4.3.4 2013-07-22 20:56:26 +02:00
Vincent-Michael
0dff899256 Core/Spells: Remove spell script for "Renataki's Charm of Beasts" - reset not more cooldowns 2013-07-22 20:18:37 +02:00
Vincent-Michael
3579942438 Core/Spells: Update/Convert druid "Glyph of Starfire" for 4.3.4 2013-07-22 19:47:06 +02:00
Vincent-Michael
de21f51fd7 Core/Spell: Remove warlock "Siphon Life" script - has now default trigger spell 2013-07-22 19:24:17 +02:00
Vincent-Michael
102d46a3d0 Core/Spells: Update "spell_gen_clone" spellscript for 4.3.4 2013-07-22 19:06:37 +02:00
Vincent-Michael
f95a6d6523 Core/Spells: Remove old mage "summon water elemental" script - is now permanent pet 
"Patch 4.0.1 (12-Oct-2010): Water Elemental made into a permanent pet when specializing in the frost talent tree at level 10."
 2013-07-22 18:57:15 +02:00
Vincent-Michael
72c2ff0bf6 Core/Spells: Fix hunter wolf "Furious Howl" - is now for complete raid 2013-07-22 18:49:49 +02:00
Vincent-Michael
82d8023201 Spells: Remove mage "Burnout" - is no longer required 
"Patch 4.0.1 (12-Oct-2010): Removed."
 2013-07-22 18:41:00 +02:00
Vincent-Michael
7ec31a7a42 Core/Spells: Fix hunter "Serpent Sting" for 4.3.4 2013-07-22 18:27:03 +02:00
Vincent-Michael
dee93dcc5d Scripted/IcecrownCitadel: Remove spell script for lk play movie 2013-07-22 16:15:21 +02:00
Vincent-Michael
a651092489 Core/Spells: Fix warlock "Healthstone" for 4.3.4 2013-07-22 15:42:21 +02:00
Vincent-Michael
41311da2de Core/Spells: Fix hunter "Steady Shot" focus regen 
Closes #9553
 2013-07-22 02:49:19 +02:00
Vincent-Michael
95407b1b9d Core/Spells: Update/Convert warrior "Glyph of Sunder Armor" for 4.3.4 2013-07-22 00:32:46 +02:00
Vincent-Michael
6c21bbaaa4 Core/Spells: Conver/Update warrior "Retaliation" for 4.3.4 2013-07-22 00:13:58 +02:00
Vincent-Michael
b684cd6079 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-07-21 23:49:38 +02:00
Vincent-Michael
b6a5d667e2 Core/Spells: Update/Convert priest "Body and Soul" for 4.3.4 2013-07-21 17:46:08 +02:00
Vincent-Michael
2d53863396 Core/Spells: Convert/Update priest Vampiric Touch for 4.3.4 2013-07-21 16:41:13 +02:00
Vincent-Michael
e5cba4b071 Core/Spells: Convert/Update druid "Glyph of Innervate" for 4.3.4 2013-07-21 15:28:14 +02:00
Shauren
3d6b88f5aa Fixed compile warnings 2013-07-21 14:17:24 +02:00
Vincent-Michael
faa3dc9608 Core/Spells: Update/Convert priest "Phantasm" for 4.3.4 2013-07-21 14:09:16 +02:00
joschiwald
2d6a48840c Core/Spells: use SpellInfo class to get spell rank instead of SpellMgr helpers 2013-07-21 13:37:34 +02:00
Vincent-Michael
ef50383811 Core/Spells: Update/Convert priest "Vampiric Embrace" for 4.3.4 2013-07-21 13:36:32 +02:00
Vincent-Michael
afc242211c Core/Spells: Fix warlock talent "Aftermath" 2013-07-21 03:19:14 +02:00
Vincent-Michael
0d0de8bb7a Core/Spells: Update/Convert hunter "Improved Mend Pet" for 4.3.4 2013-07-21 01:52:15 +02:00
joschiwald
380cf5d241 Core/Misc: replace (Player*) casts with ToPlayer() 2013-07-21 01:38:21 +02:00
Vincent-Michael
40b87aca8f Core/Spells: Small cleanup in b3e9ca7a6a 2013-07-21 00:57:15 +02:00
Vincent-Michael
b3e9ca7a6a Core/Spells: Convert/Update "Alchemist Stone" for 4.3.4 2013-07-20 23:40:32 +02:00