Akkadius dd6d1d5511 Merge remote-tracking branch 'remotes/origin/master' into web_interface ...

Conflicts:
	CMakeLists.txt
	common/logtypes.h
	common/shareddb.cpp
	world/net.cpp
	zone/client_logs.cpp
	zone/corpse.cpp
	zone/mob.cpp
	zone/net.cpp

2015-02-02 23:11:31 -06:00

..

aa.cpp

Merge fixes, hopefully didn't break anything.

2015-01-23 13:36:27 -08:00

aa.h

Linux fix for Mob type in AA_SwarmPetInfo.

2014-12-15 11:06:53 -05:00

aggro.cpp

Some minor cleanup. [skip ci]

2015-01-31 17:03:44 -05:00

attack.cpp

Merge remote-tracking branch 'remotes/origin/master' into web_interface

2015-02-02 23:11:31 -06:00

basic_functions.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

beacon.cpp

Some minor cleanup. [skip ci]

2015-01-31 17:03:44 -05:00

beacon.h

beacon.h/cpp header cleanup

2014-12-15 04:56:01 -06:00

bonuses.cpp

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

bot_structs.h

Renamed zone files

2014-08-21 23:46:01 -07:00

bot.cpp

Some minor cleanup. [skip ci]

2015-01-31 17:03:44 -05:00

bot.h

Implemented mob equipment light sources

2015-01-24 22:00:06 -05:00

botspellsai.cpp

Merge fixes, hopefully didn't break anything.

2015-01-23 13:36:27 -08:00

client_mods.cpp

astyle client_mods.cpp

2015-01-24 05:11:19 -06:00

client_packet.cpp

Merge remote-tracking branch 'remotes/origin/master' into web_interface

2015-02-02 23:11:31 -06:00

client_packet.h

client_packet.cpp #include cleanup

2014-11-29 03:48:26 -06:00

client_process.cpp

RoF+ can send 200 items in merchantlist

2015-01-31 11:17:28 -08:00

client.cpp

Remove incorrect use of before_hit

2015-02-01 16:14:05 -05:00

client.h

Faction update

2015-02-01 15:02:14 -05:00

CMakeLists.txt

Merge remote-tracking branch 'remotes/origin/master' into web_interface

2015-02-02 23:11:31 -06:00

command.cpp

Have is_category_enabled update appropriately when settings are set via #logs

2015-02-01 19:57:02 -06:00

command.h

Natedog: Fix #gassign to work more appropriately and simplify the function

2015-01-25 23:27:44 -06:00

common.h

Some minor cleanup. [skip ci]

2015-01-31 17:03:44 -05:00

corpse.cpp

Merge remote-tracking branch 'remotes/origin/master' into web_interface

2015-02-02 23:11:31 -06:00

corpse.h

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

doors.cpp

Doors::HandleClick and remove #EQDEBUG check, convert log

2015-01-24 22:09:58 -06:00

doors.h

Merge plus changed getposition to return a reference

2015-01-24 11:48:06 -08:00

effects.cpp

Fix to allow for PBAE/Targeted AE spells to check the 'npc_no_los' field in spell file

2015-02-02 03:01:37 -05:00

embparser_api.cpp

Added Logs::DebugQuest category per request from Trevius (Great idea)

2015-01-28 20:00:03 -06:00

embparser.cpp

Implemented event type "EVENT_ENVIRONMENTAL_DAMAGE"

2015-01-30 23:01:31 -06:00

embparser.h

Changed void* to EQEmu::Any in quest interface. Been meaning to change from void* for a while to a structure that data hides instead.

2014-08-25 22:59:52 -07:00

embperl.cpp

Rename debug.h to global_define.h, update cmakelists and such

2015-01-19 04:12:09 -06:00

embperl.h

Prefer prefix ++/-- on non-primitive types

2014-01-13 22:14:02 -05:00

embxs.cpp

Various logging adjustments

2015-01-20 03:20:40 -06:00

embxs.h

Remove trailing whitespace

2013-05-09 11:13:16 -04:00

entity.cpp

Merge remote-tracking branch 'remotes/origin/master' into web_interface

2015-02-02 23:11:31 -06:00

entity.h

Merge fixes, hopefully didn't break anything.

2015-01-23 13:36:27 -08:00

errmsg.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

event_codes.h

Implemented event type "EVENT_ENVIRONMENTAL_DAMAGE"

2015-01-30 23:01:31 -06:00

exp.cpp

Added more information to Mercenary Logging.

