af4t
|
6646c49407
|
Merge branch 'infuriate'
|
2013-04-05 09:17:15 -04:00 |
|
SecretsOTheP
|
8e604fd3db
|
Merge branch 'master' of https://github.com/EQEmu/Server
Conflicts:
zone/client_packet.cpp
zone/merc.cpp
zone/npc.cpp
|
2013-03-23 05:02:27 -04:00 |
|
badcaptain
|
a20c7735e8
|
Fixed merc buffing bugs, added checks before dismissing merc to prevent possible bugged mercs, merged in Secret's merc memory leak fixes.
|
2013-03-22 00:03:50 -04:00 |
|
SecretsOTheP
|
56825e9ed0
|
Two crash fixes reported on the forums are hopefully fixed.
|
2013-03-20 10:46:09 -04:00 |
|
SecretsOTheP
|
cabf8631d4
|
Fixed mercenary memleaks in AI_Start and Unsuspend.
|
2013-03-20 04:00:08 -04:00 |
|
Sorvani
|
0c14f5a470
|
initial ifuritate (AE Enrage) implmentation
This is not working yet as it is not actually calling a timer yet.
|
2013-03-15 11:56:03 -05:00 |
|
Derision
|
0ad1044b2e
|
Added some error logging into ZoneDatabase::NPCSpawnDB for #npcspawn create
|
2013-03-09 20:13:11 +00:00 |
|
KimLS
|
147c96970c
|
Moved faction stuff around, removed stupid external item status stuff
|
2013-02-23 15:03:15 -08:00 |
|
KimLS
|
7ce6f4de0d
|
More shared memory work + moved spdat from zone to common
|
2013-02-19 15:33:21 -08:00 |
|
KimLS
|
0d16361a40
|
Working on shared memory stuff - removed some stuff dealing with older code and loading spells from the non-database
|
2013-02-18 19:00:07 -08:00 |
|
Derision
|
9680c039f0
|
Charmed pets should no longer be targettable with F8. Charmed pets no longer get a surname of Soandso's Pet.
|
2013-02-18 18:58:26 +00:00 |
|
KimLS
|
da7347f76f
|
svn -> git Migration
|
2013-02-16 16:14:39 -08:00 |
|