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

13 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
phredi
11b3571965 small fix for logdir 2016-05-24 20:18:11 -05:00
phredi
40845adbae initial logdir work(incomplete) 2016-05-24 20:00:54 -05:00
phredi
b997a040d7 Config File Update Initial Update 2016-05-20 21:03:34 -05:00
regneq
17bbd8dfbe eqtime is now stored in the DB. 
required/2015_12_17_eqtime.sql
 2015-12-17 14:14:04 -08: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
Akkadius
7503e29211 Remove LogSettingsFile from config parsers which removes log.ini completely 2015-01-19 03:28:00 -06:00
Akkadius
240b066f34 post merge fixing 2014-12-16 00:29:38 -06:00
Akkadius
fffe59c52e Merge remote-tracking branch 'remotes/origin/master' into web_interface 
Conflicts:
	common/CMakeLists.txt
	common/eqemu_config.cpp
	common/eqemu_config.h
	common/shareddb.h
 2014-12-16 00:12:01 -06:00
Akkadius
bbea7f4f53 eqemu_config.cpp & .h header cleanup, code style cleanup of eqemu_config.h 2014-12-15 21:01:52 -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
7fc21b9e3a Tons of renames 2014-08-21 19:33:02 -07:00
KimLS
06f18225ce Renaming headers is hard work 2014-08-21 17:26:32 -07:00