19fc02c284
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
changelog.txt
world/worlddb.cpp
2015-02-23 08:13:09 -05:00
e4be4d6895
Pre-purposed clean-up
2015-02-17 13:58:26 -05:00
eaf5cea908
Fixed a comment
2015-02-14 10:29:43 -05:00
1966324112
Changed NPCTypes Data to bulk load when the zone loads or Repops, this bulk loading is stored in the npc_types cache
2015-02-12 19:57:24 -06:00
c9cd733d9a
Updated command #iteminfo
2015-02-06 12:09:26 -05:00
2bf2485b4c
Enforced const_interator returns on const_iterator return types in Inventory and ItemInst
2015-02-06 07:57:15 -05:00
02e56331ec
Have is_category_enabled update appropriately when settings are set via #logs
2015-02-01 19:57:02 -06:00
b592d2e786
clang format some stuff in zone/command.cpp
2015-01-30 18:32:28 -05:00
a698eff106
Natedog: Fix #gassign to work more appropriately and simplify the function
2015-01-25 23:27:44 -06:00
5266d7b25c
Add extra checking at the root of Log.Out to check if the category is subscribed to any of the output methods before trying to parse message strings and then pass them to the sub output functions and THEN perform log_setting checks and debug_level checks.
...
I performed a unit test of 1,000,000 log writes, there is hardly any difference.
#::: Before Checks
[01-25-2015 :: 03:15:35] [999999] Test #2... Took 17.940001 seconds
#::: With Checks
[01-25-2015 :: 04:10:55] [999999] Test #2... Took 18.018000 seconds
2015-01-25 04:24:05 -06:00
5e107a9936
Help Travis figure out what time of day it is
2015-01-25 02:23:05 -06:00
13af3e35e2
Removed COMMANDS_LOGGING ifdef
2015-01-24 22:48:06 -06:00
36e01cb9f1
Adjust some commands that default to 0, change Log commands to Commands category instead of Error
2015-01-24 22:46:40 -06:00
cc1d7d54c2
Implemented mob equipment light sources
2015-01-24 22:00:06 -05:00
34bec5913b
Merge plus changed getposition to return a reference
2015-01-24 11:48:06 -08:00
d0595e3794
Remove log junk from command_spawn
2015-01-24 04:38:22 -06:00
04623b2c0c
Remove preprocessor and convert log message
2015-01-24 04:31:09 -06:00
e18a49a974
Cleanup in command_guild
2015-01-24 04:28:41 -06:00
50ccb52465
Adjust logging in command_time
2015-01-24 04:27:32 -06:00
d7a2387f3d
Sort command_init alphabetically and cleanup
2015-01-24 04:22:33 -06:00
734a2c42b2
Remove some processor and cleanup logging around Commands
2015-01-24 04:17:58 -06:00
e1747c43b9
Remove occurrences of LogSQL
2015-01-24 03:49:20 -06:00
8ba8a1e6fa
Remove occurrences of LogSQL
2015-01-24 03:49:14 -06:00
4e9cfa7c30
Remove occurrences of LogSQL
2015-01-24 03:49:13 -06:00
2d24b1f37e
Remove occurrences of LogSQL
2015-01-24 03:49:12 -06:00
c218419ecc
Remove occurrences of LogSQL
2015-01-24 03:49:12 -06:00
c88bf64bd5
Remove occurrences of LogSQL
2015-01-24 03:49:11 -06:00
377c071918
Remove occurrences of LogSQL
2015-01-24 03:49:10 -06:00
d2011e58b4
Remove occurrences of LogSQL
2015-01-24 03:49:09 -06:00
384c041ea9
Remove occurrences of LogSQL
2015-01-24 03:49:09 -06:00
d78b9ff2a1
Remove occurrences of LogSQL
2015-01-24 03:49:08 -06:00
c28570f92e
Remove occurrences of LogSQL
2015-01-24 03:49:07 -06:00
71f0d86767
Remove occurrences of LogSQL
2015-01-24 03:49:06 -06:00
fcd4923938
Remove occurrences of LogSQL
2015-01-24 03:49:05 -06:00
f18b9d79da
Remove occurrences of LogSQL
2015-01-24 03:49:05 -06:00
2457f5f455
Remove occurrences of LogSQL
2015-01-24 03:49:03 -06:00
acb78cec17
Remove command_logsql as it is completely unecessary now
2015-01-24 03:40:11 -06:00
17af9e3808
Merge fixes, hopefully didn't break anything.
2015-01-23 13:36:27 -08:00
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
f702e953e7
Some std::abs usage and a bit of clang-formatting
2015-01-22 22:59:52 -05:00
4f931c45fb
Adjusting #logs verbiage
2015-01-22 02:21:41 -06:00
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
51b3ae9e0a
Add shownumhits command back in from merge
2015-01-21 16:55:56 -06:00
1e59416f33
Post merge manual fixes
2015-01-21 16:49:25 -06:00
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
a59138d2d9
Implement #logs reload_all - To reload world and zone their log settings from the database
2015-01-21 03:01:21 -06:00
ef0d383de9
Adjust #logs set
2015-01-21 02:12:22 -06:00
47bb4c0b2b
Implement #logs set [console|file|gmsay] <category_id> <debug_level (1-3)>
2015-01-21 01:26:33 -06:00
6cfe9e301b
Preliminary log setting commands
2015-01-21 00:01:28 -06:00
d4460b94be
Rename #log to #logs after thinking deeply about it
2015-01-20 23:21:32 -06:00
Paul Coene
Uleat
Akkadius
Michael Cook (mackal)
KimLS