56 Commits

Author SHA1 Message Date
Kemmler
2f307b2556 Merge 50c50eb6cb52185a10ef6d141508723ee8743a3d into a95205905ee8a323d188203990faae35a37eaa21 2013-02-26 05:58:39 -08:00
af4t
50c50eb6cb SK Touch of the Wicked should reduce timers for Improved Harm Touch & Leech Touch, as well as regular HT. 2013-02-26 08:52:51 -05:00
af4t
39e4e7cd2f Merge branch 'master' of git://github.com/EQEmu/Server 2013-02-26 04:36:49 -05:00
af4t
fabe1b86f4 Merge branch 'SummonedPetTarget' of https://github.com/af4t/Server 2013-02-26 04:31:48 -05:00
Alex
a95205905e Merge pull request #16 from af4t/TomeFix
Melee tomes named "Skill: ..." can be handed to guildmasters and memoriz...
2013-02-26 01:09:33 -08:00
Alex
55347aeab6 Merge pull request #17 from af4t/SummonedPetTarget
Fix targeting for summoned pets in Mob::DetermineSpellTargets
2013-02-26 01:08:44 -08:00
af4t
945db17cb8 Fix targeting for summoned pets in Mob::DetermineSpellTargets 2013-02-25 10:38:03 -05:00
af4t
28a3bcb579 Merge branch 'master' of https://github.com/af4t/Server 2013-02-25 10:16:31 -05:00
af4t
a9c27af716 Melee tomes named "Skill: ..." can be handed to guildmasters and memorized. 2013-02-25 10:10:21 -05:00
af4t
2116aee172 Update summoned pet targeting logic in Mob::DetermineSpellTargets function 2013-02-25 09:56:33 -05:00
af4t
e48d59b07b Melee tomes named "Skill: ..." can be handed to guildmasters and memorized. 2013-02-25 09:19:07 -05:00
Derision
34a4b2ab37 Misc fizes. 2013-02-23 23:12:10 +00:00
Derision
e7e1b46b36 Set #reloadlevelmods to status 255 2013-02-23 22:17:19 +00:00
Derision
299dc525d0 Set #reloadworld to 255 status 2013-02-23 22:00:43 +00:00
KimLS
1b44123551 Slight cleanup on recent pull req + changing versions up v1.0.0 2013-02-22 22:31:07 -08:00
Alex
306cf7a5f5 Merge pull request #14 from mackal/xtarget_feign_clear
Mobs will now be removed from XTarget when they clear their feign memory
2013-02-22 22:27:54 -08:00
mackal
dd913de1a2 Mobs will now be removed from XTarget when they clear their feign memory aggro 2013-02-22 22:27:03 -05:00
JJ
60172a7801 Merge pull request #10 from addtheice/master
Addtheice: Spelling fixes
2013-02-21 02:28:31 -08:00
Arthur Ice
998cfb6528 fixed miss spelling of 'recieved' to 'received' in ServerStats and in log messages. 2013-02-21 00:07:49 -08:00
Derision
e0b38cf3cc World should no longer crash if the start_zone query fails at character creation. 2013-02-19 20:07:53 +00:00
Alex
74194cd38c Update .gitignore 2013-02-18 23:07:32 -08:00
KimLS
e36eefc060 EVENT_DEATH changelog 2013-02-18 19:23:27 -08:00
KimLS
cb01d245e6 EVENT_DEATH for PlayerQuests 2013-02-18 19:22:07 -08:00
Derision
04bad157f5 Merge pull request #5 from mackal/potionbelt
Potionbelt Tooltip
2013-02-18 11:35:52 -08:00
mackal
357646466a Changelog udpated 2013-02-18 14:22:09 -05:00
mackal
11d9838faa Added the item_name field to potionbelt to give the user the Tool Tip 2013-02-18 14:19:20 -05: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
KLS
9f63498a64 Quest Interface wont attempt to keep loading GlobalQuest sub over and over and over... 2013-02-18 09:12:14 -08:00
Alex
aa20e5b5e3 Issue where not having a global npc quest file may cause the server to crash on bootup 2013-02-18 09:01:49 -08:00
JJ
c9d4816a88 Garble text for drunk characters. 2013-02-18 02:21:34 -05:00
joligario
3feeced884 Chat garbled for drunk characters. 2013-02-18 01:59:43 -05:00
KimLS
edc4b4039b Optional Merc Spells fix for violation of commit rules. 2013-02-17 22:57:15 -08:00
badcaptain
a41874b6a7 Moved merc save data from extended player profile to new merc table, save merc buffs, added cure and rez spells to healer merc. 2013-02-18 00:50:19 -05:00
KimLS
a37211cb83 Forgot to take out my comment code - doh 2013-02-17 15:40:29 -08:00
KimLS
4e802921a5 Fix for sub checking on global npc quests 2013-02-17 15:36:53 -08:00
KimLS
c6d8895b70 One fix to QuestParserCollection for global npc quests, HasSub is not working at all right with it. Need to check it out later tonight 2013-02-17 15:22:35 -08:00
Derision
23b2b599a7 Fixed bug where BecomeTrader packets were only being sent to the Trader, not all other clients in the bazaar. 2013-02-17 20:23:34 +00:00
Derision
07979ce2de Client version is now returned by the stream proxy as a number. 2013-02-17 18:09:31 +00:00
Derision
d1afad47aa Added optional guildid and minstatus parameters to quest::gmsay(<messsage>, [color], [toworld], [guildid], [minstatus]) 2013-02-17 10:19:12 +00:00
KimLS
15dc9cfaf4 Some warning fixes, unreferenced local variables. 2013-02-16 22:07:32 -08:00
Alex
7c706d9871 Merge pull request #1 from mackal/master
AA reuse timer fix and Update filter system
2013-02-16 20:56:09 -08:00
KimLS
0a9642e776 utils/sql/git added 2013-02-16 18:05:41 -08:00
mackal
20fb899d5d Merge branch 'master' of https://github.com/EQEmu/Server.git 2013-02-16 20:21:53 -05:00
mackal
38d4fbc863 Remove old filters and change all remaining old to new (Also fix Auction filtering out OOC as well due to incorrect define) 2013-02-16 20:14:07 -05:00
KimLS
b6010afa9c Ignore all files in dependencies. 2013-02-16 16:55:04 -08:00
mackal
234cd0c4ff Merge remote-tracking branch 'upstream/master' 2013-02-16 19:53:51 -05:00
mackal
a510d2593f Update change log 2013-02-16 19:50:19 -05:00
KimLS
0aa958de8f Moved queryserv sql to svn so I can more easily have a git section without confusion 2013-02-16 16:47:28 -08:00
mackal
07950b7a58 Fix calc of resuse timers on multi-rank AAs 2013-02-16 19:47:12 -05:00
Alex
710554efcd Update .gitignore 2013-02-16 16:37:14 -08:00