pa/eqemu-server
2
0 Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-10-08 01:13:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,498 Commits 89 Branches 159 Tags
bbc3733c3a97ab8c2c57488fd85291f571c10151
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
KimLS bbc3733c3a Compiles again, had to disable a new piece of code though 2015-06-21 01:45:42 -07:00
KimLS 5995afa1b8 Merge from master, probably wont compile but will fix that soon 2015-06-21 01:38:19 -07:00
Alex f57734e591 Merge pull request #425 from clucksoft/encounters 
More encounter timers support
 2015-06-07 15:07:35 -07:00
Alex fafbecb055 Merge pull request #424 from clucksoft/encounters 
Encounter timers
 2015-06-04 13:44:14 -07:00
KimLS ec8e7139ec errant else statements 2015-05-23 15:54:33 -07:00
KimLS a882397eb6 errant semi-colon, doesn't matter but still 2015-05-23 15:53:56 -07:00
KimLS 7d61934ce6 Add db manifest for dbstr_us.txt stuff 2015-05-23 15:52:42 -07:00
KimLS 7041db7480 Adding dbstr_us.txt support to client files 2015-05-23 15:50:58 -07:00
KimLS 2ef0fc9342 Change to fishing water location algorithim 2015-05-18 21:46:19 -07:00
Alex 02c3fd0905 Merge pull request #414 from hateborne/master 
GM Output for Casting Blocked Spells via Logging System
 2015-05-18 21:45:07 -07:00
Alex 4b7871a665 Merge pull request #411 from regneq/master 
smoother NPC pathing. (credit to Haynar from EQMacEmu)
 2015-05-11 22:52:13 -07:00
Alex be0507c4d3 Merge pull request #407 from noudess/master 
The mob AT_Anim (as set in spawn2) was not working in some cases.
 2015-05-06 17:30:56 -07:00
Alex 80fd71a406 Merge pull request #402 from noudess/master 
Allow Kerran race illusions to be either gender.
 2015-05-01 15:44:44 -07:00
Alex 3846dc2bbc Merge pull request #401 from noudess/master 
Check to make sure we're a client before a CastToClient().
 2015-04-30 16:59:39 -07:00
Alex 8b4d601027 Merge pull request #400 from noudess/master 
Now Npcs won't respond to hails if they can't see you.
 2015-04-30 06:04:06 -07:00
Alex d7c556c672 Merge pull request #399 from noudess/master 
Monk wearing magical gloves can hit creatures that need a magical weapon
 2015-04-29 18:55:29 -07:00
Alex 7bde00c63b Merge pull request #398 from noudess/master 
Noexpend spells like flame lick were expending.
 2015-04-29 15:30:53 -07:00
Alex 41f3b721d6 Merge pull request #395 from noudess/master 
Some illusions and some NPC gear not showing up on zone-in & initial spawn if in zone when it occurs
 2015-04-28 16:34:01 -07:00
Alex cafac36bed Merge pull request #397 from gpanula/master 
Handle nulls in trusted server lookup(mysql)
 2015-04-28 16:33:34 -07:00
KimLS ff3cb9fc54 Merge branch 'master' into inv2 2015-04-07 16:29:07 -07:00
KimLS 56e7d1b0dc Okay finally merchant buying works -.- 2015-04-07 16:28:28 -07:00
KimLS 979590db9f Fix for lower than intended drop rates for drop limit loot tables after the min drop changes 2015-04-06 17:42:15 -07:00
KimLS 7341ecc185 Some work on implementing slot selection 2015-04-06 16:53:12 -07:00
KimLS 78eb8747aa Merge branch 'master' of github.com:EQEmu/Server 2015-04-04 17:03:42 -07:00
KimLS fc1d6c0676 Fix for mindrop on drop tables sometimes not being fully respected 2015-04-04 17:03:28 -07:00
KimLS b6a01871d8 Fix for another bazaar problem 2015-03-28 23:38:41 -07:00
Alex a569e20110 Merge pull request #388 from iequalshane/master 
Enable multiple NPC equipment materials
 2015-03-28 23:34:43 -07:00
Alex 75146350fc Merge pull request #393 from noudess/master 
Vendor message for rejection based on Deity
 2015-03-28 23:34:23 -07:00
Alex ad9e9ba2d6 Merge pull request #392 from N0ctrnl/master 
Added individual tradeskill skillup settings rules
 2015-03-27 13:32:06 -07:00
