araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-18 06:00:10 -04:00
Code Issues Packages Projects Releases Wiki Activity
30,709 Commits 17 Branches 140 Tags
cfdf0b2a860249e4a90ee4673a8bd2fba4bc9bda
Commit Graph

5023 Commits

Author SHA1 Message Date
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
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 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
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 d4ac53083f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Corpse/Corpse.cpp
	src/server/game/Globals/ObjectMgr.cpp
 2013-07-19 22:33:35 +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 1ac4f0a9c1 SQL: Rename in correct name 2013-07-19 14:01:25 +02:00
Vlad 0b9a8ccef5 Core/Misc: Change creatures and gameobject phasemask from 16 to 32 bits 
Signed-off-by: Nay <dnpd.dd@gmail.com>
 2013-07-19 04:03:40 +01:00
Nay ebd9090d80 DB/NPCs: Fix Margrave Dhakar equipment 2013-07-19 03:25:52 +01:00
Nay 0691a4310f Scripts/Icecrown: Use guid instead of cached Creature* to avoid crashes in npc_margrave_dhakar 2013-07-19 02:27:56 +01:00
Nay ff01602906 Scripts/Icecrown: Fix code style and use "best practices" on previous commit (c536ba510) 2013-07-19 00:42:59 +01:00
Nay c536ba510d Scripts/Icecrown: Fix quest The Flesh Giant Champion 
Closes #9040
Closes #10294
 2013-07-19 00:03:27 +01:00
Vincent-Michael da360abc10 Core/Spells: Convert/Update some shaman spells for 4.3.4 2013-07-19 01:02:02 +02:00
joschiwald d52ce57e59 Scripts/ForgeOfSouls: move "Mirrored Soul" into SpellScripts 2013-07-19 00:24:25 +02:00
Vincent-Michael ef8a08ee2c Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-07-18 23:16:22 +02:00
blub 922fba3a13 Merge pull request #10305 from joschiwald/koralon 
Scripts/VaultOfArchavon/Koralon: Fix Meteor Fists
 2013-07-18 14:14:32 -07:00
Vincent-Michael c401c342d1 Core/Spells: Fix fail in 0b94293dba 2013-07-18 23:11:07 +02:00
joschiwald 06d54ba438 Scripts/VaultOfArchavon/Koralon: Fix Meteor Fists 2013-07-18 23:01:14 +02:00
Nay eca90db56b Scripts/Commands/Arena: Replace a call of GetPlayerNameByGUID by GetCharacterNameData 2013-07-18 21:07:00 +01: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
Malcrom 8cec422c05 DB/Gossip: Add some missing gossip. 2013-07-17 06:12:20 -02:30
Malcrom 8462a09264 DB/Gossip: Added missing gossip for Royal Historian Archesonus. Removed cpp script. 2013-07-16 21:42:40 -02:30
Vincent-Michael 187878f9c4 Core/Spells: Update warrior/utgarde keep "Second Wind" for 4.3.4 2013-07-17 00:42:46 +02:00
Nay 8edbc2152e Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/scripts/Kalimdor/zone_the_barrens.cpp
 2013-07-16 14:42:38 +01:00
Malcrom bd3fa71d32 DB/Gossip: Add and fix a few more gossip menus. 2013-07-15 19:57:18 -02:30
Malcrom 53e5075005 Scripting/Black Fathom Deeps: Fixed script to use proper spell. 2013-07-15 15:15:23 -02:30
Malcrom cff725982d DB/Gossip: Added gossip for Morridune. 2013-07-15 14:53:20 -02:30
Malcrom 9e91219cd3 DB/Gossip: Add missing gossip for Sputtervalve. Moved all scripting to SAI. 2013-07-15 13:51:51 -02:30
Vincent-Michael 56bd42dcf1 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/World/World.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
 2013-07-15 18:04:04 +02:00
Vincent-Michael 7104e3c70f Core: Fix build 2013-07-15 17:44:32 +02:00
Shauren 779a59e7e2 Core/Config: Refactored ConfigMgr 
* Loading initial configuration files is now separate from loading any additional custom configs
 2013-07-15 17:31:44 +02:00
Vincent-Michael de193fc80d Scripted: Add some missing override 2013-07-15 15:14:01 +02:00
Vincent-Michael baeecba6c9 Core: Fix build 2013-07-15 01:07:02 +02:00
Vincent-Michael 08c1a81096 Scripted/Misc: Fix random stuff 2013-07-15 01:01:37 +02:00