Natedog2012
aa749f27dc
Merge branch 'master' of https://github.com/EQEmu/Server into web_interface
...
# Conflicts:
# zone/attack.cpp
# zone/entity.cpp
# zone/net.cpp
# zone/worldserver.cpp
# zone/zone.cpp
2016-08-18 03:57:06 -07:00
Michael Cook (mackal)
60da544d3a
clang-tidy modernize-use-auto
2016-05-25 16:10:28 -04:00
Akkadius
dd6d1d5511
Merge remote-tracking branch 'remotes/origin/master' into web_interface
...
Conflicts:
CMakeLists.txt
common/logtypes.h
common/shareddb.cpp
world/net.cpp
zone/client_logs.cpp
zone/corpse.cpp
zone/mob.cpp
zone/net.cpp
2015-02-02 23:11:31 -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
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
0d9b6703a6
Rename debug.h to global_define.h, update cmakelists and such
2015-01-19 04:12:09 -06:00
Arthur Ice
54f3f7f343
EntityList::GetRandomClient converted to xyz_location
2014-11-30 22:28:17 -08:00
Chris M
e442d682cd
Added rapidjson library
...
Added web_interface_utils.cpp/.h to common to provide string based functions for outputting JSON
Adjusted CMake to include rapidjson library and new web_interface_utils.h/cpp to common
Currently, I have code set up hackishly for testing so do not think it is final. It is merely for demonstrating what I've done and played with.
2014-07-20 15:02:06 -05:00
Michael Cook (mackal)
970b30b467
Added entity_list::IsMobSpawnedByNpcTypeID
...
Exported to both lua and perl
2014-02-25 23:15:14 -05: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
f32048808a
c++11 linux compile conflicts with perl
2013-02-23 00:06:03 -08:00
KimLS
8eb7d0aaa8
Skill caps load with new smem scheme
2013-02-20 13:54:26 -08:00
KimLS
da7347f76f
svn -> git Migration
2013-02-16 16:14:39 -08:00
