flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
9,496 Commits 1 Branch 0 Tags 92 MiB
c57bf8e538
Commit Graph

239 Commits

Author SHA1 Message Date
Mattes D
781b3303a5 Merge pull request #1657 from mc-server/PrepareChunk 
Prepare chunk
 2014-12-11 17:06:18 +01:00
Mattes D
33c6ff872e Cosmetic touchups. 
Removed trailing whitespace, added cast to remove warning, added file seeking in case of corrupt files.
 2014-12-11 14:34:09 +01:00
Mattes D
2ab8d2bd98 Added a RemoveIf() function to cQueue 2014-12-09 10:43:40 +01:00
Mattes D
c65bb6341d Fixed integer overflow problems. 
The event would overflow when requesting a 60 minute timeout.
 2014-12-07 21:37:47 +01:00
Mattes D
8ad1afcc1b Merge remote-tracking branch 'origin/master' into c++11Events 2014-12-07 18:15:23 +01:00
Mattes D
3c3cb198f3 Fixed c++11 branch issues. 2014-12-07 15:46:27 +01:00
Tiger Wang
3acdf25b05 Merge remote-tracking branch 'origin/master' into c++11 
Conflicts:
	src/OSSupport/Thread.cpp
 2014-12-06 17:41:48 +00:00
Mattes D
3f23813412 Merge pull request #1647 from mc-server/SocketThreadsFix 
Fixes socket leak in HTTP server.
 2014-12-06 16:08:08 +01:00
Mattes D
e2a04f580a BasicStyle: Added missing braces to control statements. 2014-12-05 16:59:11 +01:00
Mattes D
44644ae025 Fixed reported parentheses around comparisons. 2014-12-05 12:58:47 +01:00
Mattes D
64f8428d03 Fixed trailing whitespace. 2014-12-04 22:07:04 +01:00
Mattes D
c014f5624c Merged branch 'origin/master' into c++11. 2014-12-04 22:04:16 +01:00
Mattes D
010546051e Fixes socket leak in HTTP server. 
Fixes #1643.
 2014-12-03 16:14:26 +01:00
Howaner
7049db5bf8 Fixed compiling on linux. 2014-11-30 14:23:51 +01:00
Mattes D
201313a9f8 Added a basic stacktracing for assert and signal failures. 2014-11-29 23:06:10 +01:00
Tiger Wang
6382989ba0 Compilation fixes 2014-11-23 14:22:05 +00:00
Mattes D
5dbf601824 cEvent: Changed chrono duration resolution. 2014-11-04 15:56:27 +01:00
Mattes D
0d15261601 cEvent: Changed steady_clock to system_clock. 2014-11-04 15:47:55 +01:00
Mattes D
b9777287ca Moved the chrono include into Globals. 2014-10-24 11:01:45 +02:00
Mattes D
4b32c00f66 Added a missing chrono include. 2014-10-24 10:22:17 +02:00
Mattes D
765bf006ad Merged branch 'master' into c++11. 2014-10-24 10:19:13 +02:00
Mattes D
2940ced832 Merge branch 'master' into c++11Events 2014-10-24 10:13:54 +02:00
archshift
dd86c1f4a3 OSSupport/CMakeLists.txt: fixed indentation 2014-10-23 23:49:20 -07:00
Tiger Wang
51fa6b4090 Suggestions 2014-10-23 23:58:01 +01:00
archshift
8ccb729504 Fixed potential linker errors with mingw, as it isn't MSVC and it isn't APPLE. 2014-10-23 15:03:54 -07:00
archshift
6bcc2c187a Fix linking on OS X, which does not have librt. 2014-10-23 14:58:42 -07:00
Mattes D
82472d09ac Reimplemented cEvent using C++11 primitives. 
Fixes #1523.
 2014-10-23 11:20:25 +02:00
Mattes D
f8c54f4243 Merged branch 'master' into c++11. 2014-10-23 08:40:39 +02:00
Tiger Wang
a26541a7c3 En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
Tiger Wang
2b920f9e21 Compile fix? 2014-10-21 13:49:53 +01:00
Tiger Wang
987f79afdd En masse NULL -> nullptr replace 2014-10-20 21:55:07 +01:00
Tiger Wang
a324333c11 Use std::recusive_mutex 2014-10-20 21:26:18 +01:00
Tiger Wang
bde99d684e Migrated cSleep and cTimer to std::chrono 2014-10-20 18:59:40 +01:00
Tiger Wang
6d5a8892f3 Use std::thread 2014-10-19 00:29:34 +01:00
Steven Riehl
856764dee8 convert old style casts to fix warnings 2014-10-11 20:39:55 -06:00
worktycho
a20bd0dbbd Update CMakeLists.txt 2014-10-05 23:44:55 +01:00
Mattes D
ec71ffcc80 Added a cEvent::Wait() with timeout. 2014-10-05 19:04:30 +02:00
Mattes D
c4a53c5d7d OSSupport: Fixed UNICODE Windows builds. 
The files now compile even inside UNICODE applications.
 2014-09-14 01:33:05 +02:00
