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

..

aa.cpp

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

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

aa.h

Linux fix for Mob type in AA_SwarmPetInfo.

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

aggro.cpp

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

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

attack.cpp

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

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

basic_functions.h

Change space indentation to tabs

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

beacon.cpp

removed unused macro debug message

2015-01-17 14:55:41 -08:00

beacon.h

beacon.h/cpp header cleanup

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

bonuses.cpp

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

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

bot_structs.h

Renamed zone files

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

bot.cpp

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

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

bot.h

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

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

botspellsai.cpp

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

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

client_mods.cpp

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

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

client_packet.cpp

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

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

client_packet.h

client_packet.cpp #include cleanup

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

client_process.cpp

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

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

client.cpp

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

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

client.h

Fix compile error with GCC

2015-01-20 00:04:22 -05:00

CMakeLists.txt

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

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

command.cpp

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

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

command.h

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

2015-01-21 16:40:46 -06:00

common.h

Switch NUMHIT_ enum to a strongly typed enum

2015-01-17 16:18:09 -05:00

corpse.cpp

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

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

corpse.h

merge upstream

2014-12-21 13:57:20 -08:00

doors.cpp

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

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

doors.h

merge upstream

2014-12-21 13:57:20 -08:00

effects.cpp

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

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

embparser_api.cpp

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

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

embparser.cpp

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

2015-01-21 17:29:30 -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 logging_changes

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

entity.h

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

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

errmsg.h

Change space indentation to tabs

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

event_codes.h

Lua packet handler dispatch

2013-07-13 13:53:41 -07:00

exp.cpp

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

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

fearpath.cpp

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

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

forage.cpp

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

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

forage.h

Change space indentation to tabs

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

groups.cpp

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

2015-01-21 17:29:30 -06: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

Removed a usage of Mob::DistNoRootNoZ and used ComparativeDistanceNoZ instead

2015-01-18 03:12:08 -08:00

hate_list.h

Some more refactoring of hate_list

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

horse.cpp

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

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

horse.h

merge upstream

2014-12-21 13:57:20 -08:00

inventory.cpp

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

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

loottables.cpp

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

2015-01-19 04:12:09 -06: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

Implemented 'enum class ClientVersion' -- added 'RoF2' to lua client version enumeration

2015-01-19 23:32:57 -05: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

Replaced SetX(), SetY(), SetZ(), and SetHeading() with SetPosition() on Doors

2014-11-30 20:37:43 -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

EntityList::GetRandomClient converted to xyz_location

2014-11-30 22:28:17 -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

Implemented 'enum class ClientVersion' -- added 'RoF2' to lua client version enumeration

2015-01-19 23:32:57 -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

merge upstream

2015-01-08 19:40:00 -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

GetSpawnPointX(), GetSpawnPointY(), GetSpawnPointZ(), and GetSpawnPointH(), converted to GetSpawnPoint()

2014-11-30 15:58:44 -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

We don't need to cast these anymore

2015-01-18 18:29:37 -05:00

lua_parser_events.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_parser.cpp

We don't need to cast these anymore

2015-01-18 18:29:37 -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

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

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

map.h

merge upstream

2014-12-21 13:57:20 -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

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

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

merc.h

Update npc_types table.

2014-12-24 01:26:07 -05: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 logging_changes

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

mob.cpp

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

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

mob.h

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

2015-01-21 17:29:30 -06: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

Add file log handling in every process

2015-01-20 06:15:56 -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

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

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

npc.h

merge upstream

2015-01-08 19:40:00 -08:00

object.cpp

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

2015-01-21 17:29:30 -06: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

Initial v2 water map format.

2014-05-20 00:14:26 -07:00

oriented_bounding_box.h

Initial v2 water map format.

2014-05-20 00:14:26 -07:00

pathing.cpp

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

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

pathing.h

std::deque is a much better fit, should have bit better performance

2014-12-18 02:20:03 -05:00

perl_client.cpp

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

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

perl_doors.cpp

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

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

perl_entity.cpp

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

2015-01-21 17:29:30 -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 remote-tracking branch 'remotes/origin/master' into logging_changes

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

perl_npc.cpp

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

2015-01-21 17:29:30 -06: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

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

2015-01-21 17:29:30 -06: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

Update to 6535690a69dd0693cf4d3a8fd075cf605822c143 to make explicit #include rather than implicit.

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

position.h

Added 'GetReciprocalHeading' to position.cpp/h

2015-01-18 12:23:55 -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 remote-tracking branch 'remotes/origin/master' into logging_changes

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

questmgr.h

merge upstream

2015-01-08 19:40:00 -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 remote-tracking branch 'remotes/origin/master' into logging_changes

2015-01-21 17:29:30 -06: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

skills.h

Converted SkillType typedef enumeration to SkillUseTypes enumeration

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

spawn2.cpp

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

2015-01-21 17:29:30 -06: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

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

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

spell_effects.cpp

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

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

spells.cpp

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

2015-01-21 17:29:30 -06: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

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

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

trap.cpp

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

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

trap.h

merge upstream

2014-12-21 13:57:20 -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

Initial v2 water map format.

2014-05-20 00:14:26 -07:00

water_map_v1.h

Initial v2 water map format.

2014-05-20 00:14:26 -07:00

water_map_v2.cpp

InLiquid converted to xyz_location

2014-11-26 19:39:39 -08:00

water_map_v2.h

InLiquid converted to xyz_location

2014-11-26 19:39:39 -08:00

water_map.cpp

water_map.cpp header include cleanup

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

water_map.h

merge upstream

2015-01-08 19:40:00 -08:00

waypoints.cpp

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

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

worldserver.cpp

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

2015-01-21 17:29:30 -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 logging_changes

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

zone.h

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

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

zonedb.cpp

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

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

zonedb.h

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

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

zonedump.h

(RoF+) Added herosforgemodel field to the npc_types table. Not fully functional yet for NPCs (currently only displays helm correctly).

2014-12-24 02:31:37 -06:00

zoning.cpp

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

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