2235 Commits

Author SHA1 Message Date
JJ
6028dbb4e5 hateborne: grid assign match fix. 2014-10-15 22:31:44 -04:00
JJ
fc8cb2b5b7 Manual merge of 4e3826228d43321abec7805f65b6d43d0f04ab06 in #269. 2014-10-15 22:12:57 -04:00
JJ
594657f2c7 Manual merge for 0c3e51963b5803d66443e71554d3e06a296805b3 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
Uleat
e824f81670 Merge branch 'master' of https://github.com/EQEmu/Server
Conflicts:
	changelog.txt
2014-10-15 19:50:35 -04:00
Uleat
69c0405004 Updated both load and drop sqls for bots..added a 'deprecated' load for pre-pp blob conversion databases..the auto-conversion code will catch this if the server
is updated to a newer version. (Had a really nice load script coded..but, the supported version of MySQL doesn't support 'TEMPORARY' procedures, nor commit commands from
'PREPARE(d)' statements... :( )
2014-10-15 07:49:39 -04:00
Michael Cook (mackal)
e38abaa32a Optimize EntityList::UnMarkNPC
Going over the group_list is much better than hitting the same group
up to 5 unnecessary times
2014-10-14 22:50:09 -04:00
Michael Cook (mackal)
c002f834d4 Correct misidentified OP_MarkNPC (RoF,SoD,SoF,UF) [skip ci] 2014-10-14 17:20:19 -04:00
Michael Cook (mackal)
e53a91f5c3 Added some previous unidentified (still unhandled) UF opcodes
Didn't want them to get lost ;)
2014-10-14 00:01:51 -04:00
Michael Cook (mackal)
ef5e93b71b Add debug log to Client::Handle_OP_DoGroupLeadershipAbility 2014-10-13 23:24:25 -04:00
Michael Cook (mackal)
6f00a69850 Raid Leadership RoF 2014-10-13 22:55:57 -04:00
Michael Cook (mackal)
41938fbe72 Raid leadership SoD 2014-10-13 22:54:57 -04:00
Michael Cook (mackal)
d1561c28d9 Raid Leadership SoF 2014-10-13 22:53:41 -04:00
Michael Cook (mackal)
be0621de42 Partial implementation of leadership in raids
Currently working: stat bonuses and client side only effects
Currently not working: Mark NPC and others that need more server side work

Currently only tested on UF, Ti and 62 may work, but not tested
SoF, SoD, and RoF need packet translators, which are most likely the same as UF
2014-10-13 21:36:59 -04:00
KimLS
15cec40ed5 Fix for issue #270, fix for temp merchant lists not loading correctly, fix for ah redundant getadventurestats code. 2014-10-13 15:59:11 -07:00
Akkadius
ea734c90b5 Fix for LDON Character Stat load 2014-10-12 22:57:49 -05:00
Michael Cook (mackal)
6c5b569c29 Raid MOTD for SoF 2014-10-11 02:07:49 -04:00
Michael Cook (mackal)
e5f3f4c552 Raid MOTD for SoD 2014-10-11 02:03:49 -04:00
Michael Cook (mackal)
f097eaf3cd Raid MOTD for RoF 2014-10-11 01:54:54 -04:00
Alex
48eba3c092 Merge pull request #260 from addtheice/RunQueryToDatabaseQuery_world_worlddb
Run query to database query world worlddb
2014-10-10 22:44:14 -07:00
Alex
bdba6219ac Merge pull request #259 from addtheice/RunQueryToDatabaseQuery_zone_command
Run query to database query zone command
2014-10-10 22:43:07 -07:00
Alex
d86912a7bb Merge pull request #262 from addtheice/RunQueryToDatabaseQuery_zone_client
Run query to database query zone client
2014-10-10 22:42:45 -07:00
Alex
362366a333 Merge pull request #263 from addtheice/RunQueryToDatabaseQuery_queryserv_database
GeneralQueryReceive converted to QueryDatabase
2014-10-10 22:42:04 -07:00
Michael Cook (mackal)
35049d530e Implement Raid MOTD for UF
Don't forget to source 2014_10_11_RaidMOTD.sql

SoD and RoF implementations still to come
2014-10-11 01:14:11 -04:00
Uleat
66cfb2e32b Added a 'BOTS' converter to supplement Akkadius's recent 'PP' blob converter - updates views/function to reference the proper tables and columns. 2014-10-09 23:54:48 -04:00
Michael Cook (mackal)
3e1c917f11 Fix issues with purchasing raid AAs 2014-10-09 23:30:08 -04:00
JJ
ea4c23efcf Establish default order for merchantlist items.
Allow merchants to use 80th slot.
2014-10-09 23:11:18 -04:00
Michael Cook (mackal)
c328829610 Fix out of bounds error in SaveCharacterLeadershipAAs 2014-10-09 22:55:28 -04:00
JJ
28ac586ed8 Update info for #suspend 2014-10-09 00:23:54 -04:00
Alex
ee71fa0d56 Merge pull request #268 from addtheice/RunQueryToDatabaseQuery_zone_tradeskills
Run query to database query zone tradeskills
2014-10-08 16:31:55 -07:00
Alex
f3e04bfe4c Merge pull request #267 from addtheice/RunQueryToDatabaseQuery_zone_raids
Run query to database query zone raids
2014-10-08 16:31:38 -07:00
Alex
a8c23d25f3 Merge pull request #266 from addtheice/RunQueryToDatabaseQuery_zone_tasks
Run query to database query zone tasks
2014-10-08 16:31:03 -07:00
Alex
41f2d71c7c Merge pull request #264 from addtheice/RunQueryToDatabaseQuery_zone_groups
SaveGroupLeaderAA converted to QueryDatabase
2014-10-08 16:28:55 -07:00
Arthur Ice
e338f801ea DisableRecipe converted to QueryDatabase 2014-10-08 16:05:52 -07:00
Arthur Ice
6221c1f8ab EnableRecipe converted to QueryDatabase 2014-10-08 16:04:19 -07:00
Arthur Ice
5dac9a944b LearnRecipe converted to QueryDatabase 2014-10-08 16:02:30 -07:00
Arthur Ice
97c1c479f9 GetTradeRecipe converted to QueryDatabase 2014-10-08 15:55:12 -07:00
Arthur Ice
21d6865e8c GetTradeRecipe converted to QueryDatabase 2014-10-08 15:43:50 -07:00
Arthur Ice
e2894ef2aa SendTradeskillDetails converted to QueryDatabase 2014-10-08 15:05:24 -07:00
Arthur Ice
7656b9b928 TradeskillSearchResults converted to const std::string query instead of const *char query 2014-10-08 15:00:34 -07:00
Arthur Ice
0fde0fbd23 removed unneeded querylength parameter from TradeskillSearchResults 2014-10-08 14:41:34 -07:00
Arthur Ice
d5955da08c TradeskillSearchResults converted to QueryDatabase 2014-10-08 14:38:38 -07:00
Arthur Ice
e2333e671b HandleautoCombine converted to QueryDatabase 2014-10-08 14:28:40 -07:00
Arthur Ice
1da70ee6ed LoadProximities converted to QueryDatabase 2014-10-08 14:15:43 -07:00
Arthur Ice
0d8cbca016 LoadLists converted to QueryDatabase 2014-10-08 14:11:35 -07:00
Arthur Ice
1a4b794ce4 RemoveTask converted to QueryDatabase 2014-10-08 13:33:22 -07:00
Arthur Ice
fca359bf51 DeleteCompletedTaskFromDatabase 2014-10-08 13:22:10 -07:00
Arthur Ice
5f11e91da2 DisableTask converted to QueryDatabase 2014-10-08 13:17:03 -07:00
Arthur Ice
2c275f603a EnableTask converted to QueryDatabase 2014-10-08 13:07:03 -07:00
Arthur Ice
ad921d01d8 LoadClientState converted to QueryDatabase 2014-10-08 12:30:08 -07:00