104 Commits

Author SHA1 Message Date
Akkadius
a698eff106 Natedog: Fix #gassign to work more appropriately and simplify the function 2015-01-25 23:27:44 -06:00
KimLS
34bec5913b Merge plus changed getposition to return a reference 2015-01-24 11:48:06 -08:00
Akkadius
ce161c2583 Some fixes from replace removal of LogSQL 2015-01-24 03:50:33 -06:00
Akkadius
2457f5f455 Remove occurrences of LogSQL 2015-01-24 03:49:03 -06:00
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
Michael Cook (mackal)
f702e953e7 Some std::abs usage and a bit of clang-formatting 2015-01-22 22:59:52 -05: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
98a49ad086 More cleanup of some QueryDatabase references that no longer need auto results 2015-01-19 05:39:51 -06:00
Akkadius
99baba4762 More cleanup of some QueryDatabase references that no longer need auto results 2015-01-19 05:38:23 -06:00
Akkadius
cacf9df269 Remove Duplicative MySQL Error: Error in GetHighestWaypoint query '%s': %s 2015-01-19 05:26:10 -06:00
Akkadius
499364e9fe Remove Duplicative MySQL Error: Error in GetFreeGrid query '%s': %s 2015-01-19 05:26:09 -06:00
Akkadius
2ef8f79338 Remove Duplicative MySQL Error: Error adding grid entry '%s': '%s' 2015-01-19 05:26:08 -06:00
Akkadius
ca53c40899 Remove Duplicative MySQL Error: Error getting next waypoint id '%s': '%s' 2015-01-19 05:26:06 -06:00
Akkadius
05aba517c2 Remove Duplicative MySQL Error: Error updating spawn2 pathing '%s': '%s' 2015-01-19 05:26:05 -06:00
Akkadius
9003276f23 Remove Duplicative MySQL Error: Error adding grid '%s': '%s' 2015-01-19 05:26:04 -06:00
Akkadius
e5dd2634f9 Remove Duplicative MySQL Error: Error setting pathgrid '%s': '%s' 2015-01-19 05:26:02 -06:00
Akkadius
1595395f69 Remove Duplicative MySQL Error: Error deleting waypoint '%s': '%s' 2015-01-19 05:26:01 -06:00
Akkadius
3f75eba5e0 Remove Duplicative MySQL Error: Error adding waypoint '%s': '%s' 2015-01-19 05:25:59 -06:00
Akkadius
99dd77cff0 Remove Duplicative MySQL Error: Error deleting grid entries '%s': '%s' 2015-01-19 05:25:56 -06:00
Akkadius
430263de9c Remove Duplicative MySQL Error: Error deleting grid '%s': '%s' 2015-01-19 05:25:53 -06:00
Akkadius
e549ae11f2 Remove Duplicative MySQL Error: Error creating grid entry '%s': '%s' 2015-01-19 05:25:44 -06:00
Akkadius
526075a767 Remove Duplicative MySQL Error: Error updating spawn2 '%s': '%s' 2015-01-19 05:25:37 -06:00
Akkadius
598848f4fc Remove Duplicative MySQL Error: Error querying fuzzy spawn2 '%s': '%s' 2015-01-19 05:25:33 -06:00
Akkadius
1b99e3e4d1 Remove Duplicative MySQL Error: Error querying spawn2 '%s': '%s' 2015-01-19 05:25:26 -06:00
Akkadius
cec0b5760d Remove Duplicative MySQL Error: Error in GetWaypoints query '%s': %s 2015-01-19 05:25:22 -06:00
Akkadius
8ac846e32e Remove Duplicative MySQL Error: Error in GetGridType2 query '%s': %s 2015-01-19 05:25:17 -06:00
Akkadius
fa4fb72263 Remove Duplicative MySQL Error: Error in GetHighestGrid query '%s': %s 2015-01-19 05:25:09 -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
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
648494ec16 port mlog '*PATHING*' category to new log system 2015-01-17 02:33:48 -06:00
Akkadius
d4f2e0ce5f port mlog 'AI' category to new log system 2015-01-17 02:20:01 -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
Michael Cook (mackal)
d93edd7393 Make NPCs less jumpy
We actually didn't want that +2.0f
2014-12-31 17:49:12 -05:00
Michael Cook (mackal)
8522542ae2 Use lambdas in sort functions (for zone at least) 2014-12-24 18:29:23 -05:00
Michael Cook (mackal)
7742892377 Fix issue with Mob::MakeNewPositionAndSendUpdate 2014-12-23 22:26:36 -05:00
Arthur Ice
f409d39f1a merge upstream 2014-12-21 13:57:20 -08:00
Akkadius
3edda155c6 Linux build fix 2014-12-15 19:47:08 -06:00
Akkadius
6a6e91abc5 waypoints.cpp header include cleanup 2014-12-15 19:07:31 -06:00
Arthur Ice
2aa287fe3c Merge 2014-12-05 20:16:13 -08:00
Arthur Ice
ad506ece4d Added distance functions for position 2014-12-02 19:28:28 -08:00
Arthur Ice
e58dc94b2c AddWPForSpawn converted to xyz_heading 2014-12-02 18:17:13 -08:00
Arthur Ice
6206133729 AddWP converted to xyz_heading 2014-12-02 17:41:01 -08:00