flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
6,676 Commits 1 Branch 0 Tags 92 MiB
263ea5464b
Commit Graph

199 Commits

Author SHA1 Message Date
Tiger Wang
da1d946b2b Fixed bow charge 2014-07-09 22:04:26 +01:00
daniel0916
98950af634 Fixed Bucket placing 2014-07-09 16:53:01 +02:00
Howaner
64e6667435 Only fixes the server crash. 2014-07-01 20:34:50 +02:00
Howaner
64f6ddf1e2 Fix server-crash with non-existing items. 2014-07-01 14:47:49 +02:00
Tiger Wang
61cb08b546 Implemented tripwire(s) (hooks) 
* Fixes #944
 2014-06-28 20:44:34 +01:00
Howaner
eaf36766f6 Merge branch 'master' into Bow 2014-06-26 15:49:53 +02:00
archshift
e8143de01b Nullify deleted pointers. 2014-06-19 01:49:56 -07:00
archshift
f5529e544c EntityEffects.x -> EntityEffect.x, Object-Oriented effects 
Changed effect map to take a pointer of the effect as a result.
 2014-06-18 22:54:14 -07:00
archshift
9e8361976b Entity Effects: Clarified user, added it to AddEntityEffect 
Added second AddEntityEffect with a pass-by-value of the class.
 2014-06-17 11:39:22 -07:00
madmaxoft
e289fe4dd7 Changed the AddEntityEffect() params for easier calls. 2014-06-17 11:39:21 -07:00
madmaxoft
045ae2ef2c Fixed MSVC compilation. 2014-06-17 11:39:21 -07:00
archshift
5b2b6e0615 Pawn: renamed HandleEntityEffects to HandleEntityEffect 
Exported entity effect functions for ToLua and documented them in APIDesc.lua
 2014-06-17 11:39:21 -07:00
archshift
68011a004a Removed long function wrapping 2014-06-17 11:39:20 -07:00
archshift
3766ac96d7 ItemHandler: changed IsDrinkable() to take a short argument 2014-06-17 11:39:20 -07:00
archshift
a1a8b7c0ee Splash potion: Adjusted speed, fixed spawn position 2014-06-17 11:39:20 -07:00
archshift
73cea7065d Entity effect type: use 'eff' as a prefix instead of 'ef' 2014-06-17 11:39:20 -07:00
archshift
58f35af6e7 Added splash potion functionality 2014-06-17 11:39:20 -07:00
archshift
2185c72c2c Implemented drinkable potions, noeffect entity effect, 
Clears entity effects on death
 2014-06-17 11:39:20 -07:00
archshift
1eb04a48ee Implemented milk, added documentation to Pawn.h 2014-06-17 11:39:19 -07:00
archshift
2123173202 Player: Removed food-poisoning-specific code, set duration to 30 seconds 
http://minecraft.gamepedia.com/Hunger#Behavior
 2014-06-17 11:39:19 -07:00
Howaner
c60ba8a52d Merge branch 'master' into GlobalFixes 2014-06-17 19:03:56 +02:00
Howaner
a1fd0b0335 Split Broadcast Sound Effect function call in multiple lines. 2014-06-16 23:41:23 +02:00
Howaner
b45e85a678 This isn't needed 2014-06-16 22:57:27 +02:00
Howaner
885a50d77a Fix bow sound and creative arrow pickup. 2014-06-16 22:57:13 +02:00
Mattes D
af4a21ea06 Fixed deadlock when moving players to other worlds. 
Fixes #1039, fixes #851
 2014-06-08 21:58:30 +02:00
Howaner
e7a7c45c36 Add throw sound and fix arrow server crash. 2014-05-28 16:39:59 +02:00
andrew
07baf9bdd3 Cleaned up cPlayer::UpdateMovementStats; Wither achievements 2014-05-20 15:52:59 +03:00
Mattes D
d1b719885d Merge pull request #989 from Howaner/Anvil 
Add repair cost to cItem, add custom name to NBTChunkSerializer and fix ...
 2014-05-07 22:18:53 +02:00
