Merge git://github.com/EQEmu/Server into Development

Conflicts:
	changelog.txt
	common/eq_packet_structs.h
	common/patches/underfoot_structs.h
	common/spdat.h
	zone/effects.cpp
	zone/mob.cpp
	zone/spells.cpp
This commit is contained in:
KayenEQ
2014-11-10 10:22:50 -05:00
4 changed files with 11 additions and 5 deletions
+1
View File
@@ -5,6 +5,7 @@ EQEMu Changelog (Started on Sept 24, 2003 15:50)
Kayen: Implemented support for spell target type (45) 'Target Rings' on Underfoot (does work earlier expansions)
Thanks to Lecht for figuring out the op_code side.
Implement new Live-like faction adjustment message using rule Client:UseLiveFactionMessage.
JJ: Implement new Live-like faction adjustment message using rule Client:UseLiveFactionMessage.
Optional SQL: utils/sql/git/optional/2014_11_09_LiveFactionMessages.sql
== 11/06/2014 ==