Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 02:46:33 +01:00
Code Issues Packages Projects Releases Wiki Activity
20,834 Commits 4 Branches 146 Tags
39cce3344c43d183ac855d9acfad83341d4d6335
Commit Graph

3128 Commits

Author SHA1 Message Date
Vincent-Michael
39cce3344c Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
 2013-08-02 14:41:33 +02:00
Shauren
5ae86ee2a8 Fixed compile 2013-08-01 22:22:39 +02:00
Vincent-Michael
26d090fa9a Core/Spells: Fix druid talent "Nature's Grace" 2013-08-01 22:02:14 +02:00
Shauren
ac10589eda Core/Misc: Fixed some issues found by Coverity Scan 2013-08-01 21:31:11 +02:00
Shauren
3814bbdd46 Core/Misc: Fixed compile warnings 2013-08-01 18:03:48 +02:00
Vincent-Michael
b8b21ce1f8 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-08-01 17:22:42 +02:00
Vincent-Michael
a71341bbcf Core/Spells: Fix rogue talent "Overkill" (thx to @timh52280) 
Close #10411
 2013-08-01 17:22:03 +02:00
Vincent-Michael
bab04cc5f8 Core/Spells: Fix try for logic fail in 4ba3c2e51d 2013-07-30 23:59:30 +02:00
Vincent-Michael
d50eafad6d Core/Spells: Fix hunter "Cobra Shot" 2013-07-30 21:54:16 +02:00
joschiwald
0d0baf004d Scripts/DrakTharonKeep: fix copy paste fail 
Closes #10402
 2013-07-30 15:46:56 +02:00
Nay
b21fe684c1 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Spells/SpellInfo.cpp
	src/server/game/Spells/SpellMgr.cpp
 2013-07-30 14:14:22 +01:00
Nay
394b2c6845 Scripts/OnyxiasLair: Fix a crash in boss_onyxia 
Closes #10393

Note: this just fixes the crash, not the issues the script has (a.k.a rewrite this)
 2013-07-29 21:46:49 +01:00
Vincent-Michael
cb8f159cea Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_priest.cpp
 2013-07-29 17:11:25 +02:00
Nay
1bb3c4a2b4 Misc: Fix warnings and build 
Closes #10396
 2013-07-29 14:24:53 +01:00
MitchesD
3b78023100 Scripts/DrakTharonKeep: Update King Dred to use events 
Closes #10385

Signed-off-by: joschiwald <joschiwald@online.de>
 2013-07-29 13:11:07 +02:00
joschiwald
d868f9db4b Scripts/DrakTharonKeep: reworked InstanceScript 2013-07-29 12:49:27 +02:00
Vincent-Michael
a08b52aa19 Core/Spells: Fix hunter talent "Improved Serpent Sting" 
Closes #10001
 2013-07-29 06:25:30 +02:00
Vincent-Michael
eef0d67bb7 Core/Spells: Cleanup for paladin 4.3.4 2013-07-28 19:07:58 +02:00
Vincent-Michael
0710f480b7 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_paladin.cpp
 2013-07-28 18:41:57 +02:00
Vincent-Michael
1a8b2ce466 DB/Spells: Fix warrior talent "Deep Wounds" 2013-07-28 17:58:10 +02:00
Vincent-Michael
706c5a1975 Core/Spells: Update/Convert paladin "Beacon of Light" for 4.3.4 2013-07-28 16:02:59 +02:00
grsgs
036286cb48 Core/Spells: Fix absorbs effect from death knight "Necrotic Strike" 
Closes #10388

Signed-off-by: Vincent-Michael <Vincent_Michael@gmx.de>
 2013-07-28 14:16:17 +02:00
joschiwald
cf7e783274 Scripts/Spells: Fixed typo in 7678800a93 2013-07-27 21:25:56 +02:00
Vincent-Michael
4d315bee3d Core/Spells: Convert "Maim Interrupt" and "Deadly Throw Interrupt" in generic script 2013-07-27 19:41:32 +02:00
Vincent-Michael
24b0a6f6c3 Core/Spells: Convert/Update rogue talent "Deadly Brew" for 4.3.4 2013-07-27 18:04:17 +02:00
joschiwald
7678800a93 Scripts/Spells: simplified "spell_dk_presence" 2013-07-27 17:53:00 +02:00
Vincent-Michael
100f9cc371 Core/Spells: Smallfix for warrior talent "Impending Victory" 
Note: Healamount need fix
 2013-07-27 17:32:57 +02:00
