12 Commits

Author	SHA1	Message	Date
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
KimLS	9e13a2271c	Merge conflicts	2013-05-15 13:22:46 -07:00
Arthur Ice	373ff66240	moved string functions from MiscFunctions to StringUtil	2013-05-11 00:05:11 -07:00
Uleat	c98c115cb6	-- Added Bot primary weapon proc (secondary and ranged already exist) ... -- Added Bard Bot Instrumentation bonuses -- Added checks to avoid AE Buff casting on enemy mobs -- Fixed a few typos in 'Vah Shir'-related code	2013-05-09 20:57:02 -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
Derision	f32a277643	Fixed memory leak in OP_VeteranRewardsAvailable	2013-03-19 19:22:16 +00:00
SecretsOTheP	1dc1655891	Hopefully fixed that pesky merc memleak and cleaned up mercs a tad.	2013-03-17 13:01:54 +00:00
Derision	07979ce2de	Client version is now returned by the stream proxy as a number.	2013-02-17 18:09:31 +00:00
KimLS	da7347f76f	svn -> git Migration	2013-02-16 16:14:39 -08:00