Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-13 21:49:49 +01:00
Code Issues Packages Projects Releases Wiki Activity
20,686 Commits 4 Branches 147 Tags
aca68428c28bf47fbe2fc08415ae99156a4c4aa6
Commit Graph

20686 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
f5a44b19a8 Merge pull request #10320 from joschiwald/battleground 
Core/Battleground: use generic function to relocate players to closest g...
 2013-07-22 16:27:10 -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
41ebf1493c Core/Spells: Fix shaman talent "Totemic Wrath" and small cleanup 2013-07-23 01:22:46 +02: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
86bc7ba077 DB/Spells: Fix startup error 2013-07-22 20:30:14 +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
Shauren
21c42bf5a7 Core/Creatures: Implemented new extended cost requirements and fixed some items requiring too much honor/conquest points 2013-07-22 19:52:18 +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
Shauren
3a4e3a5fa9 Core/Creatures: Removed vendor item check during loading, MAX_VENDOR_ITEMS should apply to filtered list of items depending on player opening the vendor, not global list size 
Closes #10330
 2013-07-22 17:12:29 +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
a468563904 DB/Spells: Fix startup error 2013-07-22 11:06:55 +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
joschiwald
ddb1183f6a Core/Battleground: use generic function to relocate players to closest graveyard 2013-07-21 00:30:19 +02:00
Vincent-Michael
b3e9ca7a6a Core/Spells: Convert/Update "Alchemist Stone" for 4.3.4 2013-07-20 23:40:32 +02:00
Vincent-Michael
c05633946e Core/Spells: Update/Convert mage "Permafrost" for 4.3.4 2013-07-20 21:47:52 +02:00
Vincent-Michael
0597db950c Core/Spells: Update/Convert mage "Glyph of Icy Veins" for 4.3.4 2013-07-20 21:19:00 +02:00
Vincent-Michael
313ef9da33 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-07-20 21:07:49 +02:00
Vincent-Michael
99d34bde1b Core/Spells: Update/Convert mage "Glyph of Polymorph" for 4.3.4 2013-07-20 20:52:40 +02:00
Vincent-Michael
b4e4c90007 DB/Spells: Fix typo in a86f818fe1 2013-07-20 18:24:47 +02:00
Vincent-Michael
a86f818fe1 Core/Spells: Update/Convert warrior state "Victory Rush" for 4.3.4 2013-07-20 18:23:34 +02:00
Vincent-Michael
7e0b8d69d6 Core/Spells: Update/Convert mage "Glyph of Ice Block" for 4.3.4 2013-07-20 17:37:06 +02:00
Nay
bf100ffc3c Scripts/Icecrown: Fix a double function call typo in npc_margrave_dhakar 
Thanks Josh
 2013-07-20 15:00:36 +01:00
Nay
7ce340bbd6 Core/Dependencies: Update utf8-cpp to version 2.3.4 2013-07-20 14:55:25 +01:00
Nay
d04bb0dd61 Merge pull request #10317 from FireEmerald/master 
Collection of Feedback-PatchFixes / 20.07.2013
 2013-07-20 06:51:25 -07:00
FireEmerald
d2c1a4f1d8 Collection of Feedback-PatchFixes / 20.07.2013 
Including sql codestyle updates and check for accuracy. (one by one)
by FireEmerald / Thx @DDuarte for the base pull request.

Including:
- DB/Spell: Update: Correct Spell Power Coefficient (107.43%) for Tranquility | by lendan (@6232)
- DB/LOS: Add: Ignore LOS for Ignite Horde Siege Engine | by dr-j (@6718)
- DB/SmartAI: Update: Correct casted spell by Defias Rogue Wizard | by Rochet2 (@9976)
- DB/Quest: Fix: Bloody Imp-ossible! (10924) | by Kirkhammett (@10276)
- DB/Quest: Fix: Mistcaller Yngvar (14102) / Add missing event script and conditions. | (@3563)
- DB/SmartAI: Update: Give quest credit for The Ring of Blood: The Final Challenge (9977) | by JunkyBulgaria (@7724)
- DB/Waypoints: Add: Missing waypoints for Mmmrrrggglll | by Hobbilis (@9602)
- DB/Conditions: Add: Missing conditions for Displacing Temporal Rift | by FireEmerald
 2013-07-20 15:20:22 +02:00