pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-11 16:51:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
12,443 Commits 88 Branches 159 Tags
Commit Graph

12443 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Derision
810fdf3cca Resurrection - Fix for RoF + fixed a couple of memory leaks. 2013-03-15 19:37:29 +00:00
SecretsOTheP
c301b30c3a Merge branch 'master' of https://github.com/EQEmu/Server 
Conflicts:
	zone/client_packet.cpp
 2013-03-15 03:32:43 -04:00
SecretsOTheP
735b4181fa Test 2013-03-15 03:27:45 -04:00
badcaptain
a14fecaf78 Forgot to remove debugging. 2013-03-14 23:13:49 -04:00
badcaptain
e12b06a9ad Merge branch 'master' of https://github.com/EQEmu/Server 2013-03-14 23:03:39 -04:00
badcaptain
9a82875ad4 Forgot changelog. 2013-03-14 22:56:45 -04:00
JJ
0b0ee921a5 Fix for hatelist random missing last member on hatelist. 2013-03-14 20:42:02 -04:00
badcaptain
7109a40637 Merge branch 'master' of https://github.com/EQEmu/Server 2013-03-14 20:03:48 -04:00
badcaptain
0a805feeec Fixed Merc spell recast timers, changed how Mercs add mobs to their hate lists (should prevent IsEngaged() issues), initial Caster DPS Merc spell casting AI, initial Merc stance implementation, Mercs now suspend when their owner dies to prevent them being bugged (until it can be fixed), added 2 seconds between spell casts to be live-like. 2013-03-14 19:51:29 -04:00
Derision
9fdb6862f8 Updated comment in Handle_OP_ItemPreview 2013-03-10 20:41:09 +00:00
Derision
e53ae5f6d5 More compiler warning fixes. 2013-03-10 18:55:18 +00:00
Derision
0ad1044b2e Added some error logging into ZoneDatabase::NPCSpawnDB for #npcspawn create 2013-03-09 20:13:11 +00:00
Derision
64c53fe37b Merge pull request #29 from addtheice/master 
consts on char*'s to remove the deprecation of const string to char* warning
 2013-03-09 11:55:11 -08:00
Arthur Ice
faa93c3739 Added some consts to remove 'deprecated string to char*' warnings. 2013-03-09 10:52:25 -08:00
Derision
0e6272e6d8 Removed _log message from zone/CatchSignal on Linux as it can deadlock on shutdown if another signal is received while the _log call is being processed. 2013-03-09 13:31:54 +00:00
Derision
c363261d00 Fix from Zaela_S to stop mobs aggroing on dead players when using RespawnFromHover. 2013-03-09 13:18:36 +00:00
KimLS
a2500ff814 Fix for DBCore crash 2013-03-08 18:07:28 -08:00
JJ
2af6e8cd16 Merge pull request #28 from af4t/master 
Melee tomes named "Skill:  ", again
 2013-03-08 08:42:54 -08:00
af4t
eb1e88b38c Reword blurbs in changelog.txt. 2013-03-07 23:33:21 -05:00
af4t
c81549a441 Melee tomes named "Skill: ...": had overlooked learn-by-right-click, updated. 2013-03-07 09:42:16 -05:00
KimLS
adf42c8750 Changed some stuff to keep it consistent with old behavior: was seeing crashes related to ptimers on peq. 2013-03-06 11:19:44 -08:00
Alex
2ee8e17ac0 Merge pull request #27 from af4t/master 
Fix NPCs aggro each other from beneficial spells
 2013-03-05 23:06:52 -08:00
Alex
f7469412f1 Merge pull request #23 from addtheice/master 
Fixed missing include that blocked compile on linux.
 2013-03-05 23:05:27 -08:00
af4t
55a72c86cf Merge branch 'master' of https://github.com/af4t/Server 
Conflicts:
	zone/spells.cpp
 2013-03-05 16:22:22 -05:00
