pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-26 15:37:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/EQEmu/Server into Mercs

Browse Source 
Conflicts:
	changelog.txt
This commit is contained in:
badcaptain
2013-03-19 00:57:15 -04:00
parent 660ab53476 5c9f2c0d50
commit f5e58e0125
28 changed files with 1977 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changelog.txt
+6
View File
@@ -1,9 +1,15 @@
EQEMu Changelog (Started on Sept 24, 2003 15:50)
-------------------------------------------------------
<<<<<<< HEAD
== 03/18/2013 ==
Bad_Captain: Fixed zone crash due to merc focus effects & tribute.
Bad_Captain: Fixed merc aggro issues when client in melee range & spell recast timers.
Bad_Captain: Added melee DPS spells/disciplines & support.
=======
== 03/17/2013 ==
Secrets: Fixed that pesky merc memleak.
Secrets: Bit of code cleanup regarding mercs.
>>>>>>> 5c9f2c0d50ca6920305999d9d3e1127be44238a4
== 03/15/2013 ==
Derision: RoF: Added ENCODE for Resurrect_struct (Accepting a rez should now work).