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 |
|
Akkadius
|
fac1361d36
|
logger.LoadLogSettings() added after each platform executable registry
Added int return for platform executable
|
2015-01-12 05:15:31 -06:00 |
|
KimLS
|
9e3e8dbfa6
|
Cleaned up web interface server, starting work on getting tcp connections to persist then will hook it up to the websockets/http/whatever else we deem worthy.
|
2014-07-07 22:19:46 -07:00 |
|
Chris M
|
a92b4c04e9
|
Initial Socket Server implementation with CMakeLists.txt updated. Socket server will connect to world at this point.
|
2014-07-02 22:17:45 -05:00 |
|
KimLS
|
f2f4e55818
|
Import/Export util start
|
2013-10-18 21:23:45 -07:00 |
|
j883376
|
4bdd8b2502
|
Change space indentation to tabs
|
2013-05-09 11:37:51 -04:00 |
|
KimLS
|
7ce6f4de0d
|
More shared memory work + moved spdat from zone to common
|
2013-02-19 15:33:21 -08:00 |
|
KimLS
|
da7347f76f
|
svn -> git Migration
|
2013-02-16 16:14:39 -08:00 |
|