Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 01:37:37 +01:00
Code Issues Packages Projects Releases Wiki Activity
20,635 Commits 4 Branches 146 Tags
2aef91d045f0c7f1cee88649bc4b951702dfcb16
Commit Graph

20635 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
6372eb1fcc DB/Spells: Fix warrior "Heroic Leap" damage 
Closes #10059
 2013-07-20 13:45:02 +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
6a77af1b3e SQL: Fix sql fail (thx Sar777) 2013-07-19 22:41:14 +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
ca7377369f CMake/MSVC: Fix VS 2013 compile -- Zm500 hack is no longer required 
Signed-off-by: Nay <dnpd.dd@gmail.com>
 2013-07-19 01:13:26 +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
blub
7dd26ce40e Merge pull request #10306 from joschiwald/devourer_of_souls 
Scripts/ForgeOfSouls: move "Mirrored Soul" into SpellScripts
 2013-07-18 15:34:45 -07: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
Aokromes
1c2213d796 DB/Condition: Correct target of spell 63126 
Fix by dr-j closes #10281
 2013-07-18 17:55:33 +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
d40725f93c SQL: Fix sql import error 2013-07-17 10:53:08 +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
Malcrom
83a31eaf96 DB/Conditions: Fix error in a previous commit. 2013-07-16 21:36:37 -02:30
Nay
b95b19b3cb TDB 424.05 2013-07-17 00:56:05 +01:00
Nay
b27777fa3e TDB 335.52 - 2013/07/17 2013-07-17 00:56:04 +01:00
Nay
3875ae0c66 TDB 335.52 - 2013/07/17 TDB335.52 2013-07-17 00:27:42 +01:00
Nay
0337174bc4 SQL: Fix a typo in 2013_05_11_00_world_spelleffect_dbc_434.sql 2013-07-17 00:09:06 +01:00
Nay
ff3524fabc Merge remote-tracking branch 'origin/master' into 4.3.4 2013-07-16 23:51:11 +01: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
0e4816771a Core/Conditions: Add more infos for invalid skill condition log error 2013-07-16 18:22:03 +02:00
Vincent-Michael
0cb8e12add DB/Condition: Fix startup error 2013-07-16 18:20:17 +02:00
Vincent-Michael
e90550fc07 DB/Gameobject: Fix spawnMask for Orb of Naxxramas 2013-07-16 16:05:21 +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
Kinzcool
4c3d2bdb54 DB/Misc: Few fixes for Naxxramas. 2013-07-16 00:07:56 -04: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
f8e56c18b2 DB/Gossip: Gossip fixup for Drull and Tog'thar 2013-07-15 14:38:48 -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