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
be37525414
Remove Duplicative MySQL Error: Error in Mount query '%s': %s
2015-01-19 05:25:07 -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
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
Arthur Ice
f409d39f1a
merge upstream
2014-12-21 13:57:20 -08:00
Akkadius
abe471af64
horse.cpp & .h header cleanup and forward declare
2014-12-15 17:39:16 -06:00
Arthur Ice
708b4f3bfb
Horse constructor converted to xyz_heading
2014-11-30 18:33:45 -08:00
Arthur Ice
54bc1b06e4
NPC constructor converted to use xyz_heading
2014-11-30 17:32:11 -08:00
Alex
d03232ce1b
Merge pull request #199 from addtheice/RunQueryToDatabaseQuery_zone_horse
...
Run query to database query zone horse
2014-08-22 13:47:07 -07:00
KimLS
7fc21b9e3a
Tons of renames
2014-08-21 19:33:02 -07:00
Arthur Ice
9814a6e5a2
BuildHorseType converted to QueryDatabase
2014-08-18 20:55:28 -07:00
KimLS
1f2145a45d
Fix for special_abilities crash dealing with std::string in struct that was then memcpyed
2013-07-18 00:24:43 -07:00
KimLS
63d678ce29
Replaced npcspecialatk with special_attacks, needs more testing also gotta export new api for it as I can't remove the legacy one. Too many quests rely on the legacy functionality.
2013-07-06 03:45:06 -07:00
KimLS
e6fba5ba82
Merging
2013-05-23 00:31:02 -07:00
Michael Cook
0fdfe025cb
Remove 'using namespaces std' fixes #61
2013-05-22 16:17:19 -04:00
Arthur Ice
f1a487f606
Merge branch 'master' into StringFormatting.
...
Cleaned up the problems. Tested on Linux. Still need to test on windows.
Conflicts:
common/CMakeLists.txt
common/MiscFunctions.cpp
common/MiscFunctions.h
common/debug.cpp
world/Adventure.cpp
2013-05-19 18:56:21 -07:00
Arthur Ice
373ff66240
moved string functions from MiscFunctions to StringUtil
2013-05-11 00:05:11 -07:00
j883376
4bdd8b2502
Change space indentation to tabs
2013-05-09 11:37:51 -04:00
j883376
ffcff4aea1
Remove trailing whitespace
2013-05-09 11:13:16 -04:00
Arthur Ice
7560b6b0a7
NULL to nullptr
2013-05-04 18:06:58 -07:00
KimLS
da7347f76f
svn -> git Migration
2013-02-16 16:14:39 -08:00
