Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | cEvent: Changed steady_clock to system_clock. | Mattes D | 2014-11-04 | 1 | -2/+2 |
| | |||||
* | Moved the chrono include into Globals. | Mattes D | 2014-10-24 | 1 | -1/+0 |
| | |||||
* | Added a missing chrono include. | Mattes D | 2014-10-24 | 1 | -0/+1 |
| | |||||
* | Merge branch 'master' into c++11Events | Mattes D | 2014-10-24 | 1 | -1/+5 |
|\ | |||||
| * | OSSupport/CMakeLists.txt: fixed indentation | archshift | 2014-10-24 | 1 | -3/+3 |
| | | |||||
| * | Fixed potential linker errors with mingw, as it isn't MSVC and it isn't APPLE. | archshift | 2014-10-24 | 1 | -4/+4 |
| | | |||||
| * | Fix linking on OS X, which does not have librt. | archshift | 2014-10-23 | 1 | -2/+6 |
| | | |||||
* | | Reimplemented cEvent using C++11 primitives. | Mattes D | 2014-10-23 | 2 | -136/+51 |
|/ | | | | Fixes #1523. | ||||
* | En masse NULL -> nullptr replace | Tiger Wang | 2014-10-23 | 9 | -35/+35 |
| | |||||
* | convert old style casts to fix warnings | Steven Riehl | 2014-10-12 | 1 | -20/+16 |
| | |||||
* | Update CMakeLists.txt | worktycho | 2014-10-06 | 1 | -1/+1 |
| | |||||
* | Added a cEvent::Wait() with timeout. | Mattes D | 2014-10-05 | 2 | -0/+51 |
| | |||||
* | OSSupport: Fixed UNICODE Windows builds. | Mattes D | 2014-09-14 | 2 | -8/+8 |
| | | | | The files now compile even inside UNICODE applications. | ||||
* | Merge remote-tracking branch 'origin/master' into CraftingFixes | Mattes D | 2014-08-28 | 2 | -6/+8 |
|\ | |||||
| * | Removed an unneeded cast. | madmaxoft | 2014-08-15 | 1 | -1/+1 |
| | | |||||
| * | Fixed windows compilation and style issues. | madmaxoft | 2014-08-12 | 1 | -4/+4 |
| | | |||||
| * | First Implementatation of new Loggin framework | Tycho | 2014-08-10 | 2 | -3/+5 |
| | | |||||
* | | Fixed spaces after "template" keyword. | Mattes D | 2014-08-28 | 1 | -1/+1 |
|/ | |||||
* | Removed redundant semicolons and re-added warning | archshift | 2014-07-24 | 1 | -2/+2 |
| | |||||
* | Style: Normalized to no spaces before closing parenthesis. | madmaxoft | 2014-07-21 | 8 | -44/+44 |
| | |||||
* | Style: Normalized spaces after if, for and while. | madmaxoft | 2014-07-21 | 3 | -13/+13 |
| | |||||
* | Socket: removed unused Socket destructor | archshift | 2014-07-19 | 2 | -10/+0 |
| | |||||
* | Fixed style: spaces after commas. | madmaxoft | 2014-07-19 | 2 | -5/+5 |
| | |||||
* | Subdirs: Only add_library if not using MSVC | archshift | 2014-07-19 | 1 | -3/+5 |
| | |||||
* | OSSupport/CMakeLists.txt: Replaced glob with list of files | archshift | 2014-07-19 | 1 | -5/+32 |
| | |||||
* | Fixed tabs used for alignment. | madmaxoft | 2014-07-17 | 3 | -19/+35 |
| | |||||
* | Basic style fixes. | madmaxoft | 2014-07-17 | 4 | -7/+7 |
| | |||||
* | Normalized comments. | madmaxoft | 2014-07-17 | 7 | -18/+18 |
| | | | | | This was mostly done automatically and then visually inspected for obvious errors. All //-style comments should have a 2-space separation from the code, and 1 space after the comment sign. | ||||
* | Fixed printf formats for Win builds | madmaxoft | 2014-07-01 | 2 | -4/+4 |
| | |||||
* | Fixed cFile compilation under MinGW. | madmaxoft | 2014-06-30 | 1 | -0/+3 |
| | |||||
* | Nullify deleted pointers. | archshift | 2014-06-19 | 3 | -0/+4 |
| | |||||
* | Fixed deadlock when moving players to other worlds. | Mattes D | 2014-06-08 | 2 | -3/+22 |
| | | | | Fixes #1039, fixes #851 | ||||
* | Merge branch 'master' into SslWebAdmin | Mattes D | 2014-05-10 | 5 | -10/+10 |
|\ | |||||
| * | Fixed MSVC 64-bit build warnings. | Mattes D | 2014-05-09 | 4 | -8/+8 |
| | | |||||
| * | Open files in shared mode on windows, so that other tools may read them. | madmaxoft | 2014-05-02 | 1 | -2/+2 |
| | | | | | | | | This was the behavior before fopen_s() was used for implementation; unlike fopen(), fopen_s() opens the file in exclusive mode. | ||||
* | | Fixed crashes in the SSL HTTP connection. | madmaxoft | 2014-05-01 | 1 | -2/+4 |
|/ | |||||
* | Removed the unused cBlockingTCPLink class. | madmaxoft | 2014-04-30 | 2 | -170/+0 |
| | |||||
* | Merged branch 'master' into SslWrappers. | madmaxoft | 2014-04-28 | 4 | -10/+11 |
|\ | |||||
| * | Template Magic | Tycho | 2014-04-28 | 2 | -4/+4 |
| | | | | | | | | | | | | Removed need to allocate a fake meta block by using templates to provide a version of the code that does not use metas. Also changed the function to a template argument to make sure that the compilier is able to inline it. | ||||
| * | Merge pull request #948 from jfhumann/staticFixes | Mattes D | 2014-04-27 | 1 | -1/+1 |
| |\ | | | | | | | Fixes motivated by Coverity #1 | ||||
| | * | Fixed unitialized member in gZipFile (CID 43673) | jfhumann | 2014-04-26 | 1 | -1/+1 |
| | | | |||||
| * | | Fixed mobs that don't naturally spawn. | archshift | 2014-04-26 | 1 | -5/+5 |
| | | | |||||
| * | | Cmake generated projects for IDEs include headers in project files. | archshift | 2014-04-25 | 1 | -0/+1 |
| |/ | |||||
* / | cSocket creates the socket in Connect if no socket is present yet. | madmaxoft | 2014-04-27 | 1 | -2/+8 |
|/ | |||||
* | Fixed issues with 64-bit MSVC compilation. | madmaxoft | 2014-04-11 | 3 | -21/+35 |
| | |||||
* | Merge branch 'master' into HTTPSizeT | Tycho | 2014-04-02 | 3 | -3/+3 |
|\ | | | | | | | | | | | | | Conflicts: src/HTTPServer/EnvelopeParser.h src/HTTPServer/HTTPFormParser.h src/HTTPServer/MultipartParser.h | ||||
| * | Merge branch 'MacFixes' | Tycho | 2014-04-02 | 3 | -3/+3 |
| |\ | | | | | | | | | | | | | | | | Conflicts: src/DeadlockDetect.cpp src/World.cpp | ||||
| | * | More fixes to get it to compile for me on Mac 10.9. Mostly just newline additions, but some of the unused variables were causing errors, so I wrapped them in #ifndef __APPLE__ calls, since I didn't know if they were going to be used in the future. | Samuel Barney | 2014-03-25 | 1 | -1/+1 |
| | | | | | | | | | | | | Also had to undefine TOLUA_TEMPLATE_BIND a couple of times. | ||||
| | * | Added newlines. Without them, the files would not compile. | Samuel Barney | 2014-03-25 | 2 | -2/+2 |
| | | | |||||
* | | | Fixed All signedness warnings in HTTPServer.cpp | Tycho | 2014-04-02 | 1 | -1/+1 |
|/ / | |||||
* | | More cFile warning fixes. | madmaxoft | 2014-04-01 | 1 | -1/+1 |
| | | |||||
* | | Fixed clang warnings in cGZipFile. | madmaxoft | 2014-04-01 | 1 | -2/+2 |
| | | |||||
* | | Fixed clang warnings in cFile. | madmaxoft | 2014-04-01 | 1 | -10/+10 |
| | | | | | | | | We only support 32-bit filesizes (files < 2 GiB). | ||||
* | | Fixed non-virtual destructors warnings. | madmaxoft | 2014-03-28 | 1 | -9/+11 |
|/ | |||||
* | Fixed cGZipFile::ReadRestOfFile returning incorrect value. | madmaxoft | 2014-03-18 | 1 | -1/+4 |
| | |||||
* | Fixed xofts issues | Tycho | 2014-03-14 | 1 | -1/+1 |
| | |||||
* | Added additional macros to support the MSVC size_t format and changed all formats to use the macros | Tycho | 2014-03-12 | 1 | -1/+1 |
| | |||||
* | Fixed a load of format string errors | Tycho | 2014-03-11 | 1 | -1/+1 |
| | |||||
* | Added macros to follow format string checking through wrappers | Tycho | 2014-03-11 | 1 | -1/+1 |
| | |||||
* | Fixed cast to type with different alignment in BlockingTCPLink | Tycho | 2014-03-10 | 1 | -1/+1 |
| | |||||
* | Fixed cast between types of different alignment in cSocket | Tycho | 2014-03-10 | 1 | -1/+2 |
| | |||||
* | Fix IsThread destructor | Tycho | 2014-03-09 | 1 | -1/+1 |
| | |||||
* | Fixed warnings | Tycho | 2014-03-07 | 1 | -1/+1 |
| | |||||
* | Fixed multiple gcc warnings about unused params. | madmaxoft | 2014-02-28 | 1 | -0/+4 |
| | |||||
* | fixed globals.h warnings | Tycho | 2014-02-23 | 1 | -1/+5 |
| | |||||
* | Fixed #491 | Tiger Wang | 2014-02-03 | 1 | -2/+14 |
| | |||||
* | Fixed socket leaking. | madmaxoft | 2014-02-03 | 1 | -0/+5 |
| | |||||
* | SocketThreads: Fixed sending to closed socket. | madmaxoft | 2014-02-03 | 1 | -1/+6 |
| | |||||
* | Fixed timing on *nix. | madmaxoft | 2014-01-28 | 1 | -1/+1 |
| | |||||
* | Squashed common code. | madmaxoft | 2014-01-27 | 1 | -14/+7 |
| | |||||
* | Fixed Linux compilation. | madmaxoft | 2014-01-27 | 1 | -1/+2 |
| | |||||
* | Rewritten networking to use non-blocking sockets. | madmaxoft | 2014-01-27 | 4 | -62/+176 |
| | | | | This fixes #592. | ||||
* | Merge pull request #581 from worktycho/strerror | Mattes D | 2014-01-25 | 7 | -65/+76 |
|\ | | | | | Switched cEvent to use strerror_r for error messages | ||||
| * | Switched cEvent to GetOSErrorString | Tycho | 2014-01-25 | 3 | -18/+14 |
| | | |||||
| * | Extracted cSocket::GetErrorString into GetOSErrorString | Tycho | 2014-01-25 | 6 | -59/+62 |
| | | |||||
| * | Switched cEvent to use strerror_r for error messages | Tycho | 2014-01-23 | 1 | -6/+18 |
| | | |||||
* | | Added cFile::Flush(). | madmaxoft | 2014-01-25 | 2 | -20/+34 |
|/ | | | | This is useful when using cFile as a log file and we know the server may crash after a specific write, so we flush the file before continuing. | ||||
* | Rewritten SocketThreads for proper shutdown scenario. | madmaxoft | 2014-01-19 | 4 | -158/+182 |
| | | | | This fixes #560 and #390. | ||||
* | SocketThreads: Removed unused code. | madmaxoft | 2014-01-19 | 2 | -53/+3 |
| | |||||
* | Fixed SIGPIPE on cSocket::Send(). | madmaxoft | 2014-01-16 | 3 | -12/+13 |
| | |||||
* | Another VarArgs fix. | madmaxoft | 2014-01-16 | 1 | -4/+2 |
| | | | | This time using va_copy() on platforms that have it and simple assignment on platforms that don't. | ||||
* | Using a 2nd argument instead of va_copy(). | madmaxoft | 2014-01-15 | 1 | -2/+4 |
| | | | | This seems to be the only reasonable C++03-only solution. | ||||
* | Removed shutdown() from socket closing. | madmaxoft | 2014-01-13 | 1 | -4/+0 |
| | | | | | It's not there for Windows and everything seems fine, the client doesn't shutdown either, so why should we be polite. Fixes #537. | ||||
* | Added fake functions into cCriticalSection because of the change to ASSERT | Diusrex | 2014-01-05 | 1 | -0/+5 |
| | |||||
* | Fixed a race condition in the cQueue class. | madmaxoft | 2014-01-05 | 1 | -59/+86 |
| | | | | Fixes #505. | ||||
* | Fixed Documentation | Tycho | 2014-01-03 | 1 | -4/+2 |
| | |||||
* | derp | Tycho | 2014-01-03 | 1 | -1/+1 |
| | |||||
* | actual fix | Tycho | 2014-01-03 | 1 | -2/+9 |
| | |||||
* | fixed failure to return a value from Remove | Tycho | 2014-01-03 | 1 | -1/+1 |
| | |||||
* | implement xsofts recommendations | Tycho Bickerstaff | 2014-01-03 | 1 | -9/+15 |
| | |||||
* | added documentation | Tycho Bickerstaff | 2014-01-02 | 1 | -7/+45 |
| | |||||
* | rewrote queue not to use promises for waits | Tycho Bickerstaff | 2014-01-02 | 3 | -105/+11 |
| | |||||
* | fogot to add promise classes | Tycho Bickerstaff | 2013-12-31 | 2 | -0/+92 |
| | |||||
* | clean up code for patching | Tycho Bickerstaff | 2013-12-31 | 2 | -3/+4 |
| | |||||
* | refactored chunk Queue to seperate class | Tycho Bickerstaff | 2013-12-31 | 4 | -26/+95 |
| | |||||
* | Merge remote-tracking branch 'upstream/master' into threadsafequeue | Tycho Bickerstaff | 2013-12-22 | 1 | -0/+3 |
|\ | |||||
| * | Fixed a (valid) warning in RCONServer. | madmaxoft | 2013-12-28 | 1 | -0/+3 |
| | | |||||
* | | basic threadsafe queue interface | Tycho Bickerstaff | 2013-12-21 | 2 | -0/+34 |
|/ | |||||
* | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-21 | 1 | -2/+2 |
|\ | |||||
| * | Fixed the rest of constructor reorders. | madmaxoft | 2013-12-20 | 1 | -2/+2 |
| | | |||||
* | | added pthread linking code to OSSupport | Tycho Bickerstaff | 2013-12-19 | 1 | -0/+4 |
| | | |||||
* | | Merge branch 'master' of github.com:mc-server/MCServer into cmake | Tycho Bickerstaff | 2013-12-11 | 1 | -1/+1 |
|\| | |||||
| * | fixed comparison of thread handle to Null point rather than null handle | Tycho Bickerstaff | 2013-12-10 | 1 | -1/+1 |
| | | |||||
* | | added tolua++ command and removed stackwalker from build | Tycho Bickerstaff | 2013-12-10 | 1 | -1/+0 |
| | | |||||
* | | more cmake changes | Tycho Bickerstaff | 2013-12-10 | 1 | -2/+4 |
| | | |||||
* | | more cmake | Tycho Bickerstaff | 2013-12-10 | 1 | -1/+3 |
| | | |||||
* | | started work on cmake | Tycho Bickerstaff | 2013-12-10 | 1 | -0/+7 |
|/ | |||||
* | Fixed the remaining derps | Alexander Harkness | 2013-11-27 | 1 | -1/+1 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into foldermove2 | Alexander Harkness | 2013-11-26 | 1 | -4/+5 |
| | | | | | Conflicts: VC2008/MCServer.vcproj | ||||
* | Merge branch 'master' into foldermove2 | Alexander Harkness | 2013-11-26 | 1 | -3/+0 |
| | |||||
* | Further attempts to fix compile | Tiger Wang | 2013-11-25 | 1 | -1/+1 |
| | |||||
* | Attempt to fix compilation | Tiger Wang | 2013-11-24 | 1 | -1/+1 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into foldermove2 | Alexander Harkness | 2013-11-24 | 4 | -7/+90 |
| | | | | | Conflicts: GNUmakefile | ||||
* | Moved source to src | Alexander Harkness | 2013-11-24 | 26 | -0/+3573 |