2454 Commits

Author SHA1 Message Date
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
Michael Cook (mackal)
7dcd12fb9d clang-modernize use-nullptr on zone/mob_ai.cpp 2015-01-27 19:32:49 -05:00
Uleat
d037bc9dcc Merge branch 'master' of https://github.com/EQEmu/Server 2015-01-27 18:40:04 -05:00
Uleat
dd9f419735 Merge branch 'master' of https://github.com/EQEmu/Server
Conflicts:
	changelog.txt
2015-01-27 18:34:43 -05:00
Michael Cook (mackal)
62d1b0c2bd Merc NPCType memleak fix 2015-01-27 18:32:32 -05:00
Uleat
4832acde0b Finished ClientVersion naming conventions (don't forget to copy the renamed patch_UF.conf file) 2015-01-27 05:09:35 -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
JJ
6a43fd3b45 Merge pull request #351 from noudess/master
Repair Faction System Messaging
2015-01-26 20:55:17 -05:00
Uleat
64c302b07a Merge branch 'master' of https://github.com/EQEmu/Server 2015-01-26 19:44:50 -05:00
Uleat
89f8006f11 Changed the return type of Corpse::MoveItemToCorpse() to void and added a 'by address' parameter to replace it -- Fixed a bug that would 'unattune' soulbound items inside of bags 2015-01-26 19:44:33 -05:00
Paul Coene
5f3baf3649 Merge remote-tracking branch 'upstream/master' 2015-01-26 14:30:21 -05:00
Natedog2012
f67382c024 Allow ranged procs to work again 2015-01-26 13:58:54 -05:00
Akkadius
a698eff106 Natedog: Fix #gassign to work more appropriately and simplify the function 2015-01-25 23:27:44 -06: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
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
Trevius
966acb25b3 Fixed an issue where Mercenaries were causing several DB queries per second while suspended. 2015-01-25 11:28:34 -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
Akkadius
5266d7b25c Add extra checking at the root of Log.Out to check if the category is subscribed to any of the output methods before trying to parse message strings and then pass them to the sub output functions and THEN perform log_setting checks and debug_level checks.
I performed a unit test of 1,000,000 log writes, there is hardly any difference.

#::: Before Checks
[01-25-2015 :: 03:15:35] [999999] Test #2... Took 17.940001 seconds

#::: With Checks
[01-25-2015 :: 04:10:55] [999999] Test #2... Took 18.018000 seconds
2015-01-25 04:24:05 -06:00
Akkadius
5e107a9936 Help Travis figure out what time of day it is 2015-01-25 02:23:05 -06:00
Akkadius
1d462bfd0f Revert some entity related CastTo changes 2015-01-25 01:42:46 -06:00
Akkadius
13af3e35e2 Removed COMMANDS_LOGGING ifdef 2015-01-24 22:48:06 -06:00
Akkadius
36e01cb9f1 Adjust some commands that default to 0, change Log commands to Commands category instead of Error 2015-01-24 22:46:40 -06:00
Akkadius
609cad72d9 Convert Entity::CastToNPC to Log.Out with EQDEBUG remove 2015-01-24 22:22:30 -06:00
Akkadius
a31ad485e4 Convert Entity::CastToClient to Log.Out 2015-01-24 22:20:58 -06:00
Akkadius
1b1c82a3e7 Doors::HandleClick and remove #EQDEBUG check, convert log 2015-01-24 22:09:58 -06:00
Akkadius
62d9de3074 Cleanup logging in Client::Handle_OP_CastSpell as well as some more conversions 2015-01-24 22:01:37 -06:00
Akkadius
d3fb59b3e5 Cleanup logging in Client::Handle_OP_CastSpell 2015-01-24 22:00:20 -06:00
Uleat
cc1d7d54c2 Implemented mob equipment light sources 2015-01-24 22:00:06 -05:00
Uleat
7e980e1e7c Added 'NoDrop Hack' check log message to Client::SwapItem() 2015-01-24 20:46:48 -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
Natedog2012
069572fe15 Fix for CastSpell if the spellID is invalid thus not having a name 2015-01-24 14:08:56 -05:00
Akkadius
26018ec898 astyle client_mods.cpp 2015-01-24 05:11:19 -06:00
Akkadius
6300cbb6b8 Client::CalcMaxMana Log adjust 2015-01-24 05:03:27 -06:00
Akkadius
91fe63537b Client::ACMod Log adjust 2015-01-24 05:01:23 -06:00
Akkadius
7b6b3c8094 Removed EQDEBUG preprocessor check in TextLink::GenerateLink 2015-01-24 04:58:16 -06:00
Akkadius
dfeb6e62a4 Changed a log entry to use Trade category instead of none 2015-01-24 04:55:03 -06:00
Akkadius
e24b67cbb4 Fixed DumpTrade to filter through trading Debug level 3 logs. Removed preprocessor checks 2015-01-24 04:54:02 -06:00
Akkadius
d0595e3794 Remove log junk from command_spawn 2015-01-24 04:38:22 -06:00
Akkadius
04623b2c0c Remove preprocessor and convert log message 2015-01-24 04:31:09 -06:00
Akkadius
e18a49a974 Cleanup in command_guild 2015-01-24 04:28:41 -06:00
Akkadius
50ccb52465 Adjust logging in command_time 2015-01-24 04:27:32 -06:00
Akkadius
d7a2387f3d Sort command_init alphabetically and cleanup 2015-01-24 04:22:33 -06:00
Akkadius
734a2c42b2 Remove some processor and cleanup logging around Commands 2015-01-24 04:17:58 -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
Akkadius
ce161c2583 Some fixes from replace removal of LogSQL 2015-01-24 03:50:33 -06:00
Akkadius
e1747c43b9 Remove occurrences of LogSQL 2015-01-24 03:49:20 -06:00