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

204 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mackal
51896050ed Fix XML Type Declaration in example configs 2013-04-08 17:20:03 -04:00
JJ
88b9f96b91 Attempting manual merge for Nature's Bounty 2013-04-06 08:23:09 -04:00
JJ
b2d5ad6904 Merge pull request #46 from mackal/pet_fixes_again 
Switched rest of pet messages to MT_PetResponse
 2013-04-05 17:16:19 -07:00
mackal
20f086dc37 Switched rest of pet messages to MT_PetResponse 
Overloaded Mob::Say_StringID with a version that takes a message type
 2013-04-03 16:09:44 -04:00
badcaptain
6fa93f243f Merged from Master & changelog. 2013-04-02 19:17:28 -04:00
badcaptain
15e31d1c03 Merge branch 'master' of https://github.com/EQEmu/Server 2013-04-02 19:10:18 -04:00
badcaptain
a787a7ce72 Fixed Merc lack of use of heal over time spells (causing excessive healing), fixed pet mitigation/AC issues. 2013-04-02 19:09:32 -04:00
JJ
989d132423 Merge pull request #45 from mackal/aa_fix 
Bards can now use instant cast AAs while singing (Fading Memories, Boast...
 2013-04-01 15:49:19 -07:00
KimLS
757fc01b78 Patch for: 
-Perl blessing of exported variables is causing the SVs to be overwritten but never freed by the Perl GC.  I'm not sure if this is a feature or a bug in Perl as the documentation sucks.

Addressed by setting the blessed SVs in question to be undefined at the end of every script.  Caused a noticeable drop in memory for zones with a lot of quest events firing but it's probably not perfect.
 2013-04-01 14:23:54 -07:00
mackal
353d7cede0 Bards can now use instant cast AAs while singing (Fading Memories, Boastful Bellow) 
AA reuse timers now start before the spell is cast and reset upon failure or canceling
 2013-04-01 17:19:45 -04:00
Derision
fb0add070b Merge pull request #43 from mackal/pet_fixes 
Fix pet message to use StringIDs, most should be correct related to pet ...
 2013-03-31 04:06:16 -07:00
mackal
96b42ed86f Fix pet message to use StringIDs, most should be correct related to pet "saying" or just the client getting a message 
Added the pet taunting message
 2013-03-30 22:57:20 -04:00
JJ
2dde4dce12 Merge pull request #42 from SecretsOTheP/master 
Potential fix for a Merc deconstructor crash.
 2013-03-26 18:15:50 -07:00
SecretsOTheP
c7ff207017 Made Merc::AddMercToGroup handle cleaning up old groups as opposed to doing it in each location before AddMercToGroup. This should fix cases where the Merc's owner is invalid and being referenced, which causes the crash located in: 
http://www.eqemulator.org/forums/showthread.php?t=36670&page=2
 2013-03-25 13:07:58 -04:00
SecretsOTheP
23820a369e Moved around some data in Mercs to help prevent another crash... dunno if it actually will fix it but it can't hurt >_< 2013-03-24 18:08:03 -04:00
JJ
24d4eaf65d Merge pull request #41 from SecretsOTheP/master 
Merc Group Crash Fix
 2013-03-24 11:56:06 -07:00
SecretsOTheP
e0b05e573e Merc group/depop crash fixes. 2013-03-24 14:31:03 -04:00
JJ
e2b9efaf49 Fixed SQL 2013-03-24 08:36:53 -04:00
JJ
349eb371c6 Merge pull request #40 from af4t/master 
Fix typos in utils/sql/git/required/2013_03_23_Escape_FadingMemories.sql
 2013-03-24 05:20:29 -07:00
af4t
afe3ba40cf Fix typos 2013-03-24 08:14:50 -04:00
Alex
5e618a1ca4 Merge pull request #39 from mackal/Fade_Escape_Fix 
Fixed and cleaned up Client::Escape()
 2013-03-24 01:13:54 -07:00
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