358 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
683a81a6c8 Post merge fixes 2015-01-21 18:39:36 -06: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
3d74035e24 Merge remote-tracking branch 'remotes/origin/master' into logging_changes
Conflicts:
	zone/command.cpp
	zone/command.h
	zone/inventory.cpp
2015-01-21 16:40:46 -06:00
Akkadius
013216ff2b Remove Unneeded DebugBreak 2015-01-20 19:41:30 -06:00
Akkadius
a6a86f030c Remove Unneeded DebugBreak 2015-01-20 19:41:29 -06:00
Akkadius
56b0a2aa4f Remove Unneeded DebugBreak 2015-01-20 19:41:28 -06:00
Akkadius
07d2eab183 Remove Unneeded DebugBreak 2015-01-20 19:41:27 -06:00
Akkadius
90dd9f8aeb Remove Unneeded DebugBreak 2015-01-20 19:41:26 -06:00
Akkadius
32cba9083c Remove Unneeded DebugBreak 2015-01-20 19:41:25 -06:00
Akkadius
26b65a05a9 Remove Unneeded DebugBreak 2015-01-20 19:41:24 -06:00
Akkadius
0db638c8c0 Remove Unneeded DebugBreak 2015-01-20 19:41:23 -06:00
Akkadius
456356d626 Remove Unneeded DebugBreak 2015-01-20 19:41:22 -06:00
Akkadius
29fe791ad0 Remove Unneeded DebugBreak 2015-01-20 19:41:21 -06:00
Akkadius
6c545a144c Remove Unneeded DebugBreak 2015-01-20 19:41:20 -06:00
Akkadius
6e582fb68f Remove Unneeded DebugBreak 2015-01-20 19:41:19 -06:00
Akkadius
a19f7f702c Remove Unneeded DebugBreak 2015-01-20 19:41:18 -06:00
Akkadius
f44155a317 Remove Unneeded DebugBreak 2015-01-20 19:41:17 -06:00
Akkadius
7fef8de50a Remove Unneeded DebugBreak 2015-01-20 19:41:14 -06:00
Akkadius
440ca97a79 Remove Unneeded DebugBreak: 2015-01-20 19:40:55 -06:00
Akkadius
b5fe23a4c3 Remove commented std::cout : CastToTrap error 2015-01-20 01:30:56 -06:00
Akkadius
849ec2850f Remove commented std::cout : CastToTrap error 2015-01-20 01:30:53 -06:00
Uleat
e70e443950 Implemented 'enum class ClientVersion' -- added 'RoF2' to lua client version enumeration 2015-01-19 23:32:57 -05:00
Akkadius
0d9b6703a6 Rename debug.h to global_define.h, update cmakelists and such 2015-01-19 04:12:09 -06:00
Akkadius
abc2f9cace Convert 'Dropping client:' to Zone Status 2015-01-19 03:00:32 -06:00
Arthur Ice
f33eb9f8f3 Removed a usage of Mob::DistNoRootNoZ and used ComparativeDistanceNoZ instead 2015-01-18 03:09:08 -08: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
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
Arthur Ice
30eb545b0b Removed a usage of Mob::DistNoRoot and used ComparativeDistance instead 2015-01-17 22:37:28 -08:00
Arthur Ice
d01f307edc Removed a usage of Mob::DistNoRoot and used ComparativeDistance instead 2015-01-17 22:34:49 -08:00
Arthur Ice
84c82ca4ab Removed a usage of Mob::DistNoRoot and used ComparativeDistance instead 2015-01-17 22:12:36 -08:00
Arthur Ice
91221db4c9 Removed a usage of Mob::DistNoRoot and used ComparativeDistance instead 2015-01-17 22:07:17 -08:00
Arthur Ice
7dce5c4e6f Removed a usage of Mob::DistNoRoot and used ComparativeDistance instead 2015-01-17 21:45:31 -08:00
Arthur Ice
3f37aef41c Removed a usage of Mob::DistNoRoot and used ComparativeDistance instead 2015-01-17 21:41:53 -08:00
Arthur Ice
8eea92654f Removed a usage of Mob::DistNoRoot and used ComparativeDistance instead 2015-01-17 21:38:44 -08:00
Arthur Ice
2d7297dc67 Removed a usage of Mob::DistNoZ and used DistanceNoZ instead 2015-01-17 17:51:52 -08:00
Arthur Ice
8895dd599e Removed usage of Mod::Dist and used Distance instead 2015-01-17 17:44:17 -08:00
Arthur Ice
a60c37098c Removed usage of Mod::Dist and used Distance instead 2015-01-17 17:41:26 -08:00
Arthur Ice
a135a3d597 Added explicit xyz_heading overrides for the 4 distance functions 2015-01-17 16:08:45 -08:00
Arthur Ice
70a9a4e7cd Removed usage of Mob::DistNoRoot and used ComparativeDistance instead 2015-01-17 15:42:58 -08:00
Michael Cook (mackal)
fd77fbf163 Merge pull request #313 from addtheice/data_bundling
Data bundling
2015-01-17 17:30:14 -05:00
Akkadius
d21466566e Remove some mlog related functions in Mob:: 2015-01-16 21:53:56 -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
26b550dd0d More log replacements 2015-01-10 16:01:43 -06:00
Akkadius
b76e179d75 Fix spacing 2015-01-10 15:47:36 -06:00