pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-13 14:41:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
283 Commits 88 Branches 159 Tags
Commit Graph

283 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex
d011332647 Merge pull request #38 from SecretsOTheP/master 
Merc Fixes Again
 2013-03-24 01:13:14 -07:00
SecretsOTheP
bc73e9c4e3 Whoops. Fixed a small change I did. 2013-03-24 04:02:47 -04:00
SecretsOTheP
e609ec1df6 Fix for a crash issue related to groups that both PEQ and Armm reported on the forums. 2013-03-24 04:01:49 -04:00
mackal
2073ca8d38 Fixed and cleaned up Client::Escape() 
Fixed SE_FadingMemories to use Client::Escape()
Rogue AA Escape now uses a spell instead of AA Action
Bard AA Fading Memories now only uses the AA Action to eat mana
 2013-03-23 18:34:06 -04:00
SecretsOTheP
a6f2c1be8a Syntax error, better place for entity list removal 2013-03-23 10:13:29 -04:00
SecretsOTheP
18e9714273 Another safeguard against a dangling pointer. 2013-03-23 10:10:03 -04:00
SecretsOTheP
fa18991917 Added a few checks to resolve dangling pointers involving Mercs. Similar to the AIYellForHelp crash fixed years ago by Rogean. 2013-03-23 10:04:49 -04:00
SecretsOTheP
b0b342a020 Merge branch 'master' of https://github.com/SecretsOTheP/Server 
Conflicts:
	common/patches/RoF.cpp
 2013-03-23 05:05:16 -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
SecretsOTheP
abaad22eb4 -Merc upkeep timers fixed to display properly. They now persist through zones as well as save to the database properly. 
-Merc unsuspend timers should now be more reliable across zone shutdown.
 2013-03-23 04:58:03 -04:00
JJ
ac040b5197 Added some pointer checks as discussed in issue #36 2013-03-22 21:48:57 -04:00
badcaptain
9b1a18d9a3 Merge branch 'master' of https://github.com/EQEmu/Server 
Conflicts:
	changelog.txt
 2013-03-22 00:07:22 -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
Derision
c94822a2a1 Merge pull request #37 from mackal/stacking_SE_Limits 
Fixed stacking issues with SE_Limit* (ex. Unholy Aura Discipline and Aur...
 2013-03-21 13:13:14 -07:00
SecretsOTheP
2124b63982 -Fixed a memleak in inviting mercs to group. 
-Fixed a duplicate merc in window bug.
 2013-03-21 00:40:59 -04:00
mackal
886c7bf634 Fixed stacking issues with SE_Limit* (ex. Unholy Aura Discipline and Aura of Reverence) 2013-03-20 23:29:00 -04:00
SecretsOTheP
56825e9ed0 Two crash fixes reported on the forums are hopefully fixed. 2013-03-20 10:46:09 -04:00
SecretsOTheP
925ba2199e Whoops, forgot CMakeLists.txt 2013-03-20 07:19:20 -04:00
SecretsOTheP
fd8650b8a0 Merge branch 'master' of https://github.com/SecretsOTheP/Server 2013-03-20 04:25:34 -04:00
SecretsOTheP
549455b3df Merc message removed. 
VLD removed, oops.
 2013-03-20 04:24:36 -04:00
SecretsOTheP
f90a5b5b71 Merc message removed. 2013-03-20 04:02:33 -04:00
SecretsOTheP
5c76297e5f Merge branch 'master' of https://github.com/EQEmu/Server 2013-03-20 04:01:44 -04:00
SecretsOTheP
cabf8631d4 Fixed mercenary memleaks in AI_Start and Unsuspend. 2013-03-20 04:00:08 -04:00
Derision
6ae8fbc0e4 Initialised some data in Mob/Merc constructors to stop valgrind complaining. 2013-03-19 20:44:22 +00:00
Derision
f32a277643 Fixed memory leak in OP_VeteranRewardsAvailable 2013-03-19 19:22:16 +00:00
badcaptain
09df77b56e Changelog fix. 2013-03-19 01:03:15 -04:00
badcaptain
f5e58e0125 Merge branch 'master' of https://github.com/EQEmu/Server into Mercs 
Conflicts:
	changelog.txt
 2013-03-19 00:57:15 -04:00
badcaptain
660ab53476 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
Derision
5c9f2c0d50 Fixed a couple of memory leaks. 2013-03-18 21:09:23 +00:00
Derision
d036afee5b Fixed missing version parameter in DB select in GetZoneWeather. 2013-03-17 15:52:48 +00:00
SecretsOTheP
4ab7786828 Merge branch 'master' of https://github.com/EQEmu/Server 
Conflicts:
	zone/client_packet.cpp
 2013-03-17 10:14:25 -04:00
Derision
981cabe857 Fixed a couple of merc memory leaks and removed some commented out DumpPacket calls. 2013-03-17 13:52:43 +00:00
SecretsOTheP
8eef122cec Forgot changelog :x 2013-03-17 13:01:54 +00:00
SecretsOTheP
1dc1655891 Hopefully fixed that pesky merc memleak and cleaned up mercs a tad. 2013-03-17 13:01:54 +00:00
SecretsOTheP
0bc942f4d5 Test 2013-03-17 13:01:53 +00:00
SecretsOTheP
9fbf9abd47 Forgot changelog :x 2013-03-17 06:20:12 -04:00
SecretsOTheP
b8170df498 Hopefully fixed that pesky merc memleak and cleaned up mercs a tad. 2013-03-17 06:18:32 -04:00
Derision
d76a8bd34a EQExtractor2: Added SQL generation support for current Live client decoder. 2013-03-17 10:09:13 +00:00
SecretsOTheP
021faf68b3 Merge branch 'master' of https://github.com/EQEmu/Server 2013-03-17 04:52:52 -04:00
Derision
7c264ad097 EQExtractor2 update. 2013-03-16 19:56:09 +00:00
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