Commit Graph

6489 Commits

Author SHA1 Message Date
regneq 9841ca233d Merge pull request #6 from EQEmu/master
Fix for bug in clearance() world method
2017-04-16 21:13:41 -07:00
KimLS be2d65609b Fix for bug in clearance() world method 2017-04-16 21:06:05 -07:00
regneq 999677d314 Merge pull request #5 from EQEmu/master
eqmeu merge
2017-04-16 18:50:03 -07:00
KimLS 7fb3eaed65 Reduce travis threads 2017-04-16 18:44:12 -07:00
KimLS e0c9b6ded5 Change travis 2017-04-16 18:32:32 -07:00
KimLS 633b7e2a6c Added changelog for eqstream 2017-04-16 17:58:10 -07:00
KimLS cebda984b6 Sleep longer when zone not booted 2017-04-15 13:55:26 -07:00
KimLS 004c0f7858 Merge fix 2017-04-15 12:18:50 -07:00
Michael Cook (mackal) 7cedbb0b16 Take into account world object's item if it has one for TS
This might break some pre-existing combines ...
2017-04-15 14:31:36 -04:00
E Spause 1f065d7d3d Woops 2017-04-15 13:06:56 -04:00
E Spause cb8c3595b7 SoF-era con system. New rule, UseOldConSystem to disable this functionality. 2017-04-15 13:06:46 -04:00
KimLS 984b50504c Change zone timer resolutions based on zone having players or not 2017-04-14 16:59:37 -07:00
KimLS eec6687083 Modified default values a bit to be more agggressive 2017-04-14 16:24:29 -07:00
KimLS 6596dfeeba Tweaks to how resend is calculated to help our friends with smoke signal connections 2017-04-13 19:40:58 -07:00
Akkadius 989a638693 Merge pull request #608 from spdkils/BotXTarget
Adding AutoXTarget for bot owner when hate is added to bot's owner.
2017-04-13 18:20:28 -05:00
Akkadius 15f8683530 Merge pull request #606 from spdkils/master
** Fix for groups with multiple players and bots.
2017-04-13 18:13:56 -05:00
Unknown 21d3e5afac Adding AutoXTarget for bot owner when hate is added to bot's owner.
Bots did not add XTargets, but add hate to client(). This ensures when bots generate hate for client() they also add the mob to the XTarget of the owning Client().
2017-04-13 16:05:10 -07:00
Michael Cook (mackal) 1e61252445 Whoops 2017-04-13 13:28:18 -04:00
Michael Cook (mackal) 53978f0ef9 Exclude client pets from MQ2 target detection
Probably could use some PVP rules but what do I know :P
2017-04-13 13:27:55 -04:00
Michael Cook (mackal) 3098b11080 Limit scale check to only scaling items 2017-04-13 13:26:51 -04:00
Michael Cook (mackal) 6b8c39d388 Disable charm clicks at <= 0 2017-04-13 13:23:53 -04:00
Akkadius 474f59e269 Re-add variable client aggro scanning timers missing from merge 2017-04-12 16:44:49 -05:00
Akkadius fac75b6f16 Fix merge issue with Marquee check 2017-04-12 16:26:16 -05:00
Allen f88a6774a9 ** Fix for groups with multiple players and bots.
*  Fixes non-group leaders zoning with their bots.
*  Fixes non-bot owners attempting to load bots they don't own.
*  Sets bots that zone to follow owner not group leader.
*  Updates database call only load bots in group you own.
*  Tested on server 2 clients, 4 bots, all permutations of zoning.
2017-04-12 00:54:37 -07:00
KimLS db64e39651 Missing sleep def on linux 2017-04-11 22:04:49 -07:00
KimLS 95a8603a73 Error in console 2017-04-11 22:00:47 -07:00
KimLS 1d1ee1ccbf Merge fix 2017-04-11 21:48:01 -07:00
KimLS a632d60140 Redo timing on movement and missiles to better match our new tic rate 2017-04-11 21:47:00 -07:00
Akkadius 478a9d115b Merge branch 'master' of https://github.com/EQEmu/Server 2017-04-10 19:55:38 -05:00
Akkadius b5b6145786 Fix initialization issues with loading 'disable_timer' from the database for doors 2017-04-10 19:55:17 -05:00
Michael Cook (mackal) 08111ac176 Fix door functions 2017-04-10 14:52:44 -04:00
Akkadius 080f6c5c3e Merge pull request #605 from AthrogatePEQ/master
Graveyards!!!
2017-04-10 13:06:52 -05:00
Athrogate 421b3bb277 Graveyards!!! 2017-04-10 11:03:36 -07:00
KimLS 18d28ae8d3 Console initial implementation 2017-04-09 20:17:48 -07:00
Michael Cook (mackal) 11e56e72d0 Fix lua killed_merit issue 2017-04-09 02:16:23 -04:00
Uleat 6ae2ff2b75 Added disable_timer checks to doors override functions 2017-04-08 22:35:37 -04:00
Uleat 58e1d9501d Added 'disable_timer' to door objects (used for click once doors) 2017-04-08 21:08:15 -04:00
Michael Cook (mackal) d36f1159fb Add SendBeginCast to Lua API 2017-04-08 02:07:08 -04:00
Michael Cook (mackal) b4bab425f5 Refactor OP_BeginCast into it's own function 2017-04-08 02:06:49 -04:00
Akkadius 2030278116 Fix manifest for Robregen [skip ci] 2017-04-07 22:09:20 -05:00
Akkadius f9ecabfdcf Merge pull request #597 from regneq/master
Added ignore_despawn column to npc_types to have NPCs ignore the despawn timer.
2017-04-07 22:01:07 -05:00
regneq 09f5174299 added a missing version number in version.h 2017-04-07 19:54:13 -07:00
regneq 5ff271d583 fixed a copy and paste error from previous commit. 2017-04-07 19:49:18 -07:00
regneq 4600844336 Added ignore_despawn column to npc_types to have NPCs ignore the despawn column in spawngroup. 2017-04-07 19:45:26 -07:00
regneq 75d759fb77 Merge pull request #4 from EQEmu/master
Fix for Loginserver log messages
2017-04-07 16:05:30 -07:00
KimLS 3acd845a79 Remove some logging that's not needed anymore and fix a bug when data rollover happens that can cause the connection to not internally ack packets and then disconnect. 2017-04-05 19:51:06 -07:00
KimLS 8509f05f0a Console wip, change how we send acks back to some old behavior 2017-04-04 23:21:32 -07:00
Akkadius 9161921bf0 Fix for Loginserver log messages 2017-04-04 22:07:25 -05:00
regneq e3e6889a30 Merge pull request #3 from EQEmu/master
merge from eqemu
2017-04-04 17:53:41 -07:00
Michael Cook (mackal) 75950b0f2b Spell Reflect messages go out to everyone close 2017-04-04 15:00:54 -04:00