joschiwald
844671c5c7 Scripts/Spells: Update Death Knights Presences 2013-07-27 17:29:19 +02:00
Vincent-Michael
c87e557771 Core/Spells: Fix mage talent "Improved Polymorph" 2013-07-27 14:48:04 +02:00
Vincent-Michael
7cdaf17538 Core/Spells: Add missing stuff in 85d574e0b4 2013-07-27 03:09:52 +02:00
Vincent-Michael
16d14322c2 Core/Spells: Fix warrior talent "Lambs to the Slaughter" 2013-07-27 03:03:03 +02:00
joschiwald
b4d2796e33 Core/Spells: moved Improved Paladin Auras and Aura Mastery into SpellScripts 
Closes #205
Closes #5163
Closes #6809
Closes #7408
Closes #9587
 2013-07-27 02:37:48 +02:00
Vincent-Michael
550e1c7131 Core/Spells: Remove useless for druid "Savage Roar" - has already aura script 2013-07-26 23:48:06 +02:00
Vincent-Michael
36412fbe7d Core/Spells: Fix druid talent "Stampede" 2013-07-26 22:13:11 +02:00
Vincent-Michael
d5d3e785b7 DB/Player: Fix clear glyph for some class 2013-07-26 18:09:10 +02:00
Vincent-Michael
4d251bf707 Core/Misc: Fix db startup errors 2013-07-26 14:38:34 +02:00
Vincent-Michael
5a90649568 Core/Spells: Update dks presence for 4.3.4 
Note: need recheck
 2013-07-26 14:08:57 +02:00
Vincent-Michael
c13e63456c Core/Spells: Remove spell script: spell_gen_magic_rooster 2013-07-26 03:44:10 +02:00
Vincent-Michael
37c3e58974 Core/Spells: Remove spell scripts for "Hand of Salvation" - is no longer required 2013-07-26 03:28:24 +02:00
Vincent-Michael
c764e3e1c0 Core/Spells: Fix warrior "Rend" damage 2013-07-26 02:43:55 +02:00
Vincent-Michael
c57fa8f781 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/game/Spells/SpellInfo.h
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_priest.cpp
	src/server/scripts/Spells/spell_warlock.cpp
 2013-07-26 02:04:32 +02:00
Vincent-Michael
af9d1d92ae Core/Spells: Fix warrior talent "Vigilance" vengeance effect 2013-07-26 01:14:30 +02:00
Vincent-Michael
4b2eac1e80 Core/Spells: Remove spell script for Vigilance - is no longer required but Vengeance effect need fix 2013-07-26 00:29:01 +02:00
Vincent-Michael
4784f36f07 Core/Spells: Add missing stuff in 6a6e9a225c (thx to Nami-Doc) 2013-07-25 18:52:18 +02:00
joschiwald
e9750a4b65 Core/Spells: move Death Knights Presences into SpellScripts, fix possible issue after spec change, and fix some startup errors 
Closes #10354
 2013-07-25 18:06:21 +02:00
timh52280
6a6e9a225c Core/Spell: Fix rogue "Glyph of Preparation" 
Closes #10359

Signed-off-by: Vincent-Michael <Vincent_Michael@gmx.de>
 2013-07-25 18:03:42 +02:00
Vincent-Michael
6dc1f242e4 * Core/Spells: Remove spell script for druid "Lifeblood" - is no longer required 2013-07-25 17:03:08 +02:00
Vincent-Michael
6d28891cdf Core/Spells: Remove spell script for druid "Owlkin Frenzy" - is no longer required 2013-07-25 16:12:47 +02:00
Vincent-Michael
06324832b7 Core/Spells: Fix more startup error with spells 2013-07-25 15:34:36 +02:00
Vincent-Michael
e9acee868b Core/Spells: Fix more startup error with spells 2013-07-25 15:05:16 +02:00