pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-02 17:22:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
336 Commits 90 Branches 159 Tags
Commit Graph

336 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Arthur Ice
ab0b3b47e9 Merge c634b9cdf8fdeca92ae8fb2b1acdb072c54b6f43 into 39426789f4070aaece74ce9cef5759873a2b81c1 2013-06-04 21:58:48 -07:00
Arthur Ice
c634b9cdf8 un escaped slash in SQL 2013-06-04 21:55:46 -07:00
Arthur Ice
b16a0c388b Merge branch 'char_to_string' into ErrBuf_char_to_string 2013-06-04 21:14:03 -07:00
Arthur Ice
392e362aac fix qoute length 2013-06-04 21:13:14 -07:00
Arthur Ice
f8dc6f7730 RunQuery now uses a string instead of a char* for the error buffer. 2013-06-03 20:21:08 -07:00
Arthur Ice
46918cdbec switched to reference rather than copy semantics for query on RunQuery 2013-06-03 16:25:42 -07:00
Arthur Ice
1e7a4e151c Update shareddb.cpp 
removed worthless comment which no longer applies.
 2013-06-03 14:33:40 -06:00
Arthur Ice
bbd0cb9cfc removed duplicate string include 2013-06-03 13:25:04 -06:00
Arthur Ice
9ebe02d363 Fixed the way we work with blobs. 
quoting and length on runquery.
Fixed fence post error on StringFormat()
 2013-05-27 19:03:12 -07:00
Alex
39426789f4 Merge pull request #69 from j883376/login-db-crash 
Fix loginserver crash on DB connect failure
 2013-05-27 17:33:57 -07:00
j883376
44477a0d47 Fix loginserver crash on DB connect failure 2013-05-27 12:35:45 -04:00
Arthur Ice
2631861370 be sure to get the actual size of the query. 2013-05-26 20:54:25 -07:00
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
Alex
52b8c0e078 Merge pull request #66 from j883376/gcc-changes 
GCC Changes
 2013-05-24 01:16:10 -07:00
KimLS
3c7f7beb6d Red. include string 2013-05-24 01:10:19 -07:00
KimLS
ee7d7c6f24 Merge branch 'small_stage_cleanup' of git://github.com/addtheice/Server into addtheice-small_stage_cleanup 2013-05-24 00:56:20 -07:00
KimLS
a66ef1b778 Function for retrieving a qglobal or list of them 2013-05-24 00:52:28 -07:00
j883376
b47597b813 Merge branch 'master' of git://github.com/EQEmu/Server into gcc-changes 2013-05-23 21:12:07 -04:00
j883376
d6ff01d63c Fix several GCC warnings 2013-05-23 20:22:42 -04:00
Arthur Ice
fcb769e353 Merge branch 'master' into small_stage_cleanup 
Conflicts:
	common/EQStream.cpp
	zone/client.h
 2013-05-23 12:49:22 -07:00
KimLS
815c3dc73f Merge branch 'master' of https://github.com/EQEmu/Server into string 2013-05-23 12:35:21 -07:00
KimLS
efe7092995 Merge and a few cleanup / bug fixes 2013-05-23 12:35:00 -07:00
Alex
12ddd30f67 Merge pull request #64 from af4t/master 
Windows compile fix: bots
 2013-05-23 12:30:06 -07:00
af4t
879ddb208b Windows compile fixes (bots) 2013-05-23 12:17:30 -04:00
Kemmler
70dab7d920 Merge pull request #6 from EQEmu/master 
Sync 2013-05-23
 2013-05-23 03:53:22 -07:00
KimLS
2840e32853 Merge branch 'master' into string 2013-05-23 00:56:27 -07:00
KimLS
320494c83d Windows compile fix 2013-05-23 00:55:29 -07:00
KimLS
e6fba5ba82 Merging 2013-05-23 00:31:02 -07:00
Arthur Ice
5255c236c3 added std:: to a lot of locations which where 
missed and added NOMINMAX to cmakelist
 2013-05-22 23:55:49 -07:00
Arthur Ice
e5d4b35a32 Spelling fix in a comment. Nothing else. 2013-05-22 22:21:28 -07:00
Arthur Ice
b4e65a8840 tabbify and cleaned up std issues and min/max problems. 2013-05-22 21:27:37 -07:00
Arthur Ice
ac78841e55 Removed MakeUpperString since it's not used anywhere. 2013-05-22 19:41:16 -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
Arthur Ice
ea2a1651d5 Merge branch 'master' into StringFormatting 
Conflicts:
	common/debug.cpp
 2013-05-22 18:07:39 -07:00
Arthur Ice
5c6e95f921 Merge branch 'master' of https://github.com/EQEmu/Server 2013-05-22 17:38:26 -07:00
Kemmler
555e21c3c7 Merge pull request #5 from EQEmu/master 
Sync 2013-05-22
 2013-05-22 16:31:52 -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
Arthur Ice
e9577db9c2 removed DBMemLeak.cpp and DBMemLeak.h, unused. 2013-05-21 22:51:19 -07:00
Arthur Ice
cdc7b2a000 weird #ifdef pattern, reorganized and cleaned it up. easier to understand now. 2013-05-21 00:36:34 -07:00
Arthur Ice
a7084b4d6c reorganized includes to allow for consolidation and cleanup. 2013-05-21 00:36:34 -07:00
Arthur Ice
64212176ec removed unneeded defines. snprintf and friends are used within StringUtil.h 2013-05-21 00:36:34 -07:00
Arthur Ice
70eb226fea changed from using a preset char buffer to string. 2013-05-21 00:36:34 -07:00
Arthur Ice
c18d868d03 set many pointers to nullptr instead of 0. 2013-05-21 00:36:34 -07:00
Arthur Ice
9002bfb9a0 corrected incorrect use of StringFormat and did basic indenting fix. 2013-05-21 00:36:00 -07: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
3c11f8f26b simplified the includes to be a bit clearer. 2013-05-20 22:20:01 -07:00
Arthur Ice
dcec112b91 reordering includes to make it easier to simplify. 2013-05-20 22:17:56 -07:00