flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
4,751 Commits 1 Branch 0 Tags 92 MiB
b8fe024f9d
Commit Graph

93 Commits

Author SHA1 Message Date
Tiger Wang
b8fe024f9d Merge branch 'master' into awesometnt 
Conflicts:
	src/ChunkMap.cpp
 2014-03-18 20:49:08 +00:00
Mattes D
dc77cbfdc4 Merge pull request #809 from Howaner/BlockEntitys 
More entity saving.
 2014-03-16 21:43:33 +01:00
Howaner
b9fce71bf6 Add new leaves to all classes. 2014-03-16 21:38:57 +01:00
Howaner
4ec5a95a7a Add cake 2014-03-16 20:26:13 +01:00
Howaner
8316ae330e Merge branch 'master' into BlockEntitys 2014-03-15 02:46:18 +01:00
Howaner
ccc29c7c6c Add fireball interact 2014-03-14 23:52:51 +01:00
Tiger Wang
e672988577 Merge remote-tracking branch 'origin/master' into awesometnt 
Conflicts:
	src/Items/ItemLighter.h
	src/Simulator/IncrementalRedstoneSimulator.cpp
 2014-03-10 18:59:11 +00:00
Tiger Wang
cc2d805238 Merge branch 'master' into awesometnt 2014-03-10 18:36:55 +00:00
Tiger Wang
09c5542123 Merge pull request #768 from Howaner/BlockEntitys 
Add TNT load/save
 2014-03-09 21:44:32 +00:00
Tiger Wang
1985a9c33e Merge pull request #731 from mc-server/ballisticmissiles 
Ballistic firework missiles
 2014-03-09 21:43:15 +00:00
Tiger Wang
c2978a3457 Merge branch 'master' into ballisticmissiles 
Conflicts:
	src/ClientHandle.cpp
 2014-03-09 12:53:50 +00:00
Tycho
c3758112cc Merge branch 'master' into warnings 2014-03-08 07:13:45 -08:00
Howaner
b37966fd21 Change TNT Fuse to ticks 2014-03-08 12:24:33 +01:00
andrew
6679641b9e cBlockInfo-related changes from #723 2014-03-08 12:53:15 +02:00
Tycho
b480148116 Fixed warnings 2014-03-07 10:26:07 -08:00
Tiger Wang
53231bebd6 Added extra awesomeness to TNT 
+ TNT now has a chance of flinging FallingBlock entities around
* Improved TNT damage
* Improved TNT spawning visuals
* Possible fix for 'SetSwimState failure' messages in debug
 2014-03-05 22:12:48 +00:00
andrew
070d483236 cBlockInfo now manages the respective cBlockHandler 2014-03-02 21:25:05 +02:00
andrew
d73cdba1f6 g_BlockXXX => cBlockInfo::XXX 2014-03-01 21:34:19 +02:00
madmaxoft
1826461884 Fixed multiple gcc warnings about unused params. 2014-02-28 16:26:23 +01:00
madmaxoft
9c6d72a023 Fixed crash and some warnings in map handling. 
Fixes #728.
 2014-02-27 09:06:25 +01:00
Tiger Wang
baf2d88921 Implemented ballistic missiles (fireworks) 
+ Added fireworks
 2014-02-26 23:33:52 +00:00
STRWarrior
9440b61c8c Fixed MCServer not compiling with C++03 compilers 2014-02-24 14:43:46 +01:00
andrew
f471873945 Maps: Improvements 2014-02-23 15:05:03 +02:00
andrew
83d3a2eedf Manual merge (Fixed conflicts) 2014-02-20 15:37:15 +02:00
Mattes D
87db4b6a90 Merge pull request #697 from Howaner/Skull 
Add Skulls/Heads to MCServer
 2014-02-19 22:12:38 +01:00
Howaner
d63ce62f3b Rename SkullEntity to MobHeadEntity 2014-02-19 14:45:09 +01:00
Tiger Wang
a686656253 Merge branch 'master' into itemframes 
Conflicts:
	src/Entities/Entity.h
	src/WorldStorage/NBTChunkSerializer.cpp
 2014-02-18 22:13:44 +00:00
Tiger Wang
5b961453d1 Fixed possible ASSERT failure 2014-02-18 21:54:53 +00:00
Tiger Wang
05789f9e66 Changed BlockFace type to eBlockFace 2014-02-18 21:33:33 +00:00
Howaner
52c41f8869 Add Heads completely 2014-02-18 21:40:02 +01:00
andrew
393ca0221d Map decorators; Map clients 2014-02-18 20:50:08 +02:00
Tiger Wang
7a23e27fc5 Added an explanatory comment 2014-02-18 00:29:10 +00:00
Tiger Wang
ced6eb971d Comments & new BLOCK_FACE constants 2014-02-18 00:28:31 +00:00
Tiger Wang
320cc74f0a Implemented paintings, fixes #689 
+ Implemented paintings
 2014-02-18 00:16:03 +00:00
Tiger Wang
7c0d11fbb2 Used new BLOCK_FACE constants 
Also added more comments
 2014-02-17 23:38:25 +00:00
Tiger Wang
464ec47eb7 Implemented item frames, a part of #689 
+ Implemented Item Frames
* Fixed Pitch and Yaw being wrongly flipped in the protocol (XOFT!)
 2014-02-17 23:00:03 +00:00
Howaner
777041806f Add Skulls/Heads 2014-02-17 20:14:08 +01:00
andrew
3b24bc870b Map item handler; Fixed several bugs 2014-02-17 16:27:12 +02:00
andrew
cf96e69716 cMap::UpdateRadius 2014-02-15 20:06:47 +02:00
Tiger Wang
8fbb936b63 Fixed TNT fizzing everywhere 2014-02-15 15:53:02 +00:00
andrew
c7fb000858 EmptyMap item handler 2014-02-14 17:38:22 +02:00
worktycho
7ad4a86c49 Added additional parenthasies 2014-02-10 18:06:49 +00:00
Tycho
9f542ee0f8 Merge branch 'master' into boatsFix 
Conflicts:
	src/Items/ItemBoat.h
 2014-02-10 10:01:50 -08:00
worktycho
23f69bc093 Fixed stupid mistax in conditional 
boats can't be placed if the face is not block_face_none and not block_face_YM, not if it is only not one.
 2014-02-10 17:59:17 +00:00
tonibm19
75e0b38d83 Maybe fixed boat placing 2014-02-10 18:17:44 +01:00
Tiger Wang
f86f066615 Merge branch 'master' into playerimprovements 
Conflicts:
	MCServer/Plugins/APIDump/APIDesc.lua
 2014-02-09 00:04:42 +00:00
Tycho
8464f689ea Improved Type safety of eBlockFace 
May Fix #640
 2014-02-04 10:59:05 -08:00
Tiger Wang
3fc848c95a Fixed #626 
* Fixed consumption of carrots and potatoes
 2014-02-03 21:16:26 +00:00
Tycho
b82fc394dd Changed Signiture of OnUpdate 2014-02-02 06:49:37 -08:00
Tycho
c6304b2b4f Changed pointers to references 2014-02-01 05:06:32 -08:00