 Arthur Ice
|
a372ba3d39
|
Merge branch 'master' into char_to_string
Conflicts:
common/dbcore.h
|
2013-05-26 10:07:44 -07:00 |
|
|
Arthur Ice
|
1b9004445d
|
DoEscapeString changed to string for first argument.
RunQuery changed to string for first argument, removed len argument.
|
2013-05-25 21:22:08 -07:00 |
|
|
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 |
|
 Michael Cook
|
0fdfe025cb
|
Remove 'using namespaces std' fixes #61
|
2013-05-22 16:17:19 -04:00 |
|
|
Arthur Ice
|
41dcd5bc29
|
Should only need dumpItemCollection and dumpBagContents internally so made them protected.
|
2013-05-21 23:34:55 -07:00 |
|
|
Arthur Ice
|
d7546e09ee
|
broke up dumpInventory into methods, changed it to dumpEntireInventory (dumpInventory now only dumps a small peice)
|
2013-05-21 22:53:22 -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 |
|
 KimLS
|
da7347f76f
|
svn -> git Migration
|
2013-02-16 16:14:39 -08:00 |
|