Commit Graph

  • 0137a271cc Merge pull request #21 from af4t/master Ludwig 2013-02-28 21:47:07 -08:00
  • 06615bfa10 Merge c054cb3dd08229a97f3ec199e0e3bf57e9636a19 into 5d8af58e57a91245669002ceea249e2b1208a27d #21 Kemmler 2013-02-28 21:38:44 -08:00
  • 5d8af58e57 Oops, it's not a leap year. badcaptain 2013-03-01 00:34:25 -05:00
  • c054cb3dd0 Merge branch 'master' of git://github.com/EQEmu/Server #21 af4t 2013-03-01 00:27:20 -05:00
  • 8640a89323 Undo MAG pet targeting change af4t 2013-03-01 00:23:21 -05:00
  • 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. badcaptain 2013-03-01 00:01:27 -05:00
  • 7237c1f54c Shared Memory changelog + something with CMake to support rvalue refs KimLS 2013-02-27 16:16:20 -08:00
  • 92ed7e694f Merge branch 'master' into shared_mem KimLS 2013-02-26 21:29:34 -08:00
  • ffe24cdfaa Merge pull request #19 from af4t/IHT_LT Alex 2013-02-26 21:29:01 -08:00
  • 89123dd63b Merge 04dfe4512f8354e5aeb62c25083a0ed19661b58c into a95205905ee8a323d188203990faae35a37eaa21 #19 Kemmler 2013-02-26 06:53:21 -08:00
  • 04dfe4512f SK AA Touch of the Wicked should reduce reuse timers for Improved Harm Touch & Leech Touch as well as regular HT. Add to aa_actions with same redux rate as regular HT #19 af4t 2013-02-26 09:48:36 -05:00
  • 2f307b2556 Merge 50c50eb6cb52185a10ef6d141508723ee8743a3d into a95205905ee8a323d188203990faae35a37eaa21 #18 Kemmler 2013-02-26 05:58:39 -08:00
  • 50c50eb6cb SK Touch of the Wicked should reduce timers for Improved Harm Touch & Leech Touch, as well as regular HT. #18 af4t 2013-02-26 08:52:51 -05:00
  • 39e4e7cd2f Merge branch 'master' of git://github.com/EQEmu/Server af4t 2013-02-26 04:36:49 -05:00
  • fabe1b86f4 Merge branch 'SummonedPetTarget' of https://github.com/af4t/Server af4t 2013-02-26 04:31:48 -05:00
  • a95205905e Merge pull request #16 from af4t/TomeFix Alex 2013-02-26 01:09:33 -08:00
  • 8684e3b5ce Merge e48d59b07b2de28ff56ca5e3e7b3da5408a9f529 into 55347aeab63d9fee799410f7ad34510996222ac9 #16 Kemmler 2013-02-26 01:08:51 -08:00
  • 55347aeab6 Merge pull request #17 from af4t/SummonedPetTarget Alex 2013-02-26 01:08:44 -08:00
  • 6a8840d080 Merge 945db17cb828bf9c5acfe5e74e1ea7412604bf14 into 34a4b2ab37578e471cc141073d03bcef179f6c87 #17 Kemmler 2013-02-25 07:54:07 -08:00
  • 945db17cb8 Fix targeting for summoned pets in Mob::DetermineSpellTargets #17 af4t 2013-02-25 10:33:53 -05:00
  • 28a3bcb579 Merge branch 'master' of https://github.com/af4t/Server af4t 2013-02-25 10:16:31 -05:00
  • a9c27af716 Melee tomes named "Skill: ..." can be handed to guildmasters and memorized. af4t 2013-02-25 09:19:07 -05:00
  • 2116aee172 Update summoned pet targeting logic in Mob::DetermineSpellTargets function af4t 2013-02-25 09:56:33 -05:00
  • e48d59b07b Melee tomes named "Skill: ..." can be handed to guildmasters and memorized. #16 af4t 2013-02-25 09:19:07 -05:00
  • aff4d53d7e Fix for sdrawkcab index in skill_caps KimLS 2013-02-24 22:08:10 -08:00
  • 5bb604248f Removed obsolete cleanipc program KimLS 2013-02-24 10:52:52 -08:00
  • 7e63135a3d Fix for linux ipc mutex KimLS 2013-02-24 10:51:04 -08:00
  • 3092286604 Fix for bad data on factions KimLS 2013-02-24 10:33:07 -08:00
  • d42ff6ce19 Merge branch 'master' into shared_mem KimLS 2013-02-23 22:43:24 -08:00
  • 26f965e251 Fix for shared memory loot: both the inconsistent tables and the not loading of tables with no items KimLS 2013-02-23 22:42:40 -08:00
  • 34a4b2ab37 Misc fizes. Derision 2013-02-23 23:12:10 +00:00
  • 9c1159837a Merge branch 'master' into shared_mem KimLS 2013-02-23 15:04:16 -08:00
  • 147c96970c Moved faction stuff around, removed stupid external item status stuff KimLS 2013-02-23 15:03:15 -08:00
  • e7e1b46b36 Set #reloadlevelmods to status 255 Derision 2013-02-23 22:17:19 +00:00
  • 299dc525d0 Set #reloadworld to 255 status Derision 2013-02-23 22:00:43 +00:00
  • 5a69f41f4d Missing EOL KimLS 2013-02-23 13:48:05 -08:00
  • c31b2b65c1 NPC Faction lists to new shared memory scheme KimLS 2013-02-23 13:45:19 -08:00
  • 8937c5be86 Fix for mmf failing on linux (relies on size_ which wasn't init properly on one of the constructors, now is) KimLS 2013-02-23 01:32:05 -08:00
  • 54883b0795 mmf wont lock - programmer can handle that KimLS 2013-02-23 00:48:16 -08:00
  • 39a77a855e Stupid design choice in cppunit fixt -.- KimLS 2013-02-23 00:37:12 -08:00
  • 4c10d4dd2f c++11 linux compile conflicts with perl more KimLS 2013-02-23 00:07:47 -08:00
  • f32048808a c++11 linux compile conflicts with perl KimLS 2013-02-23 00:06:03 -08:00
  • 86c8b11102 IPCMutex needed to be rewritten for Linux due to an annoying limitation of posix semaphores that makes encapping them moronic KimLS 2013-02-22 23:40:16 -08:00
  • 8c425ff9d8 Merge branch 'master' into shared_mem KimLS 2013-02-22 22:36:30 -08:00
  • 1b44123551 Slight cleanup on recent pull req + changing versions up v1.0.0 KimLS 2013-02-22 22:31:07 -08:00
  • 306cf7a5f5 Merge pull request #14 from mackal/xtarget_feign_clear Alex 2013-02-22 22:27:54 -08:00
  • c2308fa739 Merge dd913de1a2b057ccb5bdbe3a782ca00fb5d4cb07 into 60172a780157cb4fbd19ef19f101391e5847fcb1 #14 Michael Cook 2013-02-22 19:28:53 -08:00
  • dd913de1a2 Mobs will now be removed from XTarget when they clear their feign memory aggro #14 mackal 2013-02-22 22:27:03 -05:00
  • 9eaa98675b Shared Memory Loot works KimLS 2013-02-22 18:25:17 -08:00
  • 6f13d0cfbc Partial work on loot tables (non-compiling) KimLS 2013-02-21 22:13:33 -08:00
  • 543ef3fb32 Merge branch 'master' into shared_mem KimLS 2013-02-21 08:58:53 -08:00
  • 60172a7801 Merge pull request #10 from addtheice/master JJ 2013-02-21 02:28:31 -08:00
  • 777a95505c Merge 998cfb6528b86c7241d38a81cde4ce1af0f3a7ee into e0b38cf3cc107e873658e844d07efaabbb3da761 #10 Arthur Ice 2013-02-21 00:12:08 -08:00
  • 998cfb6528 fixed miss spelling of 'recieved' to 'received' in ServerStats and in log messages. #10 Arthur Ice 2013-02-21 00:07:49 -08:00
  • 3e9c2a06a3 Items in shared memory KimLS 2013-02-20 22:36:30 -08:00
  • 0115b18e67 Delete some pointless files KimLS 2013-02-20 15:36:36 -08:00
  • ef9498b03a Got rid of rules global (ugh) and gonna start work on items loading next KimLS 2013-02-20 15:35:46 -08:00
  • 8eb7d0aaa8 Skill caps load with new smem scheme KimLS 2013-02-20 13:54:26 -08:00
  • 12bde7434a Starting on skill caps today KimLS 2013-02-20 11:26:23 -08:00
  • 23dbd00d40 Style + compile option for rvalue-move KimLS 2013-02-19 23:06:00 -08:00
  • f8bae86082 Spells via shared memory work, removal of blah, general fixes KimLS 2013-02-19 22:20:30 -08:00
  • acecff23f4 Almost have spells loaded KimLS 2013-02-19 16:50:05 -08:00
  • 7ce6f4de0d More shared memory work + moved spdat from zone to common KimLS 2013-02-19 15:33:21 -08:00
  • 78b2385785 Merge branch 'master' into shared_mem KimLS 2013-02-19 13:38:12 -08:00
  • e0b38cf3cc World should no longer crash if the start_zone query fails at character creation. Derision 2013-02-19 20:07:53 +00:00
  • 74194cd38c Update .gitignore Alex 2013-02-18 23:07:32 -08:00
  • d4dbf0042e Merge branch 'master' into shared_mem KimLS 2013-02-18 19:26:11 -08:00
  • e36eefc060 EVENT_DEATH changelog KimLS 2013-02-18 19:23:27 -08:00
  • cb01d245e6 EVENT_DEATH for PlayerQuests KimLS 2013-02-18 19:22:07 -08:00
  • 0d16361a40 Working on shared memory stuff - removed some stuff dealing with older code and loading spells from the non-database KimLS 2013-02-18 19:00:07 -08:00
  • 70543c2b8a Merge branch 'master' into shared_mem KimLS 2013-02-18 12:40:27 -08:00
  • 04bad157f5 Merge pull request #5 from mackal/potionbelt Derision 2013-02-18 11:35:52 -08:00
  • 89b16883b5 Merge 357646466ad08f1b03b7e2a083a4cc3af2e2c7b7 into 9680c039f096cc2bf599f6b7d102876c7e0121c5 #5 Michael Cook 2013-02-18 11:23:43 -08:00
  • 357646466a Changelog udpated #5 mackal 2013-02-18 14:22:09 -05:00
  • 11d9838faa Added the item_name field to potionbelt to give the user the Tool Tip mackal 2013-02-18 14:19:20 -05:00
  • 9680c039f0 Charmed pets should no longer be targettable with F8. Charmed pets no longer get a surname of Soandso's Pet. Derision 2013-02-18 18:58:26 +00:00
  • 9f63498a64 Quest Interface wont attempt to keep loading GlobalQuest sub over and over and over... KLS 2013-02-18 09:12:14 -08:00
  • aa20e5b5e3 Issue where not having a global npc quest file may cause the server to crash on bootup Alex 2013-02-18 09:01:49 -08:00
  • c9d4816a88 Garble text for drunk characters. JJ 2013-02-18 02:05:59 -05:00
  • 3feeced884 Chat garbled for drunk characters. joligario 2013-02-17 23:38:51 -05:00
  • edc4b4039b Optional Merc Spells fix for violation of commit rules. KimLS 2013-02-17 22:57:15 -08:00
  • 8cf2ba4235 Merge 8eaac8cfda6d1e291731c27c09c74baea542b0c0 into a41874b6a7e4f0a66942be9a4b3ac943f013aed7 #4 JJ 2013-02-17 22:15:12 -08:00
  • a5ad05f274 Merge branch 'master' into shared_mem KimLS 2013-02-17 22:02:45 -08:00
  • a41874b6a7 Moved merc save data from extended player profile to new merc table, save merc buffs, added cure and rez spells to healer merc. badcaptain 2013-02-18 00:50:19 -05:00
  • 8eaac8cfda Chat garbled for drunk characters. #4 joligario 2013-02-17 23:38:51 -05:00
  • a37211cb83 Forgot to take out my comment code - doh KimLS 2013-02-17 15:40:29 -08:00
  • 4e802921a5 Fix for sub checking on global npc quests KimLS 2013-02-17 15:36:53 -08:00
  • 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 KimLS 2013-02-17 15:22:35 -08:00
  • 53d6e4000c Unit tests + cleanup KimLS 2013-02-17 13:36:39 -08:00
  • a192e726d4 Merge branch 'master' into shared_mem KimLS 2013-02-17 12:32:13 -08:00
  • 886fe5cc31 Working on tests, not there yet, added licensing stuff KimLS 2013-02-17 12:31:18 -08:00
  • 23b2b599a7 Fixed bug where BecomeTrader packets were only being sent to the Trader, not all other clients in the bazaar. Derision 2013-02-17 20:23:34 +00:00
  • c734708809 MMFs + a scaled down hash set to use them with KimLS 2013-02-17 11:51:32 -08:00
  • 1c0f35a945 Way to miss two files KLS - doh KimLS 2013-02-17 11:35:50 -08:00
  • 06a3873c9b IPC mutex KimLS 2013-02-17 11:35:03 -08:00
  • 7a2be102aa Exception classes & required C++11 stuff from GCC(still needs to be fixed) KimLS 2013-02-17 11:27:43 -08:00
  • 07979ce2de Client version is now returned by the stream proxy as a number. Derision 2013-02-17 18:09:31 +00:00
  • d1afad47aa Added optional guildid and minstatus parameters to quest::gmsay(<messsage>, [color], [toworld], [guildid], [minstatus]) Derision 2013-02-17 10:19:12 +00:00
  • 15dc9cfaf4 Some warning fixes, unreferenced local variables. KimLS 2013-02-16 22:07:32 -08:00
  • 7c706d9871 Merge pull request #1 from mackal/master Alex 2013-02-16 20:56:09 -08:00