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

Conflicts:
	changelog.txt

2013-03-19 00:57:15 -04:00

..

azone2

Fixed some warnings, like sprintf %i warnings (converted to %lu), fals vs NULL, etc

2013-03-03 16:17:06 -08:00

defaults

svn -> git Migration

2013-02-16 16:14:39 -08:00

deprecated

svn -> git Migration

2013-02-16 16:14:39 -08:00

EQExtractor2

EQExtractor2: Added SQL generation support for current Live client decoder.

2013-03-17 10:09:13 +00:00

patches

svn -> git Migration

2013-02-16 16:14:39 -08:00

pfs_list

svn -> git Migration

2013-02-16 16:14:39 -08:00

player_profile_set

svn -> git Migration

2013-02-16 16:14:39 -08:00

scripts

svn -> git Migration

2013-02-16 16:14:39 -08:00

sql

Fixed zone crash due to merc focus effects & tribute, merc aggro issues when client in melee range, spell recast timers. Added melee DPS spells/disciplines & support.

2013-03-19 00:53:01 -04:00

TaskMaster

svn -> git Migration

2013-02-16 16:14:39 -08:00

CMakeLists.txt

Removed obsolete cleanipc program

2013-02-24 10:52:52 -08:00