Mattes D
52a6b30f32 Merge remote-tracking branch 'origin/master' into CraftingFixes 2014-08-28 16:53:36 +03:00
Mattes D
49ac6fadfc Fixed spaces after "template" keyword. 2014-08-28 16:44:36 +03:00
madmaxoft
1f4a1383c2 Removed an unneeded cast. 2014-08-15 07:19:13 +02:00
madmaxoft
10e58f04da Fixed windows compilation and style issues. 2014-08-12 22:43:04 +02:00
Tycho
806d0936dc First Implementatation of new Loggin framework 2014-08-10 19:34:11 +01:00
archshift
4191be7ddb Removed redundant semicolons and re-added warning 2014-07-24 11:21:37 -07:00
madmaxoft
93d29555e5 Style: Normalized to no spaces before closing parenthesis. 2014-07-21 17:40:43 +02:00
madmaxoft
6be79575fd Style: Normalized spaces after if, for and while. 2014-07-21 17:38:50 +02:00
archshift
1831c2e652 Socket: removed unused Socket destructor 2014-07-19 14:50:31 -07:00
madmaxoft
00c524519e Fixed style: spaces after commas. 2014-07-19 14:53:41 +02:00
archshift
725d1fd1e2 Subdirs: Only add_library if not using MSVC 2014-07-18 17:41:43 -07:00
archshift
dcaa3262a2 OSSupport/CMakeLists.txt: Replaced glob with list of files 2014-07-18 17:41:43 -07:00
madmaxoft
c03161f75d Fixed tabs used for alignment. 2014-07-17 23:16:55 +02:00
madmaxoft
5e198c6730 Basic style fixes. 2014-07-17 22:50:58 +02:00
madmaxoft
2423fbf2ef Normalized comments. 
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.
 2014-07-17 22:15:34 +02:00
madmaxoft
7177806d31 Fixed printf formats for Win builds 2014-07-01 22:48:01 +02:00
madmaxoft
a5a0533d79 Fixed cFile compilation under MinGW. 2014-06-30 21:41:38 +02:00
archshift
e8143de01b Nullify deleted pointers. 2014-06-19 01:49:56 -07:00
Mattes D
af4a21ea06 Fixed deadlock when moving players to other worlds. 
Fixes #1039, fixes #851
 2014-06-08 21:58:30 +02:00
Mattes D
28815252e6 Merge branch 'master' into SslWebAdmin 2014-05-10 21:27:57 +02:00
Mattes D
fb58ef55be Fixed MSVC 64-bit build warnings. 2014-05-09 18:32:03 +02:00
madmaxoft
92c022c140 Open files in shared mode on windows, so that other tools may read them. 
This was the behavior before fopen_s() was used for implementation; unlike fopen(), fopen_s() opens the file in exclusive mode.
 2014-05-02 20:55:50 +02:00
madmaxoft
60850fe3e8 Fixed crashes in the SSL HTTP connection. 2014-05-01 15:08:15 +02:00
madmaxoft
58929a9948 Removed the unused cBlockingTCPLink class. 2014-04-30 17:06:46 +02:00
madmaxoft
0b16e6821f Merged branch 'master' into SslWrappers. 2014-04-28 22:05:02 +02:00
Tycho
a42480cf82 Template Magic 
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.
 2014-04-28 10:31:07 -07:00
madmaxoft
f301d052cf cSocket creates the socket in Connect if no socket is present yet. 2014-04-27 22:20:49 +02:00
Mattes D
a0f6149d05 Merge pull request #948 from jfhumann/staticFixes 
Fixes motivated by Coverity #1
 2014-04-27 17:00:37 +02:00
jfhumann
a1765a2896 Fixed unitialized member in gZipFile (CID 43673) 2014-04-26 14:23:53 +02:00
archshift
80b97fd9dd Fixed mobs that don't naturally spawn. 2014-04-25 20:49:55 -07:00
archshift
e47dab84f3 Cmake generated projects for IDEs include headers in project files. 2014-04-25 09:56:15 -07:00
madmaxoft
f44a291da8 Fixed issues with 64-bit MSVC compilation. 2014-04-11 13:09:19 +02:00
Tycho
0075b2f72e Merge branch 'master' into HTTPSizeT 
Conflicts:
	src/HTTPServer/EnvelopeParser.h
	src/HTTPServer/HTTPFormParser.h
	src/HTTPServer/MultipartParser.h
 2014-04-02 07:51:48 -07:00