Howaner
f5fe368220 Merge branch 'master' into Slabs 2014-05-07 12:54:58 +02:00
Howaner
d6cb6e0423 Add repair cost to cItem, add custom name to NBTChunkSerializer and fix anvil bugs. 2014-05-07 12:30:30 +02:00
Mattes D
66c5c81e02 Merge pull request #985 from Howaner/Anvil 
Add anvil inventory.
 2014-05-06 21:46:50 +02:00
Howaner
954b59d6f4 Rename CanRepairWithItem to CanRepairWithRawMaterial and rename Size() to Count() 2014-05-06 19:38:09 +02:00
Tiger Wang
1df7dbe7c9 Suggestions'd 2014-05-05 23:45:35 +01:00
Howaner
3c102870f6 Add anvil window and slot area. 2014-05-05 17:34:17 +02:00
madmaxoft
839447f0bb Merge branch 'master' into fixes. 2014-05-02 19:34:28 +02:00
madmaxoft
5c7876c2dd Added a sanitizer for Spawn egg damage value. 
This disallows spawning unknown mobs from unknown spawn eggs. Ref.: #928.
 2014-05-02 19:13:57 +02:00
archshift
9b0cb3fd97 Fixed projectile source filenames, indentations 2014-04-27 17:05:18 -07:00
archshift
477b3e7861 Moved cArrowEntity out of ProjectileEntity.h 2014-04-26 16:45:39 -07:00
archshift
0e0c9d8248 Missed these CMakeLists. 2014-04-25 12:24:09 -07:00
Howaner
ccd9023202 Add commit what the code is doing. 2014-04-25 00:10:52 +02:00
Howaner
cee70390fa Add unkown armor warning and fix armor stacks. 2014-04-25 00:09:22 +02:00
Howaner
376dc880b3 Add armor to switch() in ItemHandler.cpp 2014-04-24 23:03:04 +02:00
Howaner
9cbb3a339f Fix armor in survival mode. 2014-04-24 20:41:25 +02:00
Tiger Wang
48904ae201 Merge branch 'master' into fixes 
Conflicts:
	src/World.h
 2014-04-24 18:57:25 +01:00
Tiger Wang
f763242e5c Small changes 2014-04-23 21:06:07 +01:00
jfhumann
5bed1c09bc Fixed clang compilation errors. Apparently gcc and MSVC do not care about the order of initializer lists, but clang does. 2014-04-18 22:47:59 +02:00
jfhumann
013da806ec Did some static analysis, fixed some bugs and optimized a lot of code 2014-04-18 21:09:44 +02:00
Howaner
7da308a7e1 Merge branch 'master' into Slabs 2014-04-06 21:43:23 +02:00
Howaner
039191499c Add CanChangeDirtToGrass function to Block Handlers. 2014-04-06 21:41:01 +02:00
madmaxoft
402d85d896 Fixed Clang warnings in itemhandlers. 2014-04-04 09:56:57 +02:00
madmaxoft
5c6d474599 Fixed boat placement code. 2014-04-02 16:40:28 +02:00
Tiger Wang
a87bd5788f Another curly 2014-03-30 13:07:28 +01:00
Tiger Wang
519bd0b989 Curly brackets 2014-03-28 23:51:52 +00:00
Tiger Wang
79aa082b04 Fixed infinite minecart items 2014-03-28 22:52:23 +00:00
Tiger Wang
283a66bcae Some fixes to lilypads 
* Fixed placement on lava
* Fixed placement on side of blocks
* Fixed placement through blocks
+ Added washing-away of pads
+ Added ice as a block that fully occupies its voxel
 2014-03-28 22:51:30 +00:00
Tiger Wang
f622f4317c Implemented lilypad placement 2014-03-23 22:32:45 +00:00
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