flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
7,735 Commits 1 Branch 0 Tags 92 MiB
d8e6931fe6
Commit Graph

277 Commits

Author SHA1 Message Date
Mattes D
9f4562289e Merge pull request #1604 from mc-server/GeneratorShapeRefactor 
Generator shape refactor
 2014-11-24 21:56:25 +01:00
Mattes D
3e068a01a8 Changed back capitalization. 2014-11-24 13:44:15 +01:00
Mattes D
b520f336da cWorld: Rewritten spawn preparation. 
It now supports pregeneration distance of any size and runs in two threads in parallel (generator / lighting).
Fixes #1597.
 2014-11-22 16:00:19 +01:00
Mattes D
a05a318cdd cWorld: Changed generator defaults. 2014-11-20 22:51:07 +01:00
Mattes D
9ece37e8f1 Merge pull request #1598 from mc-server/SignEditor 
Fixed a security problem with signs.
 2014-11-18 08:52:48 +01:00
Howaner
78fb789631 Fixed a security problem with signs. 2014-11-15 15:16:52 +01:00
Howaner
a0e1e43fc1 Merge branch 'master' into ViewDistance 2014-11-14 22:33:54 +01:00
Mattes D
58fe37814b Merge branch 'master' of https://github.com/mc-server/MCServer 2014-11-06 08:55:33 +01:00
Lukas Pioch
13b20d6fe2 renamed FindAndDoWithUUID to DoWithPlayerByUUID, fixed style and comments, added description to APIDump 2014-11-05 21:57:38 +01:00
Lukas Pioch
269d76a208 Simplified FindAndDoWithUUID, formatted line 2014-11-02 21:38:17 +01:00
Lukas Pioch
9f71a4e7ae Added FindAndDoWithUUID 2014-11-02 21:01:23 +01:00
Howaner
9c7661f50f Added a MaxViewDistance option. 2014-10-30 21:24:10 +01:00
Mattes D
190d34e2f7 Merge pull request #1565 from mc-server/MergedIniFile 
Merged ini file
 2014-10-24 09:13:39 +02:00
Mattes D
449d08cb3d Merged IniFile into main MCS sources. 2014-10-23 15:15:10 +02:00
Howaner
72bb299a4a Merge branch 'master' into ChunkLoader 
Conflicts:
	src/ChunkSender.cpp
	src/ClientHandle.cpp
	src/World.h
 2014-10-23 14:59:42 +02:00
Tiger Wang
a26541a7c3 En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
Howaner
44514e53fc Merge branch 'master' into ChunkLoader 
Conflicts:
	src/ClientHandle.cpp
 2014-10-21 16:55:22 +02:00
Mattes D
eeb580a74e Functions in cPluginManager get references instead of pointers. 2014-10-15 19:09:09 +02:00
Mattes D
7f8118e0cb cWorld: Fixed scheduler. 
Fixes #1534.
Added a test case into the Debuggers plugin.
 2014-10-13 14:49:18 +02:00
Mattes D
1eae7d0ece Fixed style. 2014-10-13 10:34:33 +02:00
worktycho
daadde2077 Fix style 2014-10-12 12:18:52 +01:00
worktycho
8dfeb6e324 Update World.cpp 2014-10-12 12:15:52 +01:00
worktycho
1a07dc897d Fix lambda capture 2014-10-11 14:43:06 +01:00
tycho
473c0425d3 Moved a few objects to unique_ptr 2014-10-10 15:33:19 +01:00
Howaner
b493beb3bb Stream 4 chunks per tick. Added priority. 2014-10-06 21:27:53 +02:00
Howaner
382e014ebc Optimized chunk loader 2014-10-02 23:50:41 +02:00
Howaner
83973520c8 Fixed iron trapdoors 2014-09-30 20:04:49 +02:00
madmaxoft
30b083ed63 World: Fixed chunk generation by plugins. 
ChunkWorx was broken, it was trying to generate chunks that were not properly marked as InQueue.
 2014-09-29 21:34:15 +02:00
Howaner
af997a09ca Merge branch 'master' into Fixes 2014-09-26 22:23:36 +02:00
Howaner
d83d6456e8 Fixed players custom name in 1.8 2014-09-26 17:37:19 +02:00
worktycho
411c69b420 Merge pull request #1419 from mc-server/redstoneTests 
Added test mocking to IncrementalRedstoneSimulator
 2014-09-26 16:04:26 +01:00
madmaxoft
157cad9007 Improved searching for spawn. 
Won't spawn on a small island inside ocean anymore.
 2014-09-26 13:04:34 +02:00
Tycho
9c459cbe50 Merge branch 'master' into redstoneTests 
Conflicts:
	src/Mobs/Monster.h
 2014-09-25 15:22:08 +01:00
Howaner
4b38e077cf Merge branch 'master' into EntityCustomName 
Conflicts:
	src/ClientHandle.cpp
	src/ClientHandle.h
	src/Protocol/Protocol.h
	src/Protocol/Protocol125.cpp
	src/Protocol/Protocol125.h
	src/Protocol/Protocol17x.cpp
	src/Protocol/Protocol17x.h
	src/Protocol/ProtocolRecognizer.cpp
	src/Protocol/ProtocolRecognizer.h
	src/World.cpp
	src/World.h
 2014-09-23 14:39:49 +02:00
Howaner
43ed690520 Exported player list states to extra functions. 2014-09-18 18:50:17 +02:00
Tycho
045d54e0e2 Merge branch 'master' into redstoneTests 
Conflicts:
	src/Blocks/ChunkInterface.h
 2014-09-17 18:47:33 +01:00
Tycho
6e7c0e33b5 Added first test to show the object can be created 2014-09-17 18:40:10 +01:00
Tycho
26a4845a99 IncrementalRedstoneSimulator now has no dependencies on cChunk 2014-09-16 20:29:31 +01:00
Howaner
69afc4dbba Merge branch 'master' into 1.8-Protocol 
Conflicts:
	src/Items/ItemHoe.h
 2014-09-13 01:21:43 +02:00
Howaner
fcf558173e Fixed farmland issues. 2014-09-12 19:07:20 +02:00
Howaner
bee615b75b Merge branch 'master' into 1.8-Protocol 2014-09-12 13:28:06 +02:00
Tycho
0b044e1c83 Possibly decoupled IncrementalRedstoneSimulator from the rest of the server 
THis wil hopefully allow for unit testing
 2014-09-11 17:48:21 +01:00
Howaner
3bd3ac2200 1.8: Added ParticleEffect packet. 2014-09-11 17:03:09 +02:00
worktycho
1f0b6eeaf3 Actually set default 2014-09-09 12:18:20 +01:00
Howaner
f94df06b66 Added the player list to the 1.8 protocol. 2014-09-09 03:02:25 +02:00
worktycho
bd810b80a6 use the correct ASSERT 2014-09-08 21:31:47 +01:00
Tycho
fb20c2eb85 FIxed a couple more warnings 2014-09-08 19:15:29 +01:00
Tycho
2c945c8818 TimeOfDay does not need to be an Int64 2014-09-08 19:07:45 +01:00
Tycho
4bdf9256f2 Fixed a few compile warnings 2014-09-08 18:56:27 +01: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