Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: dep/PackageList.txt src/server/game/Spells/Auras/SpellAuras.cpp
This commit is contained in:
commit
741f3dde2e
334 files changed
+487
-198930
No files matched your search
@@ -467,7 +467,7 @@ enum SMART_ACTION
|
||||
SMART_ACTION_SET_VISIBILITY = 47, // on/off
|
||||
SMART_ACTION_SET_ACTIVE = 48, // on/off
|
||||
SMART_ACTION_ATTACK_START = 49, //
|
||||
SMART_ACTION_SUMMON_GO = 50, // GameObjectID, DespawnTime in ms,
|
||||
SMART_ACTION_SUMMON_GO = 50, // GameObjectID, DespawnTime in s
|
||||
SMART_ACTION_KILL_UNIT = 51, //
|
||||
SMART_ACTION_ACTIVATE_TAXI = 52, // TaxiID
|
||||
SMART_ACTION_WP_START = 53, // run/walk, pathID, canRepeat, quest, despawntime, reactState
|
||||
|
||||
Reference in new issue
Block a user