925e19b15c
Fix database scheme comments that got clobbered on nullptr conversion
2013-11-11 15:37:20 -05:00
2f335372a0
Few warning and lua fixes, fix for summon not working on new system. Need to look at enrage as it doesn't appear to work right either and think it's timing related
2013-07-07 15:22:20 -07:00
e6fba5ba82
Merging
2013-05-23 00:31:02 -07:00
0fdfe025cb
Remove 'using namespaces std' fixes #61
2013-05-22 16:17:19 -04:00
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
373ff66240
moved string functions from MiscFunctions to StringUtil
2013-05-11 00:05:11 -07:00
4bdd8b2502
Change space indentation to tabs
2013-05-09 11:37:51 -04:00
ffcff4aea1
Remove trailing whitespace
2013-05-09 11:13:16 -04:00
7560b6b0a7
NULL to nullptr
2013-05-04 18:06:58 -07:00
da7347f76f
svn -> git Migration
2013-02-16 16:14:39 -08:00
Michael Cook (mackal)
KimLS
Arthur Ice
j883376