Tycho
b449ad8613 Merge branch 'MacFixes' 
Conflicts:
	src/DeadlockDetect.cpp
	src/World.cpp
 2014-04-02 06:54:57 -07:00
Tycho
1f5a4a39f2 Fixed All signedness warnings in HTTPServer.cpp 2014-04-02 06:36:25 -07:00
madmaxoft
2672b14c03 More cFile warning fixes. 2014-04-01 16:00:20 +02:00
madmaxoft
b9a090d835 Fixed clang warnings in cGZipFile. 2014-04-01 15:00:30 +02:00
madmaxoft
45150e9754 Fixed clang warnings in cFile. 
We only support 32-bit filesizes (files < 2 GiB).
 2014-04-01 14:58:05 +02:00
madmaxoft
773ce7fde6 Fixed non-virtual destructors warnings. 2014-03-28 21:35:45 +01:00
Samuel Barney
eb3cc729d4 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. 
Also had to undefine TOLUA_TEMPLATE_BIND a couple of times.
 2014-03-25 11:15:05 -06:00
Samuel Barney
d77a6417f6 Added newlines. Without them, the files would not compile. 2014-03-25 10:33:52 -06:00
madmaxoft
4dc5650023 Fixed cGZipFile::ReadRestOfFile returning incorrect value. 2014-03-18 13:54:17 +01:00
Tycho
cd6ab5617c Fixed xofts issues 2014-03-14 06:11:49 -07:00
Tycho
862e219443 Added additional macros to support the MSVC size_t format and changed all formats to use the macros 2014-03-12 10:34:50 -07:00
Tycho
16b27c4b7a Fixed a load of format string errors 2014-03-11 14:16:08 -07:00
Tycho
53faac10c5 Added macros to follow format string checking through wrappers 2014-03-11 13:41:15 -07:00
Tycho
e2e7f2184f Fixed cast to type with different alignment in BlockingTCPLink 2014-03-10 10:48:50 -07:00
Tycho
8665233522 Fixed cast between types of different alignment in cSocket 2014-03-10 10:32:51 -07:00
Tycho
e5fc3c63f2 Fix IsThread destructor 2014-03-09 10:52:12 -07:00
Tycho
b480148116 Fixed warnings 2014-03-07 10:26:07 -08:00
madmaxoft
1826461884 Fixed multiple gcc warnings about unused params. 2014-02-28 16:26:23 +01:00
Tycho
462e0bcf46 fixed globals.h warnings 2014-02-23 12:23:35 -08:00
Tiger Wang
fad90081d2 Fixed #491 2014-02-03 22:25:16 +00:00
madmaxoft
c9916cd8c2 Fixed socket leaking. 2014-02-03 17:07:46 +01:00
madmaxoft
0b384198e5 SocketThreads: Fixed sending to closed socket. 2014-02-03 10:39:10 +01:00
madmaxoft
76457d3673 Fixed timing on *nix. 2014-01-28 16:28:55 +01:00
madmaxoft
a359275064 Squashed common code. 2014-01-27 21:34:54 +01:00
madmaxoft
4169af1ce1 Fixed Linux compilation. 2014-01-27 21:33:06 +01:00
madmaxoft
cc1284a753 Rewritten networking to use non-blocking sockets. 
This fixes #592.
 2014-01-27 21:27:13 +01:00
Mattes D
c8be9b5b1a Merge pull request #581 from worktycho/strerror 
Switched cEvent to use strerror_r for error messages
 2014-01-25 10:43:00 -08:00
madmaxoft
5aa3fc4c56 Added cFile::Flush(). 
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.
 2014-01-25 15:27:34 +01:00
Tycho
977e277094 Switched cEvent to GetOSErrorString 2014-01-25 06:02:20 -08:00
Tycho
59b8205f02 Extracted cSocket::GetErrorString into GetOSErrorString 2014-01-25 05:51:03 -08:00
Tycho
7419579140 Switched cEvent to use strerror_r for error messages 2014-01-23 10:25:56 -08:00
madmaxoft
3c0e8c8da0 Rewritten SocketThreads for proper shutdown scenario. 
This fixes #560 and #390.
 2014-01-19 19:31:43 +01:00
