flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
11,031 Commits 1 Branch 0 Tags 92 MiB
68cced73af
Commit Graph

52 Commits

Author SHA1 Message Date
Mattes D
ad24702b4e ChunkGenerator: Changed to use cChunkCoords. 2019-09-08 20:21:49 +02:00
Mattes D
878393a03d Moved the generator defaults to ComposableGenerator. 2019-09-06 16:12:33 +02:00
Mattes D
a2ffa432b3 Separated chunk generator from world / plugin interfaces. 
The generator now only takes care of servicing synchronous "GetChunk(X, Y)" and "GetBiomes(X, Y)" requests.
 2019-09-06 16:12:33 +02:00
peterbell10
ee84197014
Force all headers other than "Globals.h" to be included with relative paths (#4269) 
Closes #4236

CMake now creates a header file in the build directory under the path "include/Globals.h" which just includes "src/Globals.h" with an absolute path. Then instead of adding "src/" to the include directories, it adds "include/".

#include "Globals.h" still works by including the build generated file and any other src-relative path will not work.
 2018-08-29 01:51:25 +01:00
peterbell10
950aeffff8
CheckBasicStyle: Check number of empty lines between functions (#4267) 
Add check for number of empty lines between functions and fix the corresponding failures
 2018-07-26 22:24:36 +01:00
peterbell10
7b431bed51
cIsThread: Reset m_ShouldTerminate after the thread has stopped (#4258) 
This allows threads to be restarted after stopping.

Fixes #4257
 2018-07-22 22:35:58 +01:00
peterbell10
757231cc6e
Add the fmt library (#4065) 
* Replaces AppendVPrintf with fmt::sprintf
* fmt::ArgList now used as a type safe alternative to varargs.
* Removed SIZE_T_FMT compatibility macros. fmt::sprintf is fully portable and supports %zu.
* Adds FLOG functions to log with fmt's native formatting style.
 2018-01-03 17:41:16 +00:00
peterbell10
1537ebed6f cWorld: Move Initialization from Start to the constructor. 
Start now does nothing more than launch the world's threads.
 2017-10-21 19:33:22 +02:00
peterbell10
360d8eade0 FastRandom rewrite (#3754) 2017-06-13 21:35:30 +02:00
Mattes D
a4955dfda3 Removed asserts about chunk queued. 
The assumption is not needed and was invalid under a stress-test.
 2017-01-19 16:25:07 +01:00
LogicParrot
7f5757eccf Reduced unnecessary block updates 2016-04-23 00:30:00 +03:00
LogicParrot
ca6ef58b1e Bulk clearing of whitespace 2016-02-05 23:50:18 +02:00
Mattes D
9da404ea2d Fixed a race condition between chunk loader and generator. 
When using ChunkWorx to generate multiple chunks, the server would sometimes fail an assert because it would generate a chunk even when it was successfully loaded. This was caused by chunks queued in cWorld's m_SetChunkDataQueue and thus being marked as "InQueue" although they were already loaded.

Solved by adding a new parameter to chunk coord callbacks specifying whether the operation succeeded or failed, and using that instead of the chunk presence flag to decide whether to generate or not.
 2015-10-04 14:06:37 +02:00
Mattes D
6e4122e551 Unified the doxy-comment format. 2015-07-31 16:49:10 +02:00
Samuel Barney
804805d35a Silenced and fixed many warning messages across multiple files. 2015-07-29 09:49:30 -06:00
Mattes D
c13b1931ff More style checking. 
Spaces around some operators are checked.
 2015-05-09 12:58:54 +02:00
Mattes D
fcd3d1bfed Added a cWorld:PrepareChunk function. 
It prepares the chunk - loads or generates it and lights it.
The spawn prepare process uses this function.
 2014-12-10 22:35:16 +01:00
Mattes D
c014f5624c Merged branch 'origin/master' into c++11. 2014-12-04 22:04:16 +01:00
Mattes D
e3e13f552f Fixed BlockStringToType return value. 
-1 was not a valid BLOCKTYPE and would not be recognized by the callers, ever.
 2014-11-27 21:19:52 +01:00
Mattes D
765bf006ad Merged branch 'master' into c++11. 2014-10-24 10:19:13 +02:00
Mattes D
449d08cb3d Merged IniFile into main MCS sources. 2014-10-23 15:15:10 +02:00
Tiger Wang
a26541a7c3 En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
Tiger Wang
987f79afdd En masse NULL -> nullptr replace 2014-10-20 21:55:07 +01:00
Tiger Wang
aa19a3afb0 Migrated random generators to std::random 2014-10-19 14:10:18 +01:00
Mattes D
103fa8812d WorldStorage no longer queues chunks into generator. 2014-09-05 23:26:00 +02:00
Mattes D
137b021d26 Rewritten chunk status to specify whether the chunk is in queue. 
This fixes #1370.
 2014-09-05 22:16:48 +02:00
madmaxoft
bae928fd27 ChunkGenerator: Log world seed when creating a new one. 2014-09-03 23:02:00 +02:00
LO1ZB
554f585017 re-add the missing "s" too cChunkCoordsWithBoolList 2014-09-03 00:28:08 +02:00
LO1ZB
a600e3bdfe hopefully the last commit for removing y-coord from chunks. :) 2014-09-03 00:14:51 +02:00
LO1ZB
4c9abab2d1 fix possibility of a twice generated chunk 2014-09-01 15:01:56 +02:00
LO1ZB
75e1316386 fix chunk regenerating 2014-08-29 20:19:45 +02:00
LO1ZB
3c1c073714 remove y-coord from chunks 2014-08-28 11:36:35 +02:00
Mattes D
64fec204c4 Added initializers for class members. 
As reported by Coverity, these weren't initialized.
 2014-08-21 22:39:53 +02:00
Tiger Wang
3385ed56b8 Merge remote-tracking branch 'origin/master' into portals 
Conflicts:
	src/Chunk.cpp
	src/Entities/Player.cpp
	src/Root.cpp
	src/World.cpp
 2014-07-22 10:24:28 +01:00
madmaxoft
93d29555e5 Style: Normalized to no spaces before closing parenthesis. 2014-07-21 17:40:43 +02:00
madmaxoft
00c524519e Fixed style: spaces after commas. 2014-07-19 14:53:41 +02:00
Tiger Wang
37140ae578 Merge branch 'master' into portals 
Conflicts:
	src/Blocks/WorldInterface.h
	src/ClientHandle.cpp
	src/ClientHandle.h
	src/Entities/Player.cpp
	src/Entities/Player.h
	src/Generating/FinishGen.cpp
	src/Protocol/Protocol.h
	src/Protocol/Protocol125.cpp
	src/Protocol/Protocol125.h
	src/Protocol/Protocol16x.cpp
	src/Protocol/Protocol16x.h
	src/Protocol/Protocol17x.cpp
	src/Protocol/Protocol17x.h
	src/Protocol/ProtocolRecognizer.cpp
	src/Protocol/ProtocolRecognizer.h
	src/Root.h
	src/World.cpp
 2014-07-18 20:10:51 +01:00
madmaxoft
c03161f75d Fixed tabs used for alignment. 2014-07-17 23:16:55 +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
Tiger Wang
156c9851b8 Suggestions 2014-06-05 17:58:29 +01: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
Tiger Wang
314fc3cdac Mob bugfixes 
* Mobs no longer require constant line-of-sight to a player to remain
aggravated
* Fixed an ASSERT
* Fixed mobs jumping
* Fixed Idle state not properly using AI
+ Added FILE_IO_PREFIX to favicon loading
+ Implemented #563
 2014-01-25 14:42:26 +00:00
Tiger Wang
1112f5adc6 Fixed a generator bug 2014-01-24 23:56:19 +00:00
madmaxoft
cea997426b Decoupled cChunkGenerator from cWorld and cRoot. 
Now the chunk generator can be used by other projects without depending on the two hugest structures in MCS.
 2014-01-10 22:22:54 +01:00
madmaxoft
044fd237b6 Moved bindings-related to a Bindings subfolder. 
Ref.: #407
 2013-12-08 12:17:54 +01:00
Alexander Harkness
d925cf4def Fixed the remaining derps 2013-11-27 07:40:59 +00:00
Tiger Wang
2ef9cf700d Hopefully fixed last of the Linux compile errors 2013-11-26 22:50:33 +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