119 Commits

Author SHA1 Message Date
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
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
0d9b6703a6 Rename debug.h to global_define.h, update cmakelists and such 2015-01-19 04:12:09 -06:00
Akkadius
467b359d0c Moved all EQEmuLogSys:: enum references used in Log.Out to a namespace 'Logs' for shortening of syntax 2015-01-18 02:20:16 -06:00
Akkadius
c025765283 Renamed DoLog to Out as the aggregate logging function for simplicity of use and shortened syntax of Log.Out 2015-01-18 02:00:15 -06:00
Akkadius
1c048cb1d1 Renamed DebugCategory to DoLog as the aggregate logging function for simplicity of use and shortened syntax of Log.DoLog 2015-01-18 01:54:09 -06:00
Akkadius
40d0fba63f Consolidate 'LogType' Quest logs over to 'LogCategory' 2015-01-18 01:32:57 -06:00
Akkadius
e691735a2d Consolidate 'LogType' Error logs over to 'LogCategory' 2015-01-18 01:30:25 -06:00
Akkadius
7dbde36b03 Rename reference logger to Log 2015-01-18 00:41:18 -06:00
Akkadius
132fbbb0c6 Rename LogDebugType to DebugCategory 2015-01-16 03:09:02 -06:00
Akkadius
4811631127 Convert _log from TASKS category 2015-01-12 21:19:19 -06:00
Akkadius
18c837c398 Replaced various other log calls in zone 2015-01-10 15:59:32 -06:00
Akkadius
b76e179d75 Fix spacing 2015-01-10 15:47:36 -06:00
Akkadius
6844645dfb Replace LogFile->write(EQEmuLog::Error, with logger.logevents(EQEmuLogSys::Error 2015-01-10 15:44:35 -06:00
Arthur Ice
cd9ca65587 merge upstream 2015-01-08 19:40:00 -08:00
Akkadius
be381b4e56 Renamed EQEMuLog class to EQEmuLog 2015-01-08 19:46:28 -06:00
Uleat
4b133c808c It helps if you actually push more than the changelog message... 2015-01-05 13:50:03 -05:00
Akkadius
81dfffadf6 Updated $client->UpdateTaskActivity to have optional argument ignore_quest_update IE: Client::UpdateTaskActivity(THIS, TaskID, ActivityID, Count, [ignore_quest_update])
Also updated internal UpdateTaskActivity methods to optionally ignore quest based task updates to prevent feedback
2014-12-29 05:35:50 -06:00
Uleat
dab3d1181e Implemented class Client::TextLink 2014-12-28 12:49:14 -05:00
Uleat
d9dc2eb4e3 Thought something looked like it was missing! 2014-12-25 21:45:38 -05:00
Uleat
270fe3389c Updated item/say links for all clients. They should be a little easier to keep track of now. 2014-12-25 11:04:01 -05:00
Uleat
34ab3e10f5 Added some nullptr checks for ItemInst* in a few places (tradeskills.cpp - particularly augments - needs a better review) 2014-12-23 10:14:45 -05:00
Arthur Ice
f409d39f1a merge upstream 2014-12-21 13:57:20 -08:00
Akkadius
c43377100e questmgr.cpp & .h include cleanup 2014-12-15 18:35:27 -06:00
Trevius
97a34b5793 The RoF2 client is now enabled by default. It is almost caught up to RoF Client compatibility. 2014-12-06 14:38:34 -06:00
Arthur Ice
2aa287fe3c Merge 2014-12-05 20:16:13 -08:00
Arthur Ice
f6c98132f0 SummonAllCorpses converted to xyz_heading 2014-12-02 14:50:48 -08:00
Arthur Ice
4daf4ab507 QuestManager::unique_spawn converted to xyz_heading 2014-12-02 14:36:51 -08:00
Arthur Ice
2e0cfa86bf QuestManager::spawn2 converted to xyz_heading 2014-12-02 13:27:01 -08:00
Arthur Ice
7a74df5ff1 summonallplayercorpses converted to xyz_heading 2014-12-02 12:42:47 -08:00
Arthur Ice
dd5265dc02 SummonBuriedCharacterCorpses converted to xyz_heading 2014-12-02 12:19:27 -08:00
Arthur Ice
efc4ba0e27 summonburriedplayercorpse converted to xyz_heading 2014-12-02 12:00:45 -08:00
Arthur Ice
04e24ddce4 moveto converted to xyz_heading 2014-12-02 11:20:10 -08:00
Arthur Ice
9d6a89c65d rebind converted to xyz_location 2014-12-02 10:56:02 -08:00
Arthur Ice
7ce7af05f3 SetBindPoint converted to xyz_location 2014-12-02 10:47:46 -08:00
Arthur Ice
8b7a09dbc1 QuestMgr::movePCInstance converted to xyz_heading 2014-11-30 22:14:57 -08:00
Arthur Ice
c8063c31ed QuestMgr::CreateObjectFromModel converted to xyz_heading 2014-11-30 22:05:34 -08:00
Arthur Ice
4c5117cabe QuestManager::CreateGroundObject converted to xyz_heading 2014-11-30 21:42:59 -08:00
Arthur Ice
c3471ed88e EntityList::CreateGroundObject converted to xyz_heading 2014-11-30 21:30:16 -08:00
Arthur Ice
d54215ea18 EntityList::CreateGroundObjectFromModel converted to to xyz_heading 2014-11-30 21:20:46 -08:00
Arthur Ice
4f03ebb3af EntityList::CreateDoor converted to xyz_heading 2014-11-30 21:04:39 -08:00
Arthur Ice
54bc1b06e4 NPC constructor converted to use xyz_heading 2014-11-30 17:32:11 -08:00
Arthur Ice
0570722b3b MoveTo converted to xyz_heading 2014-11-30 16:30:09 -08:00
akkadius
ad9c0df552 #include and forward declaration cleanup of
client.cpp net.cpp questmgr.cpp zone.cpp zone.h
2014-11-29 03:12:34 -06:00
Akkadius
b43cfa126f Renamed SetPKItem to SetPlayerKillItemID
Renamed AllowMobLoot to AllowPlayerLoot
Renamed DepopCorpse (PC) to DepopPlayerCorpse
Renamed GetPKItem to GetPlayerKillItem
Renamed Corpse class variable 'orgname' to 'corpse_name'
Renamed CompleteRezz to CompleteResurrection
Renamed GetDBID to GetCorpseDBID

Removed CorpseToServerSlot as it is unnecessary
Removed ServerToCorpseSlot as it is unnecessary

Reogrganized corpse.h header
2014-11-25 23:54:59 -06:00
Akkadius
111fb84041 Moved zonedatabase functions out of corpse.cpp
Conversion portion mostly complete
Some header readability cleanup
Some function renaming
Struct renaming
Many variable renaming
MySQL error log for all of QueryDatabase
Corpse table renaming
Corpse table field renaming
Most corpse database functions redone
2014-11-22 17:55:48 -06:00
Trevius
c5a90adb39 Grouping with Mercenaries is considerably less buggy. 2014-11-22 00:22:12 -06:00
KimLS
cb0d5ac7d0 Merge branch 'master' of github.com:EQEmu/Server 2014-11-04 21:01:43 -08:00
KimLS
957f05860b Small changes to encounter stuff 2014-11-04 21:01:20 -08:00