Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Merge branch 'master' into 4.3.4

Browse Source 
Conflicts:
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
This commit is contained in:
Spp committed 2013-01-16 15:29:41 +01:00
2 parents 9391d087fd 927062f61f
commit 0e8011657d
30 files changed
+406 -158
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
+2
View File
@@ -23,6 +23,8 @@
uint32 const EncounterCount = 5;
#define ZGScriptName "instance_zulgurub"
enum DataTypes
{
DATA_VENOXIS = 0,