KimLS 279ed8d86c Merge branch 'master' into inv2 2015-03-25 15:55:16 -07:00
KimLS 9598ce45c9 Merge branch 'master' of github.com:EQEmu/Server 2015-03-24 16:37:25 -07:00
KimLS 9ef4825a72 Fix for gaps in path files during add 2015-03-24 16:37:12 -07:00
KimLS 0cf5cca415 Other half of bazaar exploit 2015-03-22 23:18:08 -07:00
KimLS f021ee5491 Fix for traders not correctly setting price 2015-03-22 14:47:45 -07:00
KimLS 6c26bc9c8f Fix for alt currency reclaim exploit and fix for exploit in trader code where price != set price 2015-03-20 13:10:36 -07:00
KimLS 21ce5c6daa Merge plus some work on fixing stacking for merchants. 2015-03-15 14:02:13 -07:00
KimLS 00af95502e Wip merchant stuff, summoning should work now. 2015-03-06 15:53:15 -08:00
KimLS dda8ae4803 Basic item summoning, fix for saving not working 100 pct, deletion works, cursor queue should work too. 2015-03-05 18:03:37 -08:00
Alex bd9665e35b Merge pull request #381 from noudess/master 
Allow server customization of swimming start value.
 2015-03-04 19:37:01 -08:00
KimLS 316aa5ef73 Added current table to utils sql, though not formatted correctly yet since it's heavily wip 2015-03-04 19:35:10 -08:00
KimLS 9fcdf5367e Swap saving now works correctly except for cursor items which wont be reloaded correctly as we don't send cursor on login yet. Also added check for bag into another bag src bag needs to have nothing in it first. 2015-03-04 19:33:01 -08:00
KimLS 972d3d8874 Fix for swapping a stack with another item that is not of the same stack size. Added some console visualization for testing and added basics of data modeling for inventory, saving soon. 2015-03-02 19:38:57 -08:00
KimLS abc5ddc5f8 Inventory Swap implemented and passes tests, though still want to verify it a bit more also does not yet save but that's next. Fixed a crash in memory buffer too. 2015-03-02 00:44:28 -08:00
KimLS 14b5a8d817 Merge from master 2015-02-28 17:59:32 -08:00
KimLS 20cbe4af44 More work on swapping, almost there just need to write code for stack split/move/combining 2015-02-28 17:56:01 -08:00
KimLS 7870bf103a Working on can equip, putting it in the general inventory class. 2015-02-27 02:40:44 -08:00
KimLS 18b4d068ea Early stages of swapping requirements in, should check for basic validity and equipable status 2015-02-26 22:09:29 -08:00
KimLS 568938d003 Merge from master 2015-02-25 19:39:48 -08:00
KimLS 215861dd86 Added serialization differentiation 2015-02-25 19:36:10 -08:00
KimLS c62cff1ce7 Fixed test again. 2015-02-24 00:38:49 -08:00
KimLS 69612b44d4 OP_MoveItem encode/decode for RoF2, disabled other patches for now (until i get rof2 packets and mechanics working well enough to go back and fix those) 2015-02-23 22:45:50 -08:00
KimLS 8bce7893ed BulkSendItems now works on RoF2 2015-02-23 17:33:21 -08:00
KimLS 4e4168852b Going to start work on SerializingItems for bulk inv sends 2015-02-23 01:50:50 -08:00
KimLS ca278d029e Fix for Memory Buffer stuff, have yet to compile so not sure if that's enough. Partial work on RoF inventory bulk send 2015-02-22 19:38:44 -08:00
KimLS 273574d4db Added memory buffer plus tests to project, going to use it for item serialization 2015-02-22 15:37:11 -08:00
KimLS c71a5888ff Merge branch 'master' into inv2 2015-02-22 14:27:49 -08:00
KimLS b3c53e5907 Merge master, fix conflicts 2015-02-21 15:30:15 -08:00
KimLS f511862004 Working working working on getting the basics setup 2015-02-21 15:21:45 -08:00
KimLS a90e9cf4c6 Refactoring 2015-02-20 20:15:58 -08:00
KimLS 2d617f0ea7 Get/Put item implementation + tests 2015-02-20 16:24:32 -08:00
KimLS 551c0ef368 Basic arch work, doesn't make a ton of sense yet but it will 2015-02-19 23:34:43 -08:00
KimLS a5274b9b6e InventoryOld in client has been unhooked from loading/saving 2015-02-18 20:29:58 -08:00
KimLS fc2492a859 Merge from master, fixed conflicts 2015-02-18 13:18:21 -08:00
Alex aaa9595b59 Merge pull request #372 from noudess/master 
A non magical weapon with an augment tagged as magic now hits as magic
 2015-02-18 12:52:56 -08:00