af4t
a80eb397d5 Stop NPCs from aggroing each other with buffs/beneficial spells. 2013-03-05 16:19:46 -05:00
af4t
7926362ab5 Stop NPCs from aggroing each other with buffs/beneficial spells. 2013-03-05 15:44:05 -05:00
Derision
7af51ff346 Merge pull request #24 from af4t/master 
Forgot to update changelog.txt earlier
 2013-03-04 12:56:32 -08:00
Derision
c8ca362eba Few minor issues highlighted by cppcheck/valgrind. 2013-03-04 19:15:07 +00:00
af4t
4964c17abb Forgot to update changelog.txt earlier 2013-03-04 13:08:53 -05:00
Arthur Ice
0c6eee6d81 More warning clean ups (NULL to 0 on int, sprintf flags, typedef on enum) 2013-03-03 21:45:46 -08:00
Arthur Ice
950f00fae6 Fixed some warnings, like sprintf %i warnings (converted to %lu), fals vs NULL, etc 2013-03-03 16:17:06 -08:00
Arthur Ice
d8628170b5 Fixed missing include that blocked compile on linux. 2013-03-03 15:26:40 -08:00
Arthur Ice
68338dace1 Merge branch 'master' of git://github.com/EQEmu/Server 2013-03-03 15:22:52 -08:00
Derision
af1f87a00f Fixed uninitialised variabled tempBot in #bot stance command (cppcheck) 2013-03-03 22:26:57 +00:00
Derision
9a47e79e8e Fixed memleak in Client::Handle_OP_MercenaryDataRequest (cppcheck) 2013-03-03 22:22:04 +00:00
Derision
aceaba0fb0 Fixed uninitialised mercOwner highlighted by cppcheck. 2013-03-03 22:12:14 +00:00
Arthur Ice
e0887d81aa Merge branch 'master' of git://github.com/EQEmu/Server 2013-03-03 13:02:36 -08:00
Derision
ff9e4e0780 Merge pull request #22 from addtheice/master 
just removed a duplicate GNU License in test main
 2013-03-02 12:30:26 -08:00
Arthur Ice
6a4f61d3a3 Merge branch 'master' of git://github.com/EQEmu/Server 2013-03-02 12:01:01 -08:00
Arthur Ice
c8da17c664 Deleted the old and duplicated GNU license text 2013-03-02 11:58:39 -08:00
badcaptain
7c34a89ec5 Fixed Merc depop bug, added merc rest regen, fixed merc group spell casting bug where mercs would continue to try to cast group buffs on pets of caster who didn't have Pet Affinity AA. 2013-03-02 01:07:18 -05:00
Alex
da4cddf1ef Update README.md 2013-03-01 16:45:10 -08:00
KimLS
9262c0895f Merge branch 'master' of https://github.com/EQEmu/Server 2013-02-28 22:33:31 -08:00
KimLS
b5405c35e2 Tests fix + fix for certain factions not loading 2013-02-28 22:33:20 -08:00
Ludwig
0137a271cc Merge pull request #21 from af4t/master 
Undo MAG pet targeting change.
 2013-02-28 21:47:07 -08:00
badcaptain
5d8af58e57 Oops, it's not a leap year. 2013-03-01 00:34:25 -05:00
af4t
c054cb3dd0 Merge branch 'master' of git://github.com/EQEmu/Server 2013-03-01 00:27:20 -05:00
af4t
8640a89323 Undo MAG pet targeting change 2013-03-01 00:23:21 -05:00
badcaptain
ea72975e69 Fixed Merc duplicate save bug, focus items, spell_scale and heal_scale now work implemented, new merc equipment (with focus items), added checks during merc hire, unsuspend, & timer update for states where a merc can't be hired, unsuspended, or can't be retained due to insufficient funds, no room in group, in raid, invalid merc data, etc, and give appropriate feedback, added rules for charging of merc purchase and upkeep costs. 2013-03-01 00:01:27 -05:00
KimLS
7237c1f54c Shared Memory changelog + something with CMake to support rvalue refs 2013-02-27 16:16:20 -08:00