Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-25 11:21:58 +01:00
Code Issues Packages Projects Releases Wiki Activity
20,665 Commits 4 Branches 146 Tags
7ec31a7a42c29de51a3ca6258c8892a8aab074c5
Commit Graph

609 Commits

Author SHA1 Message Date
Vincent-Michael
7ec31a7a42 Core/Spells: Fix hunter "Serpent Sting" for 4.3.4 2013-07-22 18:27:03 +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
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
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
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
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
2aef91d045 Core/Spells: Fix hunter "T.N.T." and "Lock and Load" for 4.3.4 2013-07-20 14:56:37 +02:00
Vincent-Michael
800f977415 Core: Fix warnings 2013-07-20 01:46:12 +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
Vincent-Michael
c401c342d1 Core/Spells: Fix fail in 0b94293dba 2013-07-18 23:11:07 +02:00
Vincent-Michael
de673fc4b0 Core/Spells: Convert/Update more spells for 4.3.4 2013-07-18 18:20:01 +02:00
Vincent-Michael
0b94293dba Core/Spells: Convert/Update more spells for 4.3.4 2013-07-18 15:23:09 +02:00
Vincent-Michael
98c8dc346a Core/Spells: Convert/Update more spells in spell script for 4.3.4 2013-07-18 12:05:57 +02:00
Vincent-Michael
177ecd6dac Core/Spells: Convert/Update some warlock spells in spell scripts for 4.3.4 2013-07-18 00:45:13 +02:00
Vincent-Michael
63675c3b0b Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/EasternKingdoms/zone_ironforge.cpp
	src/server/scripts/Spells/spell_generic.cpp
 2013-07-17 20:24:29 +02:00
Vincent-Michael
4ba3c2e51d Misc: Some cleanup 2013-07-17 19:42:15 +02:00
Vincent-Michael
187878f9c4 Core/Spells: Update warrior/utgarde keep "Second Wind" for 4.3.4 2013-07-17 00:42:46 +02:00
Vincent-Michael
7104e3c70f Core: Fix build 2013-07-15 17:44:32 +02:00
Vincent-Michael
de193fc80d Scripted: Add some missing override 2013-07-15 15:14:01 +02:00
Vincent-Michael
9e9bdd77c5 Core: Fix build 2013-07-14 22:48:56 +02:00
Nay
b56b282eee Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Entities/Creature/GossipDef.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Handlers/QuestHandler.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
	src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/boss_kruul.cpp
	src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp
	src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
	src/server/scripts/EasternKingdoms/zone_ghostlands.cpp
	src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
	src/server/scripts/EasternKingdoms/zone_ironforge.cpp
	src/server/scripts/EasternKingdoms/zone_loch_modan.cpp
	src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_darkshore.cpp
	src/server/scripts/Kalimdor/zone_desolace.cpp
	src/server/scripts/Kalimdor/zone_durotar.cpp
	src/server/scripts/Kalimdor/zone_felwood.cpp
	src/server/scripts/Kalimdor/zone_feralas.cpp
	src/server/scripts/Kalimdor/zone_mulgore.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
	src/server/scripts/Kalimdor/zone_tanaris.cpp
	src/server/scripts/Kalimdor/zone_thousand_needles.cpp
	src/server/scripts/Kalimdor/zone_thunder_bluff.cpp
	src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
	src/server/scripts/Northrend/zone_dalaran.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/Spells/spell_druid.cpp
	src/server/scripts/Spells/spell_generic.cpp
	src/server/scripts/Spells/spell_mage.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
	src/server/scripts/World/item_scripts.cpp
 2013-07-14 16:10:20 +01:00
Nay
3561ab98ba Misc: Use override and final C++11 keywords in a few places (mostly scripts) 
OVERRIDE and FINAL are TC macros (expand to nothing if compiler does not  support C++11)
 2013-07-06 20:21:45 +01:00
Warpten
e49c7aa765 Spells/Priest: Fixed Dispel Magic. 2013-07-06 14:48:40 +02:00
Vincent-Michael
6079f369af Scripted/Misc: Some cleanup 2013-07-06 01:00:05 +02:00
Vincent-Michael
644e75487d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp
	src/server/scripts/EasternKingdoms/BlackrockSpire/boss_rend_blackhand.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp
	src/server/scripts/Kalimdor/zone_silithus.cpp
	src/server/scripts/Kalimdor/zone_tanaris.cpp
	src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
	src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
	src/server/scripts/Spells/spell_item.cpp
 2013-07-04 23:08:02 +02:00
Shauren
112bc49c9a Core/Units: Removed most calls to SendMovementFlagUpdate for creatures 2013-06-30 16:31:24 +02:00
Vincent-Michael
a7ba30fe4d Core/Spells: Fix priest talent "Divine Touch" 2013-06-28 22:50:22 +02:00
Vincent-Michael
23fcda3481 Core/Spells: Fix paladin talent "Eye for an Eye" 
Note: Add proc flags hack (default proc flags not working)
 2013-06-28 22:13:38 +02:00
Vincent-Michael
d547cc8e3b Core/Spells: Fix hunter talent "Thrill of the Hunt" 2013-06-28 16:55:12 +02:00
Vincent-Michael
4c78f3201c Core/Spells: Fix shaman talent Focused Insight 2013-06-27 16:32:37 +02:00
Vincent-Michael
0d9cc47cbb Core/Spells: Fix shaman talent "Telluric Currents" 2013-06-26 22:25:29 +02:00
Vincent-Michael
52c7146682 Core/Spells: Fix shaman talent "Rolling Thunder" 
thx to @oMadMano for base script
 2013-06-25 19:48:23 +02:00
Vincent-Michael
ab8c3c2c9e Core/Spells: Fix warrior ability "Rallying Cry" 
thx to @timh52280 for base script
Closes #10088
 2013-06-24 19:55:28 +02:00
Vincent-Michael
e6363ce2c5 Core/Spells: Fix shaman talent "Tidal Waves" 
Note: Drop charges for critical effect need fixing
 2013-06-23 20:58:18 +02:00
Shauren
6cbced8e16 Scripts/Spells: Removed obsolete scaling mount scripts 2013-06-23 12:56:17 +02:00