4 Commits

Author SHA1 Message Date
akkadius
54c89d69f6 Merge remote-tracking branch 'remotes/origin/master' into blob_conversion
Conflicts:
	common/database.cpp
	common/mysql_request_result.h
	common/shareddb.cpp
2014-09-07 04:11:09 -05:00
Akkadius
4c12d31e4a Removed command character backup
Changed all remaining references from the character_ table to the character_data
2014-09-06 22:35:19 -05:00
Michael Cook (mackal)
8422178233 Fix issue with requesting an adventure 2014-09-01 02:58:52 -04:00
KimLS
4821ed79fb More renames, world should be done 2014-08-21 23:30:09 -07:00