flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
8,050 Commits 1 Branch 0 Tags 92 MiB
a9b8a530b1
Commit Graph

337 Commits

Author SHA1 Message Date
Mattes D
2df8e4863f Fixed warnings in FastNBT.cpp. 2015-01-20 23:52:53 +01:00
Mattes D
f232704203 WSSAnvil: Added clamping to entity coords. 
Fixes CID 72854.
 2014-12-21 22:37:48 +01:00
Mattes D
e192da5316 FastNBT: Added a sanity check for number of list items. 
Fixes CID 55812.
 2014-12-21 22:25:01 +01:00
Masy98
6e8e1c6d8d Added Rabbits 2014-12-20 10:31:34 +01:00
Masy98
c836b52dd1 Added Entity Guardian 2014-12-18 19:30:32 +01:00
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
1b1f971752 Merge remote-tracking branch 'planetx/master' 2014-12-11 11:17:54 +01: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
planetx
ce3adf89fa Check to see if header write out is required 2014-12-08 11:23:19 -08:00
planetx
1674f505f8 Added timestamp to merged files WSSAnvil 2014-12-08 08:28:44 -08:00
planetx
65c1d4f7b6 Added timestamp to merged files WSSAnvil 2014-12-08 08:26:37 -08:00
planetx
a1da0e7205 Added timestamp to new files WSSAnvil 2014-12-08 08:22:40 -08:00
planetx
8f5e861674 Added Timestamp info to chunks in WSSAnvil 2014-12-07 14:44:08 -08:00
Mattes D
d00ebd7ee7 Merge pull request #1555 from mc-server/c++11 
C++11
 2014-12-07 15:01:36 +01:00
Mattes D
263fabc816 Replaced most auto_ptr with unique_ptr. 2014-12-06 23:03:17 +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
e2a04f580a BasicStyle: Added missing braces to control statements. 2014-12-05 16:59:11 +01:00
Mattes D
c014f5624c Merged branch 'origin/master' into c++11. 2014-12-04 22:04:16 +01:00
Howaner
bcbd73f7d8 MobSpawner fixes. 2014-12-01 14:58:13 +01:00
Howaner
2478e290f9 Many api fixes, add vanilla names to mob type -> string functions and mob spawner fixes. 2014-11-29 15:20:44 +01:00
Howaner
648fee1a08 Merge branch 'master' into MobSpawner 2014-11-29 12:05:35 +01:00
Mattes D
0ca891da6d WSSAnvil: Fixed bad code in arrow loading. 2014-11-26 10:14:11 +01:00
Tiger Wang
79e5b82354 Merge remote-tracking branch 'origin/master' into c++11 
Conflicts:
	src/Noise/Noise.h
	src/World.h
 2014-11-23 17:12:34 +00:00
Howaner
8b028c5c78 Finished mob spawner implementation. 2014-11-18 15:33:41 +01:00
Howaner
42120e2ea5 Merge branch 'master' into MobSpawner 
Conflicts:
	MCServer/Plugins/Core
 2014-11-18 14:56:32 +01:00
Howaner
165533c27e Fixed 1.8 world item format reading. 2014-10-29 15:47:43 +01:00
Alexander Harkness
232343065f Fixed compile (typos). 2014-10-27 22:03:11 +00:00
Alexander Harkness
b67eb2169e Another one.# 2014-10-27 20:16:51 +00: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
Mattes D
b979cad893 cItemFrame: Fixed a forgotten rename. 2014-10-21 22:32:17 +02:00
Mattes D
a42fa071bc Properly exported cItemFrame and cHangingEntity to Lua. 2014-10-21 22:02:30 +02:00
Tiger Wang
5089f04cf6 Replace &*[0] accesses with .data() 2014-10-21 13:20:06 +01:00
Tiger Wang
987f79afdd En masse NULL -> nullptr replace 2014-10-20 21:55:07 +01:00
Tiger Wang
9e4a5f824a Removed WSSCompact 2014-09-30 22:20:21 +01:00
Tiger Wang
d1814d2d67 Merge remote-tracking branch 'origin/master' into chestcarts 
Conflicts:
	src/Entities/Minecart.cpp
 2014-09-27 18:40:00 +01:00
Howaner
033d16babb Merge branch 'master' into MobSpawner 
Conflicts:
	src/MobSpawner.h
	src/Mobs/Monster.h
 2014-09-26 23:56:20 +02:00
Mattes D
305778f22f Merge pull request #1456 from Howaner/Fixes 
Fixed player custom names in 1.8 and added type checking to map loading
 2014-09-26 23:01:22 +02:00
madmaxoft
0d83477540 Fixed UNUSED macro so that it doesn't require type knowledge. 
Introduced new UNUSED_VAR macro that is used when type knowledge is available (for local variables).
 2014-09-26 22:53:39 +02:00
Howaner
af997a09ca Merge branch 'master' into Fixes 2014-09-26 22:23:36 +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
Howaner
749c6092d3 Added type checking to map loading. 2014-09-26 14:31:52 +02:00
Howaner
7cdcf0a883 Anvil: Arrow Tile tags are a short in Vanilla 2014-09-25 19:01:44 +02:00
Howaner
daf5127b28 Fixed hanging direction bugs. 2014-09-25 18:37:24 +02:00
Tycho
9c459cbe50 Merge branch 'master' into redstoneTests 
Conflicts:
	src/Mobs/Monster.h
 2014-09-25 15:22:08 +01:00
Howaner
32ecb121a3 derp 2014-09-24 15:30:52 +02:00
Howaner
1d588b5195 Don't create two entity lists. 2014-09-24 15:17:20 +02:00
Howaner
65077c314a Merge branch 'master' into WorldLoader 2014-09-24 15:00:49 +02:00
madmaxoft
8d9dfc5d1a Anvil: Wolf collar color is a byte in Vanilla. 
Kept the old Int reading for compatibility reasons.
Ref.: #1448
 2014-09-23 22:22:38 +02:00