4044 Commits

Author SHA1 Message Date
Natedog2012
057f4ed1f4 Fix for incorrect formatting type 2015-01-23 23:17:23 -05:00
KimLS
669bca8da8 Fix for bots compile 2015-01-23 18:24:53 -08:00
KimLS
a7710c027b Fix for polluted headers that were messing with glm 2015-01-23 17:58:03 -08:00
KimLS
17af9e3808 Merge fixes, hopefully didn't break anything. 2015-01-23 13:36:27 -08:00
Michael Cook (mackal)
06ff4823d3 Minor tweaking to new logsys 2015-01-23 15:48:20 -05:00
KimLS
143c0cf0f9 Fix for x and y swapped on water maps 2015-01-23 12:23:24 -08:00
Natedog2012
451983ffc9 Fix formatting on this.. which caused major zone crashes 2015-01-23 14:16:16 -05: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
KimLS
03286f540a Updated version of glm 2015-01-22 16:52:50 -08:00
Alex
7bfc3a48a8 Merge pull request #343 from noudess/master
Made familiars persistent.
2015-01-22 16:48:38 -08:00
Akkadius
908c7b1464 Re-Fix Skills log message print types 2015-01-22 15:56:03 -06:00
Akkadius
4f931c45fb Adjusting #logs verbiage 2015-01-22 02:21:41 -06:00
Akkadius
83e90ddc6d Merge remote-tracking branch 'remotes/origin/logging_changes' 2015-01-22 00:34:58 -06:00
KayenEQ
26b91a0a97 Merge pull request #346 from KayenEQ/Development
removed extra semi colon..
2015-01-21 22:03:03 -05:00
KayenEQ
d25b750c2c removed extra semi colon.. 2015-01-21 22:02:05 -05:00
Akkadius
b93bbc64fd Merge remote-tracking branch 'remotes/origin/master' into logging_changes 2015-01-21 20:04:17 -06:00
Akkadius
b4ff915cbb Change zone file log name format once it boots up 2015-01-21 19:39:51 -06:00
Akkadius
9f25b52f9a Change some zone server Logging to General (Level 1) debugging 2015-01-21 19:08:43 -06:00
Akkadius
46010fbfdf Rename LoadLogSysSettings to LoadLogSettings 2015-01-21 19:04:13 -06:00
Uleat
b186b0538a Activated light field load from npctypes table 2015-01-21 20:01:59 -05:00
Akkadius
92737339b3 Properly close process files in zone and world 2015-01-21 18:46:56 -06: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
51b3ae9e0a Add shownumhits command back in from merge 2015-01-21 16:55:56 -06:00
Akkadius
1e59416f33 Post merge manual fixes 2015-01-21 16:49:25 -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
a59138d2d9 Implement #logs reload_all - To reload world and zone their log settings from the database 2015-01-21 03:01:21 -06:00
Akkadius
ef0d383de9 Adjust #logs set 2015-01-21 02:12:22 -06:00
Akkadius
47bb4c0b2b Implement #logs set [console|file|gmsay] <category_id> <debug_level (1-3)> 2015-01-21 01:26:33 -06:00
Akkadius
6cfe9e301b Preliminary log setting commands 2015-01-21 00:01:28 -06:00
Akkadius
d4460b94be Rename #log to #logs after thinking deeply about it 2015-01-20 23:21:32 -06:00
Akkadius
1871c3f24f Implement first pieces of #log 2015-01-20 23:18:23 -06:00
Akkadius
c202b9e7b6 Linux fix in worldserver.cpp with __FUNCTION__ 2015-01-20 19:54:08 -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