josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,057 Commits 1 Branch 0 Tags
34cd8e808eb7ae2915a970213a37eb2c615fd7fe
Commit Graph
1250 Commits
Author SHA1 Message Date
Vincent-Michael 34cd8e808e Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Globals/ObjectMgr.cpp
 2013-08-20 17:48:18 +02:00
Shauren 75cc4e7b25 Core/Auras 
* Fixed unsafe removal of charm auras, it is now safe to remove them inside AI hooks
* Fixes crash in SmartAI::EnterEvadeMode

Closes #8679
 2013-08-20 00:43:03 +02:00
Vincent-Michael f16f427c48 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/Spell.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
	src/server/scripts/Kalimdor/CMakeLists.txt
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_moonglade.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp
	src/server/scripts/Spells/spell_hunter.cpp
 2013-08-18 18:13:14 +02:00
joschiwald 2b19ba1879 Misc: replace Unit::GetPlayer with ObjectAccessor::GetPlayer and some cosmetic changes 2013-08-18 01:41:10 +02:00
joschiwald c45e665c86 Core/Spells: move spell resistance calculation into separate function (and some cosmetic changes) 
Ref #7254
 2013-08-17 00:47:44 +02:00
Vincent-Michael 74689b1d93 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-08-16 18:35:54 +02:00
betagan c81c198d4c Core/Spells: Fix deathknight gladiator glove bonus 
Closes #512
 2013-08-16 02:50:47 +02:00
Shauren 7aff234ada Core/Spells: Fixed cast time calculation in many places 2013-08-15 19:04:09 +02:00
Vincent-Michael 21fe779dfb Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-08-15 16:49:58 +02:00
Shauren d1bb6da668 Core/Spells: Fixed cast time mods using two charges on every cast 2013-08-15 16:34:57 +02:00
Shauren 2ac6380202 Core/Auras: Allow preventing whole aura proc default handler from script hooks, just how it is possible for separate effects 2013-08-15 16:32:22 +02:00
Vincent-Michael 11ecb9c633 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Handlers/PetHandler.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/Spell.h
 2013-08-14 16:52:13 +02:00
joschiwald e87402dd05 Core/Spells: 
- corrected structure of SMSG_PET_CAST_FAILED (fixes highlighted action buttons)
- simplified spell focus check
 2013-08-14 15:45:36 +02:00
Vincent-Michael 617e0c476b 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_hunter.cpp
 2013-08-12 13:36:42 +02:00
Vincent-Michael 147c7d5243 Core/Spells: Fix Rogue T10 4P bonus 
Closes #4153
 2013-08-12 13:04:52 +02:00
Vincent-Michael 4c64e407b7 Core/Spells: Convert hunter "Improved Mend Pet" in spell script 
Closes #5597
Closes #9006
Closes #10346
 2013-08-11 19:23:21 +02:00
Vincent-Michael f506ee3077 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.h
	src/server/game/Spells/SpellMgr.cpp
 2013-08-11 18:37:31 +02:00
Nay d0bde02b21 Core/CreatureAI: Do not remove clone_caster auras on evade (in addition to control_vehicle auras) 2013-08-11 15:52:23 +01:00
Vincent-Michael fa0aaa5fa4 Core/Spells: Some cleanup and missing stuff in a6eee516bd 2013-08-11 01:46:29 +02:00
Shauren 0e75857702 Core/PacketIO: Fixed object update failures 
Closes #8105
 2013-08-10 13:44:08 +02:00
Vincent-Michael 7227a8547b Core/Spells: Add druid Moonkin Aura with Moonkin Form (thx to kraven5) 2013-08-03 02:15:34 +02:00
Vincent-Michael 8b85fa2454 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-08-02 20:07:43 +02:00
Shauren 20a61b6400 Core/Creatures: DoTs and self damage will no longer reset time since last damage taken for stopping creature from evading 2013-08-02 19:56:48 +02:00
Vincent-Michael d50eafad6d Core/Spells: Fix hunter "Cobra Shot" 2013-07-30 21:54:16 +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
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 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 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
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 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 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
Vincent-Michael faa3dc9608 Core/Spells: Update/Convert priest "Phantasm" for 4.3.4 2013-07-21 14:09:16 +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 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 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 99d34bde1b Core/Spells: Update/Convert mage "Glyph of Polymorph" for 4.3.4 2013-07-20 20:52:40 +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
Vincent-Michael 5252f1614f Core/Spells: Convert/Update death knight "Butchery" in spell script for 4.3.4 2013-07-20 01:18:53 +02:00
Vincent-Michael 557474f2ae Core/Spells: Convert/Update hunter "Rapid Recuperation" for 4.3.4 2013-07-19 21:54:21 +02:00
Vincent-Michael da360abc10 Core/Spells: Convert/Update some shaman spells for 4.3.4 2013-07-19 01:02:02 +02:00