5381 Commits

Author SHA1 Message Date
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
KimLS
53d6e4000c Unit tests + cleanup 2013-02-17 13:36:39 -08:00
KimLS
a192e726d4 Merge branch 'master' into shared_mem 2013-02-17 12:32:13 -08:00
KimLS
886fe5cc31 Working on tests, not there yet, added licensing stuff 2013-02-17 12:31:18 -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
KimLS
c734708809 MMFs + a scaled down hash set to use them with 2013-02-17 11:51:32 -08:00
KimLS
1c0f35a945 Way to miss two files KLS - doh 2013-02-17 11:35:50 -08:00
KimLS
06a3873c9b IPC mutex 2013-02-17 11:35:03 -08:00
KimLS
7a2be102aa Exception classes & required C++11 stuff from GCC(still needs to be fixed) 2013-02-17 11:27:43 -08: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
KimLS
b14519b1f5 Derision's revert from svn I missed. 2013-02-16 16:25:57 -08:00
KimLS
da7347f76f svn -> git Migration v0.8.0 2013-02-16 16:14:39 -08:00
Alex
88c9715fb0 Create .gitattributes 2013-02-16 15:00:23 -08:00
Alex
bf990504b0 Create LICENSE.md 2013-02-16 12:16:58 -08:00
Alex
9175ad64ff Create .gitignore 2013-02-16 12:16:31 -08:00
Alex
45a694b64f Create README.md 2013-02-16 12:14:37 -08:00