2015-01-29 23:04:41 -06:00

fearpath.cpp

Merge fixes, hopefully didn't break anything.

2015-01-23 13:36:27 -08:00

forage.cpp

Merge fixes, hopefully didn't break anything.

2015-01-23 13:36:27 -08:00

forage.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

groups.cpp

Merge fixes, hopefully didn't break anything.

2015-01-23 13:36:27 -08:00

groups.h

groups.cpp & .h header cleanup and forward declare

2014-12-15 17:26:51 -06:00

guild_mgr.cpp

Merge remote-tracking branch 'remotes/origin/master' into logging_changes

2015-01-21 17:29:30 -06:00

guild_mgr.h

Remove trailing whitespace

2013-05-09 11:13:16 -04:00

guild.cpp

Merge remote-tracking branch 'remotes/origin/master' into logging_changes

2015-01-21 17:29:30 -06:00

hate_list.cpp

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

hate_list.h

Some more refactoring of hate_list

2014-12-27 23:52:44 -06:00

horse.cpp

Merge fixes, hopefully didn't break anything.

2015-01-23 13:36:27 -08:00

horse.h

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

inventory.cpp

Some minor cleanup. [skip ci]

2015-01-31 17:03:44 -05:00

loottables.cpp

Implemented mob equipment light sources

2015-01-24 22:00:06 -05:00

lua_bit.cpp

NPC Special Attacks should all work right: also huge explanation in changelog.txt

2013-07-11 13:44:45 -07:00

lua_bit.h

Sorta hacky work around for doing nukeitem in item quests. Added lua bitop library. Made excluding io/os optional

2013-06-25 14:51:06 -07:00

lua_client.cpp

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

lua_client.h

Fixed merge

2014-11-18 21:12:48 -08:00

lua_corpse.cpp

Renamed SetPKItem to SetPlayerKillItemID

2014-11-25 23:54:59 -06:00

lua_corpse.h

Fix for luabind not compiling (jumbers), bunch of api upgrades for lua, changed where spells and items load quests from, removed some old code. etc etc.

2013-06-22 01:32:41 -07:00

lua_door.cpp

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

lua_door.h

NPC Special Attacks should all work right: also huge explanation in changelog.txt

2013-07-11 13:44:45 -07:00

lua_entity_list.cpp

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

lua_entity_list.h

Various bug fixes

2014-08-31 20:27:02 -07:00

lua_entity.cpp

Raid/Group lua stuff, renamed corpses

2013-06-02 13:47:52 -07:00

lua_entity.h

Fix for luabind not compiling (jumbers), bunch of api upgrades for lua, changed where spells and items load quests from, removed some old code. etc etc.

2013-06-22 01:32:41 -07:00

lua_general.cpp

Add quest debugging to lua

2015-02-01 17:25:16 -05:00

lua_general.h

Added Spawn object to lua and functions to manipulate them

2013-06-23 14:48:36 -07:00

lua_group.cpp

Raid/Group lua stuff, renamed corpses

2013-06-02 13:47:52 -07:00

lua_group.h

Fix for luabind not compiling (jumbers), bunch of api upgrades for lua, changed where spells and items load quests from, removed some old code. etc etc.

2013-06-22 01:32:41 -07:00

lua_hate_entry.cpp

Raid/Group lua stuff, renamed corpses

2013-06-02 13:47:52 -07:00

lua_hate_list.cpp

Changed hate counter to uint32 to prevent negative rollback, this most likely can will be an issue but more uncommon

2014-12-27 18:24:42 -06:00

lua_hate_list.h

Changed hate counter to uint32 to prevent negative rollback, this most likely can will be an issue but more uncommon

2014-12-27 18:24:42 -06:00

lua_inventory.cpp

Augment item events

2013-06-21 14:20:30 -07:00

lua_inventory.h

Fix for luabind not compiling (jumbers), bunch of api upgrades for lua, changed where spells and items load quests from, removed some old code. etc etc.

2013-06-22 01:32:41 -07:00

lua_item.cpp

Raid/Group lua stuff, renamed corpses

2013-06-02 13:47:52 -07:00

lua_item.h

Fix for luabind not compiling (jumbers), bunch of api upgrades for lua, changed where spells and items load quests from, removed some old code. etc etc.

2013-06-22 01:32:41 -07:00

lua_iteminst.cpp

(RoF+) Implemented the 6th Augment Slot for Items.

2014-12-15 17:55:23 -06:00

lua_iteminst.h

