Arthur Ice
54914a970e
Merge branch 'StringFormatting' into small_stage_cleanup
...
Conflicts:
common/Item.cpp
world/client.cpp
zone/net.cpp
2013-05-22 18:55:06 -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
26143750f3
removed visual studio 5,6,7 specific code except in tinyxml and StackWalker.
2013-05-20 22:40:10 -07: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
23c524812d
Removed the _MSC_VER special cases for Visual Studio 2008 and lower.
...
We no longer support 2008 and lower so these defines will never be used.
2013-05-08 17:09:13 -07:00
Arthur Ice
7560b6b0a7
NULL to nullptr
2013-05-04 18:06:58 -07:00
Derision
810fdf3cca
Resurrection - Fix for RoF + fixed a couple of memory leaks.
2013-03-15 19:37:29 +00:00
KimLS
da7347f76f
svn -> git Migration
2013-02-16 16:14:39 -08:00