pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-14 15:41:30 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
5,351 Commits 87 Branches 159 Tags
Commit Graph

62 Commits

Author SHA1 Message Date
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
Uleat
84db0ec2c5 Zone MMF Implementation (for map files) 2016-07-28 22:50:06 -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
03286f540a Updated version of glm 2015-01-22 16:52:50 -08:00
KimLS
774e9becbd Added __STDC_CONSTANT_MACROS to cmake defines, this should make C++ export the C99 macros even if the standard library isn't quite up to the c++11 standard yet 2014-12-20 19:34:56 -08:00
KimLS
29b4498534 Hopefully completely merged from master in what is the biggest merge ever 2014-12-07 13:23:16 -08:00
Arthur Ice
c98964a9e8 Lua, perl, boost, zlib, mysql, and glm include files are now being included marked as system (library) files. warnings for these libraries are now suppressed 2014-12-01 10:33:57 -08:00
KimLS
4cf845e6ff Workaround for FreeBSD not having std::to_string 2014-10-16 01:16:38 -07:00
KimLS
e0e3059498 Turn off user literal error in clang 2014-10-03 14:57:01 -07:00
KimLS
c57292a9dd Tired of this GLM warning (and we dont even use glm rotate grr) also reworked how I approached that peq entity process crash after thinking about it a bit 2014-09-25 14:54:40 -07:00
Michael Cook (mackal)
d87c95c1f8 Properly set '-std=c++0x' as a CXX_FLAGS 
This fixes an issue with clang compiling C files.
(Note: this does not mean clang is supported yet)

Ideally, this should check the compiler for -std=c++11 support,
then check -std=c++0x if the previous failed, then error if that
fails as well.
 2014-08-19 20:06:49 -04: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
KimLS
e0bc0e2e5c Changed websockets lib, protocol not finalized at all 2014-07-15 22:52:18 -07:00
KimLS
4109b0b88d Merge from master 2014-07-14 15:50:40 -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
JJ
a96784aa18 Minor typos. 2014-07-09 19:19:51 -04: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
c645b81890 Removing socket server from cmake for now and maintaining it in its own branch until push to master 2014-07-03 18:16:43 -05:00
KimLS
f866fd59d9 Merge problem 2014-07-03 14:14:14 -07:00
KimLS
d6da569fc6 Auto-commit. 2014-07-03 14:11:06 -07:00
Chris M
7ec0994433 Cleanup 2014-07-03 04:15:00 -05:00
Chris M
90f74d6847 More Socket Server work. Made Socket server a by default disabled option in the CMake configuration while development is underway. For now, do not use. 2014-07-03 03:25:58 -05: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
2ef6d3f93e Removed older AZone build options, use eqemu-zone-utils instead 2014-06-30 14:09:03 -07:00
KimLS
3690f93302 Fix for fear failing, removed #fear command because it was blank anyway, added a cmake command to change the default map/water/path directory 2014-05-31 16:32:15 -07:00
KimLS
8c92271804 Initial v2 water map format. 2014-05-20 00:14:26 -07:00
Alex
e047d99a6c Merge pull request #138 from Corysia/master 
Changes for intel Mac OSX build
 2014-04-25 13:47:48 -07:00
KimLS
c16fe3c810 CMake flags to defining what is logged and where 2014-04-20 17:46:43 -07:00
Corysia Taware
f6046477b4 Changes for intel Mac OSX build 2014-04-03 14:10:03 -07:00
KimLS
e09adbd13d Added cmake options to alter eqstream settings if one would so wish. 2014-02-12 15:51:20 -08:00
KimLS
6e0a214bcc Compiler option for playing with npctype_cache as was requested for a feature. Not entirely tested may need some work. Currently defaults to old behavior on #repop. 2014-01-31 20:38:32 -08:00
KimLS
7972937072 /MP now set by default on windows. Option to turn it off for people who want/need eg: people with slower lower core systems. 2014-01-12 14:54:58 -08:00
KimLS
1c07ae9172 Fix for non-standard eqemu options in cmake, please don't do this in the future. Thank you. 2013-11-23 17:26:41 -08:00
SecretsOTheP
f31b9ad98b Made the variable for disabling the logging system always default to ON instead of OFF. Changed the wording so it's less confusing. 
This means that the debug logging information will not display at all by default, but the GM command logging will display enabled. If you need to diagnose the logs, simply turn them on at the expense of added CPU/Disk I/O
 2013-11-19 09:57:52 -05:00
SecretsOTheP
4a0e07a54c Fixes to actually use the cmake defs added in the previous revision 2013-11-18 23:54:24 -05:00
SecretsOTheP
6e520c8476 Added options to CMake to disable GM command logging or disable logging entirely while keeping GM commands enabled. 
Cleaned up some logging
 2013-11-18 23:49:12 -05:00
KimLS
f2f4e55818 Import/Export util start 2013-10-18 21:23:45 -07:00
KimLS
d2a3c051e5 Added custom find lua cmake module to make building on windows easier 2013-06-26 09:57:06 -07:00
KimLS
1480b8911f Sorta hacky work around for doing nukeitem in item quests. Added lua bitop library. Made excluding io/os optional 2013-06-25 14:51:06 -07:00
KimLS
a3e24b6854 Merge from master 2013-05-23 12:50:34 -07:00
KimLS
320494c83d Windows compile fix 2013-05-23 00:55:29 -07:00
KimLS
b26df187e6 Merge from master terrible 2013-05-15 16:01:13 -07:00
KimLS
9e13a2271c Merge conflicts 2013-05-15 13:22:46 -07:00
KimLS
2445576ae8 Merge branch 'master' into lua 2013-05-11 20:35:49 -07:00
Michael Cook
73a4e87379 FreeBSD support and clean up of unnecessary ifdef FREEBSD 2013-05-11 14:32:14 -04:00
KimLS
d1f7935ee2 ...trying out boost with luabind 2013-05-11 01:29:58 -07:00
KimLS
dc045591e4 Lua work - loading works, I think checking for sub works. Calling subs is in the beginning stages and binding is starting 2013-05-10 20:13:35 -07: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