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
3320867b10
delete world/world_logsys.cpp
2015-01-18 02:40:58 -06:00
KimLS
29b4498534
Hopefully completely merged from master in what is the biggest merge ever
2014-12-07 13:23:16 -08:00
KimLS
4821ed79fb
More renames, world should be done
2014-08-21 23:30:09 -07:00
KimLS
7fc21b9e3a
Tons of renames
2014-08-21 19:33:02 -07:00
KimLS
780789fbad
More work on getting remote calls up and running, added two remote calls list_zones and get_zone_info.
2014-07-30 15:23:14 -07:00
KimLS
b7e36feeeb
Removed more socket server stuff, changed some of the build stuff.
2014-07-14 15:44:28 -07:00
KimLS
80892f1d4d
Reworking a lot of stuff at once, this will look very chaotic.
2014-07-14 15:09:55 -07: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
Corysia Taware
f6046477b4
Changes for intel Mac OSX build
2014-04-03 14:10:03 -07:00
Dmitry Marakasov
7ee417ab05
Simplify conditional linking with libdl
2013-10-09 19:27:52 +04:00
j883376
0578f45490
Revert "Revert "Merge pull request #77 from j883376/cleanups""
...
This reverts commit d25205d9d381dc83d610fa1084019b90cfe83e1c.
2013-06-28 04:25:44 -04:00
KimLS
d25205d9d3
Revert "Merge pull request #77 from j883376/cleanups"
...
This reverts commit 4ff2efea435a235b634904c91381334ce2d38e4b, reversing
changes made to e811e3975b3e6f5f1c3274a501b6f964925281fb.
2013-06-27 12:50:20 -07:00
j883376
536e31d771
Change binary output path to use CMake variable
...
Tools that use CMake's EXECUTABLE_OUTPUT_PATH variable to
determine which binary to launch for debugging may be confused
by a relative path, so use CMake variable PROJECT_BINARY_DIR
instead.
2013-06-21 23:21:57 -04:00
j883376
b47597b813
Merge branch 'master' of git://github.com/EQEmu/Server into gcc-changes
2013-05-23 21:12:07 -04:00
KimLS
efe7092995
Merge and a few cleanup / bug fixes
2013-05-23 12:35:00 -07:00
Arthur Ice
5255c236c3
added std:: to a lot of locations which where
...
missed and added NOMINMAX to cmakelist
2013-05-22 23:55:49 -07:00
j883376
f51f6e00c4
Add install paths to CMakeLists
2013-05-15 17:04:08 -04:00
KimLS
9e13a2271c
Merge conflicts
2013-05-15 13:22:46 -07:00
Michael Cook
73a4e87379
FreeBSD support and clean up of unnecessary ifdef FREEBSD
2013-05-11 14:32:14 -04: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
SecretsOTheP
cabf8631d4
Fixed mercenary memleaks in AI_Start and Unsuspend.
2013-03-20 04:00:08 -04:00
KimLS
da7347f76f
svn -> git Migration
2013-02-16 16:14:39 -08:00