madmaxoft
dc70d04cdd SocketThreads: Removed unused code. 2014-01-19 16:15:56 +01:00
madmaxoft
4da8818291 Fixed SIGPIPE on cSocket::Send(). 2014-01-16 21:08:17 +01:00
madmaxoft
ba49a32c3a Another VarArgs fix. 
This time using va_copy() on platforms that have it and simple assignment on platforms that don't.
 2014-01-16 08:34:10 +01:00
madmaxoft
dd6c5779ec Using a 2nd argument instead of va_copy(). 
This seems to be the only reasonable C++03-only solution.
 2014-01-15 18:28:51 +01:00
madmaxoft
5407cec41c Removed shutdown() from socket closing. 
It's not there for Windows and everything seems fine, the client doesn't shutdown either, so why should we be polite.
Fixes #537.
 2014-01-13 20:54:58 +01:00
Diusrex
487c1a24de Added fake functions into cCriticalSection because of the change to ASSERT 2014-01-05 15:08:30 -07:00
madmaxoft
0a712931b1 Fixed a race condition in the cQueue class. 
Fixes #505.
 2014-01-05 15:15:59 +01:00
Tycho
d26c0e3815 Fixed Documentation 2014-01-03 09:42:35 -08:00
Tycho
13bbb3d99d derp 2014-01-03 08:56:20 -08:00
Tycho
14ec68d8d3 actual fix 2014-01-03 08:49:14 -08:00
Tycho
0e8bb3bf41 fixed failure to return a value from Remove 2014-01-03 08:34:41 -08:00
Tycho Bickerstaff
6f3c5b806e implement xsofts recommendations 2014-01-03 11:22:01 +00:00
Tycho Bickerstaff
d522619ce2 added documentation 2014-01-02 17:43:57 +00:00
Tycho Bickerstaff
042b72bc17 rewrote queue not to use promises for waits 2014-01-02 12:32:55 +00:00
Tycho Bickerstaff
098ed91a48 fogot to add promise classes 2013-12-31 16:13:13 +00:00
Tycho Bickerstaff
512d1b9ebe clean up code for patching 2013-12-31 15:58:21 +00:00
Tycho Bickerstaff
f3736b1eb7 refactored chunk Queue to seperate class 2013-12-31 15:48:57 +00:00
Tycho Bickerstaff
1a9d93665f Merge remote-tracking branch 'upstream/master' into threadsafequeue 2013-12-22 15:21:34 +00:00
madmaxoft
725b997a28 Fixed a (valid) warning in RCONServer. 2013-12-28 22:00:01 +01:00
Tycho Bickerstaff
14d2085e35 basic threadsafe queue interface 2013-12-21 14:43:32 +00:00
Tycho Bickerstaff
779aca6051 Merge branch 'master' into cmake 2013-12-21 13:32:40 +00:00
madmaxoft
f5e6124ee0 Fixed the rest of constructor reorders. 2013-12-20 19:10:15 +01:00
Tycho Bickerstaff
e02fbd37ab added pthread linking code to OSSupport 2013-12-19 00:15:30 +00:00
Tycho Bickerstaff
77303b77c7 Merge branch 'master' of github.com:mc-server/MCServer into cmake 2013-12-10 23:10:50 +00:00
Tycho Bickerstaff
712f7d5a23 added tolua++ command and removed stackwalker from build 2013-12-10 22:59:53 +00:00
Tycho Bickerstaff
daccfd9c6e more cmake changes 2013-12-10 22:43:21 +00:00
Tycho Bickerstaff
6cdc990884 more cmake 2013-12-10 21:39:20 +00:00
Tycho Bickerstaff
c217ab5168 fixed comparison of thread handle to Null point rather than null handle 2013-12-10 18:43:54 +00:00
Tycho Bickerstaff
b91cfb8765 started work on cmake 2013-12-10 18:41:43 +00:00
Alexander Harkness
d925cf4def Fixed the remaining derps 2013-11-27 07:40:59 +00:00
Alexander Harkness
0de95a215f Merge remote-tracking branch 'origin/master' into foldermove2 
Conflicts:
	VC2008/MCServer.vcproj
 2013-11-26 17:21:06 +00:00
Alexander Harkness
139bd34690 Merge branch 'master' into foldermove2 2013-11-26 17:15:39 +00:00
Tiger Wang
32449f1fca Further attempts to fix compile 2013-11-25 18:29:36 +00:00
Tiger Wang
e3db69c4ae Attempt to fix compilation 2013-11-24 18:44:22 +00:00
Alexander Harkness
c3cd436ec3 Merge remote-tracking branch 'origin/master' into foldermove2 
Conflicts:
	GNUmakefile
 2013-11-24 14:37:03 +00:00
Alexander Harkness
675b4aa878 Moved source to src 2013-11-24 14:19:41 +00:00