Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-18 16:38:42 +01:00
Code Issues Packages Projects Releases Wiki Activity
20,760 Commits 4 Branches 146 Tags
c764e3e1c0ca68bda689fe91d5cacaca6703ffbc
Commit Graph

5849 Commits

Author SHA1 Message Date
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
dc175a2a4c DB/Spells: Fix 2.typo in 814e772650 2013-07-26 01:44:29 +02:00
Vincent-Michael
400bcf3150 DB/Spells: Fix typo in 814e772650 2013-07-26 01:41:20 +02:00
Vincent-Michael
814e772650 DB/Spells: Fix startup error with "spell_halion_summon_exit_portals" 2013-07-26 01:40:15 +02:00
Vincent-Michael
af9d1d92ae Core/Spells: Fix warrior talent "Vigilance" vengeance effect 2013-07-26 01:14:30 +02:00
joschiwald
34fc72cf71 DB/Conditions: Fix gossip condition for Bat Handler Camille <Bat Handler> 
Closes #10240
 2013-07-26 00:32:09 +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
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
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
3511ce9125 DB/Spells: Fix typo in 54c2009318 2013-07-25 16:41:31 +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
Vincent-Michael
40176543c1 DB/Spells: Fix more startup errors 2013-07-25 14:43:15 +02:00
Vincent-Michael
54c2009318 Core/Spells: Fix some db startup error and add new 2013-07-25 14:14:30 +02:00
Vincent-Michael
061edf9342 Core/Spells: Fix priest talent "Twin Disciplines" 2013-07-25 13:29:29 +02:00
Vincent-Michael
120d2914bd DB/Spells: Fix warrior talent "Die by the Sword" 2013-07-25 02:25:23 +02:00
joschiwald
d3c19f30aa DB/Spells: add sql after recent spell rank changes for 4.3.4 2013-07-25 01:39:53 +02:00
Vincent-Michael
d4d43d7410 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/game/Spells/SpellMgr.h
	src/server/game/World/World.cpp
 2013-07-25 00:41:37 +02:00
joschiwald
8a87ab04ee Merge pull request #10331 from joschiwald/spell_proc_ranks 
Core/Spells: allow to use ranked spells in `spell_proc_event` table (lik...
 2013-07-24 15:00:14 -07:00
joschiwald
e6a146aba8 Core/Spells: allow to use ranked spells in spell_proc_event table (like in spell_proc table) 2013-07-24 23:52:06 +02:00
Mihapro
ef83ec8d1c DB/Spells: Fix Bandage debuff for 4.3.4 
Closes #9689
 2013-07-24 23:42:34 +02:00
Vincent-Michael
2963b44e3d Core/Spells: Fix warrior talent "Sudden Death" for 4.3.4 2013-07-24 23:09:25 +02:00
Ascathor
5a9810ec08 Core/Commands: Added the rank id to .pinfo for guild data 2013-07-24 19:25:36 +02:00
joschiwald
9fb45ef64c Core/Spells: load spell ranks for talents from dbc 2013-07-24 15:38:19 +02:00
Warpten
2f98d1a451 Ctrl+S, i SERIOUSLY HATE YOU 2013-07-24 15:01:38 +02:00
Warpten
51a7f3408f Spells/Warlock: Fixed Soul Swap. 2013-07-24 15:00:40 +02:00
Vincent-Michael
552e70be5a Creature/Misc: Fix some training dummys for 4.3.4 2013-07-24 14:20:13 +02:00
Vincent-Michael
3ef4975d60 Core/Spells: Fix death knight "Will of the Necropolis" for 4.3.4 2013-07-24 11:31:00 +02:00
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
18a3ccd3d1 DB/Spell: Fix startup error 2013-07-23 23:27:43 +02:00
Vincent-Michael
6a5ae32816 DB/Spells: Fix startup errors 2013-07-23 22:43:04 +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
Xanviall
0c3a93948f DB/Spells: Fix warrior "Heroic Strike" damage 
Closes #9308
 2013-07-23 18:15:47 +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
Vincent-Michael
5edd13e85d Revert "Core/Spells: Fix hunter talent "Kindred Spirits" for 4.3.4" 
This reverts commit 97608aeff7.
 2013-07-23 15:07:20 +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
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