67 Commits

Author	SHA1	Message	Date
Uleat	d7c2d6108f	Added the initial references for two new dictionaries - EmuConstants and EQLimits..more to come.	2014-07-16 21:23:16 -04:00
KimLS	8c92271804	Initial v2 water map format.	2014-05-20 00:14:26 -07:00
KimLS	951c321ba6	Partial port of der's map rewrite, no new azone format yet but it's coming. Will convert legacy map formats on the fly atm.	2014-02-23 21:17:28 -08:00
Michael Cook (mackal)	925e19b15c	Fix database scheme comments that got clobbered on nullptr conversion	2013-11-11 15:37:20 -05:00
Uleat	e3805d5920	Converted SkillType typedef enumeration to SkillUseTypes enumeration	2013-10-27 13:03:41 -04:00
KimLS	d8a1d84a49	Regression fixes, support for new lua arguments for many events	2013-06-19 22:56:46 -07:00
KimLS	efe7092995	Merge and a few cleanup / bug fixes	2013-05-23 12:35:00 -07:00
KimLS	e6fba5ba82	Merging	2013-05-23 00:31:02 -07:00
Arthur Ice	ea2a1651d5	Merge branch 'master' into StringFormatting ... Conflicts: common/debug.cpp	2013-05-22 18:07:39 -07:00
Michael Cook	0fdfe025cb	Remove 'using namespaces std' fixes #61	2013-05-22 16:17:19 -04:00
Arthur Ice	f1a487f606	Merge branch 'master' into StringFormatting. ... Cleaned up the problems. Tested on Linux. Still need to test on windows. Conflicts: common/CMakeLists.txt common/MiscFunctions.cpp common/MiscFunctions.h common/debug.cpp world/Adventure.cpp	2013-05-19 18:56:21 -07:00
Arthur Ice	373ff66240	moved string functions from MiscFunctions to StringUtil	2013-05-11 00:05:11 -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
Arthur Ice	7560b6b0a7	NULL to nullptr	2013-05-04 18:06:58 -07:00
JJ	88b9f96b91	Attempting manual merge for Nature's Bounty	2013-04-06 08:23:09 -04:00
KimLS	da7347f76f	svn -> git Migration	2013-02-16 16:14:39 -08:00