 Arthur Ice
|
fca9c1458b
|
Merge branch 'master' of https://github.com/EQEmu/Server
Conflicts:
common/debug.cpp
common/debug.h
zone/PlayerCorpse.cpp
zone/beacon.cpp
zone/client.cpp
zone/net.cpp
zone/tribute.cpp
|
2013-05-19 16:19:22 -07:00 |
|
|
Arthur Ice
|
3521472942
|
Merge branch 'master' of https://github.com/EQEmu/Server
|
2013-05-10 22:55:15 -07:00 |
|
|
Arthur Ice
|
273cb928bf
|
removed using namespace std
|
2013-05-08 18:13:33 -07:00 |
|
|
Arthur Ice
|
7735639e57
|
Merge branch 'c_11_conversion' of https://github.com/addtheice/Server
|
2013-05-08 17:40:04 -07: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
|
c6ca89907c
|
Converted a lot of the char[] stuff internally into std:string
in addition I switched over to <string> rather than <string.h>
|
2013-05-08 17:09:13 -07:00 |
|
|
Arthur Ice
|
d7dff7d7a6
|
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-05 16:58:16 -07:00 |
|
|
Arthur Ice
|
37b7a49faf
|
Converted a lot of the char[] stuff internally into std:string
in addition I switched over to <string> rather than <string.h>
|
2013-05-05 16:40:03 -07:00 |
|
|
Arthur Ice
|
7560b6b0a7
|
NULL to nullptr
|
2013-05-04 18:06:58 -07:00 |
|
|
Arthur Ice
|
faa93c3739
|
Added some consts to remove 'deprecated string to char*' warnings.
|
2013-03-09 10:52:25 -08:00 |
|
|
Arthur Ice
|
0c6eee6d81
|
More warning clean ups (NULL to 0 on int, sprintf flags, typedef on enum)
|
2013-03-03 21:45:46 -08:00 |
|
|
Arthur Ice
|
950f00fae6
|
Fixed some warnings, like sprintf %i warnings (converted to %lu), fals vs NULL, etc
|
2013-03-03 16:17:06 -08:00 |
|
|
Arthur Ice
|
d8628170b5
|
Fixed missing include that blocked compile on linux.
|
2013-03-03 15:26:40 -08:00 |
|
|
Arthur Ice
|
68338dace1
|
Merge branch 'master' of git://github.com/EQEmu/Server
|
2013-03-03 15:22:52 -08:00 |
|
|
Arthur Ice
|
e0887d81aa
|
Merge branch 'master' of git://github.com/EQEmu/Server
|
2013-03-03 13:02:36 -08:00 |
|
|
Arthur Ice
|
6a4f61d3a3
|
Merge branch 'master' of git://github.com/EQEmu/Server
|
2013-03-02 12:01:01 -08:00 |
|
|
Arthur Ice
|
c8da17c664
|
Deleted the old and duplicated GNU license text
|
2013-03-02 11:58:39 -08:00 |
|
|
Arthur Ice
|
998cfb6528
|
fixed miss spelling of 'recieved' to 'received' in ServerStats and in log messages.
|
2013-02-21 00:07:49 -08:00 |
|