encounter events can now watch all events by all npcs/items/quests by registering themselves to watch -1, fix #74

2013-06-22 14:23:07 -07:00

lua_mob.cpp

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

lua_mob.h

Add PhR to #showstats and a few places that can/should be implemented in the future.

2015-01-06 13:51:36 -05:00

lua_npc.cpp

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

lua_npc.h

Merge of kayen's PR as well as some fixes i saw

2014-09-27 14:44:48 -07:00

lua_object.cpp

Player event export plus lua_object api

2013-06-03 16:49:47 -07:00

lua_object.h

Fix for luabind not compiling (jumbers), bunch of api upgrades for lua, changed where spells and items load quests from, removed some old code. etc etc.

2013-06-22 01:32:41 -07:00

lua_packet.cpp

Fix for potion belt name loading.

2014-09-25 04:00:06 -07:00

lua_packet.h

Data verification utils, not in use yet. Also added ability for lua packet to bypass the translation layer (dangerous) if a writer so desires (useful for quickly trying packet stuff)

2014-09-24 03:58:46 -07:00

lua_parser_events.cpp

Implemented LUA counterpart of EVENT_ENVIRONMENTAL_DAMAGE

2015-01-30 23:15:48 -06:00

lua_parser_events.h

WOOPS! (That's what he said)

2015-01-30 23:17:11 -06:00

lua_parser.cpp

Fix lua events

2015-02-01 15:11:27 -05:00

lua_parser.h

Changed void* to EQEmu::Any in quest interface. Been meaning to change from void* for a while to a structure that data hides instead.

2014-08-25 22:59:52 -07:00

lua_ptr.h

Added all lua objects i need for now, a ton of API too

2013-06-02 00:15:26 -07:00

lua_raid.cpp

Raid/Group lua stuff, renamed corpses

2013-06-02 13:47:52 -07:00

lua_raid.h

Fix for luabind not compiling (jumbers), bunch of api upgrades for lua, changed where spells and items load quests from, removed some old code. etc etc.

2013-06-22 01:32:41 -07:00

lua_spawn.cpp

Added Spawn object to lua and functions to manipulate them

2013-06-23 14:48:36 -07:00

lua_spawn.h

Added Spawn object to lua and functions to manipulate them

2013-06-23 14:48:36 -07:00

lua_spell.cpp

Merge of kayen's PR as well as some fixes i saw

2014-09-27 14:44:48 -07:00

lua_spell.h

Merge of kayen's PR as well as some fixes i saw

2014-09-27 14:44:48 -07:00

map.cpp

unique_ptr is a better fit here

2015-01-30 02:34:33 -05:00

map.h

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

masterentity.h

masterentity.h include order revert for linux

2014-12-15 17:48:18 -06:00

maxskill.h

astyle the terrible sin that is maxskill.h

2015-01-16 01:59:57 -06:00

merc.cpp

Fix merc attack delay

2015-01-30 01:33:55 -05:00

merc.h

Added more information to Mercenary Logging.

2015-01-29 23:04:41 -06:00

message.h

svn -> git Migration

2013-02-16 16:14:39 -08:00

mob_ai.cpp

Merge remote-tracking branch 'remotes/origin/master' into web_interface

2015-02-02 23:11:31 -06:00

mob.cpp

Merge remote-tracking branch 'remotes/origin/master' into web_interface

2015-02-02 23:11:31 -06:00

mob.h

Some minor cleanup. [skip ci]

2015-01-31 17:03:44 -05:00

mod_functions_base.cpp

Renamed zone files

2014-08-21 23:46:01 -07:00

mod_functions.cpp

mod_functions.cpp #include cleanup

2014-11-29 15:56:51 -06:00

net.cpp

Merge remote-tracking branch 'remotes/origin/master' into web_interface

2015-02-02 23:11:31 -06:00

net.h

net.h cleanup

2014-11-29 04:56:42 -06:00

npc_ai.cpp

Renamed zone files

2014-08-21 23:46:01 -07:00

npc_ai.h

Renamed zone files

2014-08-21 23:46:01 -07:00

npc.cpp

Fix some zone/npc.cpp functions

2015-01-31 17:33:41 -05:00

npc.h

Switch AI timers to smart pointers

2015-01-27 21:28:38 -05:00

object.cpp

Send item recast timestamps picking up ground spawns

2015-01-31 20:54:56 -05:00

object.h

object.cpp & .h header cleanup

2014-12-15 18:03:33 -06:00

oldcode.cpp

Remove commented printf : Adding item2: %i

2015-01-20 01:34:50 -06:00

oldcode.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

oriented_bounding_box.cpp

Updated version of glm

2015-01-22 16:52:50 -08:00

oriented_bounding_box.h

Updated version of glm

2015-01-22 16:52:50 -08:00

pathing.cpp

Merge fixes, hopefully didn't break anything.

2015-01-23 13:36:27 -08:00

pathing.h

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

perl_client.cpp

Merge fixes, hopefully didn't break anything.

2015-01-23 13:36:27 -08:00

perl_doors.cpp

Merge fixes, hopefully didn't break anything.

2015-01-23 13:36:27 -08:00

perl_entity.cpp

Merge remote-tracking branch 'remotes/origin/master' into web_interface

2015-02-02 23:11:31 -06:00

perl_groups.cpp

Rename debug.h to global_define.h, update cmakelists and such

2015-01-19 04:12:09 -06:00

perl_hateentry.cpp

Rename debug.h to global_define.h, update cmakelists and such

2015-01-19 04:12:09 -06:00

perl_mob.cpp

Merge fixes, hopefully didn't break anything.

2015-01-23 13:36:27 -08:00

perl_npc.cpp

Merge fixes, hopefully didn't break anything.

2015-01-23 13:36:27 -08:00

perl_object.cpp

Rename debug.h to global_define.h, update cmakelists and such

2015-01-19 04:12:09 -06:00

perl_perlpacket.cpp

Rename debug.h to global_define.h, update cmakelists and such

2015-01-19 04:12:09 -06:00

perl_player_corpse.cpp

Rename debug.h to global_define.h, update cmakelists and such

2015-01-19 04:12:09 -06:00

perl_questitem.cpp

Rename debug.h to global_define.h, update cmakelists and such

2015-01-19 04:12:09 -06:00

perl_raids.cpp

Rename debug.h to global_define.h, update cmakelists and such

2015-01-19 04:12:09 -06:00

perlpacket.cpp

Rename debug.h to global_define.h, update cmakelists and such

2015-01-19 04:12:09 -06:00

perlpacket.h

Added types.h to more files that relied on mutex.h to get to debug.h to get to types.h

2015-01-19 04:04:50 -06:00

perlparser.h

Cleanup perl parsers

2013-05-09 21:25:50 -07:00

petitions.cpp

More cleanup of some QueryDatabase references that no longer need auto results

2015-01-19 05:38:23 -06:00

petitions.h

petitions.cpp & .h header include cleanup

2014-12-15 18:14:56 -06:00

pets.cpp

Implemented mob equipment light sources

2015-01-24 22:00:06 -05:00

pets.h

Added defines for all remaining pet commands and some support for them as well.

2015-01-06 19:14:06 -06:00

position.cpp

Fix for polluted headers that were messing with glm

2015-01-23 17:58:03 -08:00

position.h

Fix for polluted headers that were messing with glm

2015-01-23 17:58:03 -08:00

qglobals.cpp

qglobals.cpp & .h include header cleanup

2014-12-15 18:22:27 -06:00

qglobals.h

qglobals.cpp & .h include header cleanup

2014-12-15 18:22:27 -06:00

queryserv.cpp

Rename debug.h to global_define.h, update cmakelists and such

2015-01-19 04:12:09 -06:00

queryserv.h

Character creation process crash fix (world) and query cleanup

2014-08-24 07:13:15 -05:00

quest_interface.h

Changed void* to EQEmu::Any in quest interface. Been meaning to change from void* for a while to a structure that data hides instead.

2014-08-25 22:59:52 -07:00

quest_parser_collection.cpp

Merge remote-tracking branch 'remotes/origin/master' into logging_changes

2015-01-21 17:29:30 -06:00

quest_parser_collection.h

quest_parser_collection.cpp & .h header include cleanup

2014-12-15 18:33:23 -06:00

quest.cpp

Renamed zone files

2014-08-21 23:46:01 -07:00

quest.h

Renamed zone files

2014-08-21 23:46:01 -07:00

questmgr.cpp

Merge fixes, hopefully didn't break anything.

2015-01-23 13:36:27 -08:00

questmgr.h

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

queues.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

raid.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

raids.cpp

Merge fixes, hopefully didn't break anything.

2015-01-23 13:36:27 -08:00

raids.h

raids.cpp & .h header include cleanup and forward declare

2014-12-15 18:38:54 -06:00

raycast_mesh.cpp

Renamed zone files

2014-08-21 23:46:01 -07:00

raycast_mesh.h

Renamed zone files

2014-08-21 23:46:01 -07:00

remote_call_subscribe.cpp

Wrong iter type fails on gcc 4.6

2014-12-19 17:52:53 -08:00

remote_call_subscribe.h

A few calls added, forget where I was but just pushing so KLS can start looking at the quest stuff

2014-10-03 18:45:32 -05:00

remote_call.cpp

Added "heading" to Zone.SetEntityAttribute

2014-12-08 05:40:59 -06:00

remote_call.h

Zone.GetEntityAttributes

2014-12-07 19:43:00 -06:00

skills.h

Converted SkillType typedef enumeration to SkillUseTypes enumeration

2013-10-27 13:03:41 -04:00

spawn2.cpp

Merge plus changed getposition to return a reference

2015-01-24 11:48:06 -08:00

spawn2.h

spawn2.cpp & .h header include cleanup

2014-12-15 18:42:14 -06:00

spawngroup.cpp

Rename debug.h to global_define.h, update cmakelists and such

2015-01-19 04:12:09 -06:00

spawngroup.h

spawngroup.cpp & .h header include cleanup

2014-12-15 18:44:36 -06:00

special_attacks.cpp

Some minor cleanup. [skip ci]

2015-01-31 17:03:44 -05:00

spell_effects.cpp

Fix for minimum charm and root resist chances (was always returning 0).

2015-01-30 18:47:27 -05:00

spells.cpp

remove debug...

2015-02-01 06:32:56 -05:00

string_ids.h

Ranged attacks will now much more accurately calculate max distance server side

2014-12-04 02:40:51 -05:00

tasks.cpp

Merge remote-tracking branch 'remotes/origin/master' into logging_changes

2015-01-21 17:29:30 -06:00

tasks.h

Updated $client->UpdateTaskActivity to have optional argument ignore_quest_update IE: Client::UpdateTaskActivity(THIS, TaskID, ActivityID, Count, [ignore_quest_update])

2014-12-29 05:35:50 -06:00

titles.cpp

More cleanup of some QueryDatabase references that no longer need auto results

2015-01-19 05:39:51 -06:00

titles.h

titles.cpp & .h header cleanup and forward declare

2014-12-15 18:56:23 -06:00

tradeskills.cpp

More cleanup of some QueryDatabase references that no longer need auto results

2015-01-19 05:38:23 -06:00

trading.cpp

Changed a log entry to use Trade category instead of none

2015-01-24 04:55:03 -06:00

trap.cpp

Merge fixes, hopefully didn't break anything.

2015-01-23 13:36:27 -08:00

trap.h

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

tribute.cpp

Remove Duplicative MySQL Error: Error in LoadTributes level query '%s': %s

2015-01-19 05:25:17 -06:00

tune.cpp

Post merge manual fixes

2015-01-21 16:49:25 -06:00

water_map_v1.cpp

Fix for x and y swapped on water maps

2015-01-23 12:23:24 -08:00

water_map_v1.h

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

water_map_v2.cpp

Fix for x and y swapped on water maps

2015-01-23 12:23:24 -08:00

water_map_v2.h

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

water_map.cpp

water_map.cpp header include cleanup

2014-12-15 19:05:52 -06:00

water_map.h

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

waypoints.cpp

Natedog: Fix #gassign to work more appropriately and simplify the function

2015-01-25 23:27:44 -06:00

worldserver.cpp

Merge remote-tracking branch 'remotes/origin/master' into web_interface

2015-02-02 23:11:31 -06:00

worldserver.h

Small world server cleanup

2014-11-29 05:01:49 -06:00

zone_config.cpp

zone_config structure clean

2014-12-15 19:16:53 -06:00

zone_config.h

Renamed zone files

2014-08-21 23:46:01 -07:00

zone.cpp

Merge remote-tracking branch 'remotes/origin/master' into web_interface

2015-02-02 23:11:31 -06:00

zone.h

Add sanity checks to GMSayHookCallBackProcess

2015-02-01 01:05:39 -06:00

zonedb.cpp

Out of bounds bandoleer fix

2015-02-02 00:18:29 -05:00

zonedb.h

Make items with long reuse timers show the timer after zone

2015-01-31 17:53:50 -05:00

zonedump.h

Implemented mob equipment light sources

2015-01-24 22:00:06 -05:00

zoning.cpp

Merge fixes, hopefully didn't break anything.

2015-01-23 13:36:27 -08:00