KimLS 2d40adcf66 Partial revert/rewrite of b6dd604, should be possible to get things on a hate list that have zero hate again 2015-02-18 12:39:28 -08:00
KimLS 701e194ece Renamed Item_Struct to ItemData 2015-02-17 18:06:22 -08:00
KimLS b75e6308dd Renamed Inventory to InventoryOld 2015-02-17 13:42:21 -08:00
KimLS db3feafe48 Fix for returning to bound zone you're already in 2015-02-14 20:05:54 -08:00
KimLS 9a78bac0d0 Changed save items back to true to be like old encode, no point tempting fate on that not breaking anything 2015-02-14 18:46:03 -08:00
KimLS f95e211d9b Fixes to OP_ZonePlayerToBind code, esp for RoF clients. 2015-02-14 18:32:49 -08:00
KimLS 2774d8e761 AddToHateList will no longer assert on other = nullptr, it will now just do nothing. Since the function can be called from perl/lua it's inapprops to let them just crash the server with an abort() from assert. 2015-02-11 21:56:58 -08:00
KimLS 9daf572ea7 Fix for no factions in database crashing the server and shared memory 2015-02-10 11:53:39 -08:00
KimLS 82933a80d1 Merge branch 'master' of github.com:EQEmu/Server 2015-02-09 17:48:20 -08:00
KimLS 543e265b0a Adjustments to OP_SpawnAppearance, as well as updating import client files to handle newer spell files 2015-02-09 17:48:07 -08:00
KimLS 452b1a1eae Added throttling to some appearance packets, also removed responding to client light packets. With the new light code we'll tell the client when the light has changed not the other way around. 2015-02-07 15:55:01 -08:00
Alex 54c3f9ab94 Merge pull request #364 from EQEmu/loot 
Loot Upgrade
 2015-02-05 00:06:38 -08:00
KimLS ecd05d821e Merge and fix the loot update branch, ready for merge I think 2015-02-04 23:13:02 -08:00
KimLS 9a664476b0 Merge branch 'eqstream_ptr' 2015-01-30 15:03:40 -08:00
KimLS f388a605dd Spelling errors and revised my cle change to put it much lower so it shouldn't have any side effects other than avoiding the crash 2015-01-30 15:03:02 -08:00
Alex 01c0a87cee Merge pull request #353 from EQEmu/eqstream_ptr 
Change EQStream raw pointers to be std::shared_ptr
 2015-01-30 13:41:49 -08:00
KimLS faaa98d3f0 Crash fix for crash we saw on peq 2015-01-30 13:04:51 -08:00
KimLS 5e1a886e8f Merge branch 'master' into eqstream_ptr 2015-01-29 22:13:41 -08:00
KimLS 7dbe6a7426 Many tweaks to stream memory allocation, including but not limited to streams now are shared_ptrs. 2015-01-27 21:12:44 -08:00
KimLS 0c7a861caf Fix for spell target det crash. Also added a command line arg to world ignore_db that lets you ignore the db conversion process for servers that dont need it. 2015-01-25 14:18:30 -08:00
Alex 262ccf3d06 Merge pull request #349 from EQEmu/db_types 
Merge of db_types branch.
 2015-01-24 12:24:07 -08:00
KimLS 73c6a0bb1d Fix for bug with usage of IsOrigin, bug from when i was just doing glm::dot(pos, pos) == 0 2015-01-24 12:01:42 -08:00
KimLS 8d30e4b8a6 Merge branch 'master' into db_types 2015-01-24 11:50:20 -08:00
Alex 854f7d6575 Merge pull request #348 from addtheice/moremath 
removed moremath.cpp/h
 2015-01-24 11:50:09 -08:00
KimLS 34bec5913b Merge plus changed getposition to return a reference 2015-01-24 11:48:06 -08:00
KimLS 669bca8da8 Fix for bots compile 2015-01-23 18:24:53 -08:00
KimLS a7710c027b Fix for polluted headers that were messing with glm 2015-01-23 17:58:03 -08:00
KimLS 17af9e3808 Merge fixes, hopefully didn't break anything. 2015-01-23 13:36:27 -08:00
KimLS 143c0cf0f9 Fix for x and y swapped on water maps 2015-01-23 12:23:24 -08:00
KimLS 269d56e1d0 Switched out our kinda juryrigged vector types for glm::vec types since we use that as a 3d math library already but never switched out the types 2015-01-23 00:01:10 -08:00
KimLS 03286f540a Updated version of glm 2015-01-22 16:52:50 -08:00
Alex 45ca5520fe Merge pull request #332 from addtheice/range_based_for_prepared 
modified mysql results/row to be ready for range based for
 2015-01-22 16:50:52 -08:00
Alex 7bfc3a48a8 Merge pull request #343 from noudess/master 
Made familiars persistent.
 2015-01-22 16:48:38 -08:00
KimLS 1ca397f426 Lua parser: script_init.lua for zones will now follow script_init_v[0-9]+\.lua similar to player quests. 2014-11-22 03:20:39 -08:00
KimLS 9570412991 Added special ability functions to perl, removed some of the less used commands (and a few duplicates) 2014-11-18 21:17:03 -08:00
KimLS c506e33018 Fixed merge 2014-11-18 21:12:48 -08:00