Commit Graph
93 Commits
Author SHA1 Message Date
JJ 33c7016a0e Simple spelling fix. [skip ci] 2016-02-04 19:17:17 -05:00
JJ 947145a642 Oops. [skip ci] 2015-07-04 12:12:18 -04:00
JJ fe98b3363d Filename consistency. [skip ci] 2015-07-04 12:10:58 -04:00
JJ 56b57d2ca6 Fix moving character to zone using character id and zone name. (bheam) 2015-06-30 20:05:35 -04:00
JJ aaca6fd2d9 Merge pull request #416 from hateborne/master
Making $npc->RemoveFromHateList actually work
2015-05-25 11:20:37 -04:00
JJ f68952c168 Update to some spell duration formulas (Shendare).
Filename fixes.
2015-05-08 22:23:50 -04:00
JJ 690274338d Merge pull request #406 from noudess/master
Beginnings of fix to SendBuffDuration.
2015-05-02 10:15:21 -04:00
JJ 47c9690a32 Don't garble # commands. 2015-04-25 11:46:43 -04:00
JJ de57c94d3e Blocked spell negation fix. 2015-04-23 18:42:17 -04:00
JJ 23dd560a72 Don't delete packet when it is still referenced. Create a new packet instead for deconfliction. 2015-04-20 19:48:52 -04:00
JJ 0d4775a9df Adjust to safe_delete packets. 2015-04-07 19:57:36 -04:00
JJ 0321bf72a5 Attempt to catch rare crash in zoneserver process. See http://www.eqemulator.org/forums/showthread.php?t=39549 2015-04-07 10:22:47 -04:00
JJ 4dcb679c53 Manual merge of #387. 2015-03-27 16:40:02 -04:00
JJ 3b9f62f0a1 Exported ReloadZoneStaticData to perl and lua.
Usage:
(perl) quest::reloadzonestaticdata();
(lua) eq.reloadzonestaticdata();
2015-03-18 02:49:00 -04:00
JJ 318a664b09 No "sigs". [skip ci] 2015-02-23 19:57:47 -05:00
JJ eff818ca42 Manual merge of #376 for Erudite starting zones. 2015-02-21 20:46:19 -05:00
JJ edbd055277 Revert b96e5a7f4d to search for better fix. 2015-02-07 17:27:48 -05:00
JJ b96e5a7f4d Group leader is not always member 0. 2015-02-05 19:18:51 -05:00
JJ 6c982179bc Merge pull request #358 from noudess/master
Repair min/max faction issues.
2015-02-01 20:59:23 -05:00
JJ 96925f0dde Some minor cleanup. [skip ci] 2015-01-31 17:03:44 -05:00
JJ 17d276cd4e Finish proper SQL. [skip ci] 2015-01-31 15:22:03 -05:00
JJ fab3a988ae Remove specified user/database. [skip ci] 2015-01-26 21:26:01 -05:00
JJ 6a43fd3b45 Merge pull request #351 from noudess/master
Repair Faction System Messaging
2015-01-26 20:55:17 -05:00
JJ a84f480ffc ... and lang. 2015-01-20 15:51:00 -05:00
JJ ee108b5b74 Skill gain logging fix. (iluvseq) 2015-01-20 15:33:26 -05:00
JJ 52eb287082 Update to 6535690a69 to make explicit #include rather than implicit. 2015-01-19 11:00:05 -05:00
JJ 5465d76d20 VS would like us to return values. 2015-01-18 19:48:32 -05:00
JJ 8cde35ca88 Merge pull request #342 from addtheice/data_bundling2
Looks fine on initial review.
2015-01-18 18:04:33 -05:00
JJ c471fbe38f Merge pull request #341 from af4t/master
MS Visual Studio vs. position.cpp
2015-01-18 10:57:38 -05:00
JJ 2f32950364 Fix in npc save feature sql. (iluvseq) 2015-01-14 18:32:53 -05:00
JJ 6717014601 Lua declaration as well... 2015-01-06 16:10:29 -05:00
JJ 364f2f6bf8 Forgot prototype declaration from previous commit. Also fix corruption declaration. 2015-01-06 15:09:18 -05:00
JJ cde406a496 Add PhR to #showstats and a few places that can/should be implemented in the future. 2015-01-06 13:51:36 -05:00
JJ fc544e164c Update default npc_types values for previous NULL entries. 2014-12-31 20:53:12 -05:00
JJ 905961d278 Linux fix for Mob type in AA_SwarmPetInfo. 2014-12-15 11:06:53 -05:00
JJ 2e8d7b09af Temp merchant items could duplicate slots also... 2014-11-16 19:04:15 -05:00
JJ 5434c47d1f Merge pull request #291 from KayenEQ/Development
Support for spell field to determine if a spell can be blocked or not.
2014-11-14 07:31:39 -05:00
JJ 8c8cec29d4 Merge pull request #290 from KayenEQ/Development
Implemented target type (44) Beams
2014-11-13 22:38:19 -05:00
JJ 9c22de9eb2 Not an error if there isn't merchant data to load... 2014-11-12 19:50:53 -05:00
JJ dd869695c4 Merge pull request #288 from KayenEQ/Development
optimization for how do endurance upkeep for discs
2014-11-12 04:41:07 -05:00
JJ 793487b825 Yellow faction messages. 2014-11-10 22:11:23 -05:00
JJ 0370156179 Fix changelog. [skip ci] 2014-11-10 10:52:17 -05:00
JJ 39cab761eb Merge pull request #287 from KayenEQ/Development
Implemented support for using target rings from item clicks
2014-11-10 10:39:29 -05:00
JJ d5efa0f23c Manual merge of TargetRing pull request #286. 2014-11-10 10:00:53 -05:00
JJ 384d8c6167 Merge pull request #285 from addtheice/legacy_removal
Removed two unused functions
2014-11-10 00:47:55 -05:00
JJ d23608964e Implement new Live-like faction adjustment message through optional rule. 2014-11-09 23:54:01 -05:00
JJ 38f1e8847c Make output of GetCharactersInInstance for perl more user-friendly. 2014-11-03 12:35:07 -05:00
JJ 385d70b294 Merge pull request #279 from KayenEQ/Development
Minor code and warning fixes.
2014-11-02 22:01:03 -05:00
JJ 4bd41b3678 Export of additional instance functions to perl as per #128.
Change QuestManager RemoveAllFromInstance function to use existing function to remove all clients from instance.
2014-11-02 20:43:47 -05:00
JJ a9f7af59a2 Merge pull request #277 from KayenEQ/Development
Few more minor compiler warnings and code clean up.
2014-11-02 09:00:23 -05:00
JJ 5decde0af9 (RicardoCampos) End looting before zoning. 2014-11-02 00:10:19 -04:00
JJ 3620ac4eaf Merge pull request #276 from KayenEQ/Development
Fixed compiler warnings and clean up of some code in spell_effects.cpp
2014-11-01 23:34:03 -04:00
JJ 43e906e3c8 Manual merge of new faction system (#256).
Clean up some personal signatures.
2014-11-01 23:27:23 -04:00
JJ acab4dd443 Fix for duplicate merchant items when same merchant types are in same spawngroup. 2014-11-01 13:37:06 -04:00
JJ 6028dbb4e5 hateborne: grid assign match fix. 2014-10-15 22:31:44 -04:00
JJ fc8cb2b5b7 Manual merge of 4e3826228d in #269. 2014-10-15 22:12:57 -04:00
JJ 594657f2c7 Manual merge for 0c3e51963b in pull request #269. 2014-10-15 22:08:27 -04:00
JJ 09e1155a26 Merge pull request #261 from addtheice/RunQueryToDatabaseQuery_common_shareddb
Run query to database query common shareddb
2014-10-15 21:37:33 -04:00
JJ ea4c23efcf Establish default order for merchantlist items.
Allow merchants to use 80th slot.
2014-10-09 23:11:18 -04:00
JJ 28ac586ed8 Update info for #suspend 2014-10-09 00:23:54 -04:00
JJ 66448feece Some updates to #command information. 2014-10-05 21:42:33 -04:00
JJ c3035fdf41 Merge branch 'master' of https://github.com/EQEmu/Server 2014-09-21 20:03:09 -04:00
JJ e34c47414f Consistent directory locations under common. 2014-09-21 20:02:01 -04:00
JJ 16d47a2c47 Revert accident in 089360a3a5. Looks like it was meant for 7-10 instead of 4-10. 2014-08-22 22:28:40 -04:00
JJ a96784aa18 Minor typos. 2014-07-09 19:19:51 -04:00
JJ 5c0a75071c SQL file rename (added '0') 2014-05-05 21:18:08 -04:00
JJ 5af0cb2844 Merge pull request #148 from KayenEQ/AAupdates
SlowMItigation sql fix
2014-05-05 09:58:06 -04:00
JJ 5f02de1c95 Remove db name from sql. 2014-02-13 21:14:05 -05:00
JJ 9fff694382 Update per discussion on bfb17a2fb5 2013-12-19 19:39:34 -05:00
JJ 4512326fe8 Merge pull request #98 from KayenEQ/fixes
Spell effect additions... (will update further per notes)
2013-12-19 16:30:11 -08:00
JJ 37cacd27b1 Changed enable/disable recipe to confirm change made. 2013-12-14 09:55:46 -05:00
JJ 02c9007765 Bandaid fix to CopyCharacter function. 2013-12-02 22:20:46 -05:00
JJ 4c6fce5d5c Add a little more debug info to MQGate hack detection. 2013-11-15 19:31:43 -05:00
JJ b99d476754 Change INSERT to REPLACE 2013-11-13 21:59:38 -05:00
JJ da3ba12560 Fix for #npcedit qglobal 2013-11-06 21:12:57 -05:00
JJ b8d1838dcc Added in-game commands to enable/disable tradeskill recipes
-Commands: #enablerecipe recipe_id, #disablerecipe recipe_id
-Perl: quest::enablerecipe(recipe_id), quest::disablerecipe(recipe_id)
-Lua: eq.enable_recipe(recipe_id), eq.disable_recipe(recipe_id)
2013-11-01 23:55:17 -04:00
JJ aba535b589 Merge pull request #87 from Leere/recipe_disable
Add the ability to disable a tradeskill recipe
2013-11-01 08:33:13 -07:00
JJ 549dfc9781 Allow use of Go Home button when Tutorial still selected in RoF. 2013-10-11 22:40:49 -04:00
JJ 8327f22f6f Revert change to EnterWorldPacket introduced on 22 April 2013 to fix inability to enter Tutorial or Go Home from character select screen. 2013-10-10 22:38:23 -04:00
JJ a7ce66856b Fix rare case where heals from buffs could be negative. 2013-04-20 14:04:08 -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
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
JJ 2dde4dce12 Merge pull request #42 from SecretsOTheP/master
Potential fix for a Merc deconstructor crash.
2013-03-26 18:15:50 -07:00
JJ 24d4eaf65d Merge pull request #41 from SecretsOTheP/master
Merc Group Crash Fix
2013-03-24 11:56:06 -07: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
JJ ac040b5197 Added some pointer checks as discussed in issue #36 2013-03-22 21:48:57 -04:00
JJ 0b0ee921a5 Fix for hatelist random missing last member on hatelist. 2013-03-14 20:42:02 -04:00
JJ 2af6e8cd16 Merge pull request #28 from af4t/master
Melee tomes named "Skill:  ", again
2013-03-08 08:42:54 -08:00
JJ 60172a7801 Merge pull request #10 from addtheice/master
Addtheice: Spelling fixes
2013-02-21 02:28:31 -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