pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-12 17:51:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
6,468 Commits 88 Branches 159 Tags
Commit Graph

459 Commits

Author SHA1 Message Date
Uleat
c974b30192 Probable fix for 'Debug Assertion Failure' in Client::GarbleMessage() 2015-04-22 12:29:35 -04:00
Alex
a569e20110 Merge pull request #388 from iequalshane/master 
Enable multiple NPC equipment materials
 2015-03-28 23:34:43 -07:00
Paul Coene
94d118fdf8 Some vendors would decide not to see based on deity, but messages were 
picking the next best reason.  Added a message choice that seemed to make
sense for deity.
 2015-03-27 17:12:39 -04:00
Shane Lynch
13743caf19 Enable multiple NPC equipment materials 
This change allows #npcedit
armtexture/bracertexture/handtexture/legtexture/feettexture to work
properly and sets individual armor slot materials for NPCs.
 2015-03-10 21:33:44 -07:00
Uleat
1f0b86a0d5 Changes to how valid light sources are critiqued 2015-02-26 18:46:12 -05:00
Uleat
0b6d71181f Added safety check to DraggedCorpses list iteration in Client::DraggedCorpses() 2015-02-24 00:52:18 -05:00
Michael Cook (mackal)
7afb29cf02 Fix another memleak in Client::TryReward 2015-02-20 21:10:53 -05:00
Michael Cook (mackal)
9a19d59cf7 Fix memory leak in Client::TryRewards 2015-02-20 18:47:46 -05:00
Michael Cook (mackal)
c5a217842f Fix issues with claims and implement for RoF/RoF2 2015-02-20 16:29:56 -05:00
Uleat
e4be4d6895 Pre-purposed clean-up 2015-02-17 13:58:26 -05:00
Uleat
20249cec67 Pre-purposed prep-work 2015-02-17 13:58:25 -05:00
Trevius
28be3b87b7 (RoF2) Bazaar Trading (Buying/Selling) is now fully functional. Bazaar (/bazaar) search is not yet functional. 2015-02-16 11:56:23 -06:00
Akkadius
1966324112 Changed NPCTypes Data to bulk load when the zone loads or Repops, this bulk loading is stored in the npc_types cache 2015-02-12 19:57:24 -06:00
Trevius
69d727cbe5 (SoF+) Removed duplicate packets being sent to client on zone (Take #2)! 2015-02-10 19:22:42 -06: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
Michael Cook (mackal)
95b66583b3 Merge pull request #367 from JohnsonAskot/master 
Sanity checking
 2015-02-09 17:54:08 -05: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
JohnsonAskot
7bf054bd58 Name removed from comments 2015-02-07 14:35:43 -05:00
JohnsonAskot
63810d5c1b Exploit fixes 
Bind Wound was spammable via packet sending. You could buy a larger
stack than the max StackSize of an item from merchants that had
unlimited of those stackable items.
 2015-02-07 12:34:50 -05:00
Paul Coene
1d40f20da0 Remove incorrect use of before_hit 2015-02-01 16:14:05 -05:00
Paul Coene
614014a238 Faction update 2015-02-01 15:02:14 -05:00
Paul Coene
1ff2a043f4 Merge branch 'master' of https://github.com/EQEmu/Server 2015-02-01 09:34:04 -05:00
Paul Coene
115d0d14ac Fix issues with faction where chars were not allowed to earn faction to 
offset starting faction values.
 2015-02-01 09:31:07 -05:00
KimLS
5e1a886e8f Merge branch 'master' into eqstream_ptr 2015-01-29 22:13:41 -08:00
Trevius
0aba2d578a Added more information to Mercenary Logging. 
Added potential fix for Mercenaries that fail to unsuspend.
Added a new "statscale" field to the merc_stats table that can be used to quickly balance Mercenary Stats based on Level.
The new "statscale" field now combines with the Mercs::ScaleRate rule value (default 100 percent for both).
 2015-01-29 23:04:41 -06: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
Michael Cook (mackal)
a12011ca1e Fix some bugs with starting AI in mercs 
The vtable ptr is that of the current constructor the code is in ...
 2015-01-27 19:53:13 -05:00
Trevius
f17fb2a8e1 Removed "Mercenary Debug:" from the Mercenary Log entries. 
Resolved duplicate "You have no Mercenaries" messages when zoning without owning a Mercenary.
Mercenaries should now always be able to unsuspend if the timer is up.
More work on Mercenaries and Grouping to reduce bugs and redundant queries.
 2015-01-27 00:35:39 -06:00
Paul Coene
5f3baf3649 Merge remote-tracking branch 'upstream/master' 2015-01-26 14:30:21 -05:00
Trevius
fc5266e115 Added Logs::Mercenaries to the new Logging System. Logging of Mercenary information is off by default with the required SQL. 2015-01-25 12:31:07 -06:00
Paul Coene
60412276da Report repair as well as change from Update Personal Faction. 2015-01-25 09:55:41 -05:00
Paul Coene
22de30bab3 Repair faction messaging code. 
The messages were being based on total faction rather than personal faction.
The personal faction range is all that is needed to detremine which message.

There were several bugs as well.  Fixed several edge conditions
 2015-01-25 09:46:00 -05:00
Uleat
cc1d7d54c2 Implemented mob equipment light sources 2015-01-24 22:00:06 -05: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
34bec5913b Merge plus changed getposition to return a reference 2015-01-24 11:48:06 -08:00
Akkadius
7b6b3c8094 Removed EQDEBUG preprocessor check in TextLink::GenerateLink 2015-01-24 04:58:16 -06:00
Akkadius
b2dbc3923c Remove occurence of ChangeSQLLog 2015-01-24 03:59:52 -06:00
Akkadius
5cb0fe0a6f Remove Client::ChangeSQLLog 2015-01-24 03:51:48 -06:00
Akkadius
d5714cdcb0 Remove Client::LogSQL 2015-01-24 03:51:19 -06: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
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
Michael Cook (mackal)
f702e953e7 Some std::abs usage and a bit of clang-formatting 2015-01-22 22:59:52 -05:00
Alex
7bfc3a48a8 Merge pull request #343 from noudess/master 
Made familiars persistent.
 2015-01-22 16:48:38 -08:00
Akkadius
908c7b1464 Re-Fix Skills log message print types 2015-01-22 15:56:03 -06:00
Akkadius
c5447778a6 Merge remote-tracking branch 'remotes/origin/master' into logging_changes 
Conflicts:
	world/client.cpp
	world/worlddb.cpp
	zone/aggro.cpp
	zone/bot.cpp
	zone/client.cpp
	zone/client_packet.cpp
	zone/client_process.cpp
	zone/doors.cpp
	zone/entity.cpp
	zone/inventory.cpp
	zone/mob_ai.cpp
	zone/perl_client.cpp
	zone/spells.cpp
	zone/waypoints.cpp
	zone/zone.cpp
	zone/zonedb.cpp
	zone/zoning.cpp
 2015-01-21 17:29:30 -06:00
Akkadius
3d74035e24 Merge remote-tracking branch 'remotes/origin/master' into logging_changes 
Conflicts:
	zone/command.cpp
	zone/command.h
	zone/inventory.cpp
 2015-01-21 16:40:46 -06:00
Akkadius
98f0d4df49 UpdateAdmin Linux build fix 2015-01-20 19:22:28 -06:00
KayenEQ
ad711b0b5a Fix for compile issue with vs2012 2015-01-20 17:35:39 -05:00
JJ
a84f480ffc ... and lang. 2015-01-20 15:51:00 -05:00