summaryrefslogtreecommitdiffstats
path: root/src/Items (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Split Broadcast Sound Effect function call in multiple lines.Howaner2014-06-161-1/+8
|
* This isn't neededHowaner2014-06-161-1/+0
|
* Fix bow sound and creative arrow pickup.Howaner2014-06-161-9/+8
|
* Fixed deadlock when moving players to other worlds.Mattes D2014-06-086-6/+6
| | | | Fixes #1039, fixes #851
* Cleaned up cPlayer::UpdateMovementStats; Wither achievementsandrew2014-05-201-0/+6
|
* Merge pull request #989 from Howaner/AnvilMattes D2014-05-072-12/+0
|\ | | | | Add repair cost to cItem, add custom name to NBTChunkSerializer and fix ...
| * Add repair cost to cItem, add custom name to NBTChunkSerializer and fix anvil bugs.Howaner2014-05-072-12/+0
| |
* | Merge branch 'master' into SlabsHowaner2014-05-0711-34/+282
|\ \
| * | Merge pull request #985 from Howaner/AnvilMattes D2014-05-066-0/+108
| |\| | | | | | | Add anvil inventory.
| | * Rename CanRepairWithItem to CanRepairWithRawMaterial and rename Size() to Count()Howaner2014-05-066-26/+26
| | |
| | * Add anvil window and slot area.Howaner2014-05-056-0/+108
| | |
| * | Suggestions'dTiger Wang2014-05-061-5/+9
| | |
| * | Merge branch 'master' into fixes.madmaxoft2014-05-026-18/+154
| |\|
| | * Added a sanitizer for Spawn egg damage value.madmaxoft2014-05-021-1/+39
| | | | | | | | | | | | This disallows spawning unknown mobs from unknown spawn eggs. Ref.: #928.
| | * Fixed projectile source filenames, indentationsarchshift2014-04-281-1/+1
| | |
| | * Moved cArrowEntity out of ProjectileEntity.harchshift2014-04-271-1/+1
| | |
| | * Missed these CMakeLists.archshift2014-04-251-1/+6
| | |
| | * Add commit what the code is doing.Howaner2014-04-251-0/+1
| | |
| | * Add unkown armor warning and fix armor stacks.Howaner2014-04-251-2/+14
| | |
| | * Add armor to switch() in ItemHandler.cppHowaner2014-04-241-6/+25
| | |
| | * Fix armor in survival mode.Howaner2014-04-243-15/+76
| | |
| * | Merge branch 'master' into fixesTiger Wang2014-04-242-3/+2
| |\| | | | | | | | | | | | | Conflicts: src/World.h
| | * Fixed clang compilation errors. Apparently gcc and MSVC do not care about the order of initializer lists, but clang does.jfhumann2014-04-181-1/+1
| | |
| | * Did some static analysis, fixed some bugs and optimized a lot of codejfhumann2014-04-182-2/+1
| | |
| * | Small changesTiger Wang2014-04-232-9/+10
| |/
* | Merge branch 'master' into SlabsHowaner2014-04-065-18/+19
|\|
| * Fixed Clang warnings in itemhandlers.madmaxoft2014-04-045-18/+19
| |
* | Add CanChangeDirtToGrass function to Block Handlers.Howaner2014-04-062-1/+2
|/
* Fixed boat placement code.madmaxoft2014-04-021-9/+17
|
* Another curlyTiger Wang2014-03-301-1/+2
|
* Curly bracketsTiger Wang2014-03-291-1/+4
|
* Fixed infinite minecart itemsTiger Wang2014-03-281-0/+3
|
* Some fixes to lilypadsTiger Wang2014-03-282-0/+108
| | | | | | | | * 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
* Implemented lilypad placementTiger Wang2014-03-231-4/+4
|
* Merge branch 'master' into awesometntTiger Wang2014-03-185-4/+75
|\ | | | | | | | | Conflicts: src/ChunkMap.cpp
| * Merge pull request #809 from Howaner/BlockEntitysMattes D2014-03-163-2/+27
| |\ | | | | | | More entity saving.
| | * Merge branch 'master' into BlockEntitysHowaner2014-03-153-14/+17
| | |\
| | * | Add fireball interactHowaner2014-03-143-2/+27
| | | |
| * | | Add new leaves to all classes.Howaner2014-03-162-2/+4
| | | |
| * | | Add cakeHowaner2014-03-162-0/+44
| | |/ | |/|
* | | Merge remote-tracking branch 'origin/master' into awesometntTiger Wang2014-03-102-5/+5
|\| | | | | | | | | | | | | | | | | Conflicts: src/Items/ItemLighter.h src/Simulator/IncrementalRedstoneSimulator.cpp
| * | Merge pull request #768 from Howaner/BlockEntitysTiger Wang2014-03-091-2/+2
| |\| | | | | | | Add TNT load/save
| | * Change TNT Fuse to ticksHowaner2014-03-081-2/+2
| | |
| * | Merge pull request #731 from mc-server/ballisticmissilesTiger Wang2014-03-091-3/+3
| |\ \ | | | | | | | | Ballistic firework missiles
| | * \ Merge branch 'master' into ballisticmissilesTiger Wang2014-03-094-17/+41
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp
| | * | | Implemented ballistic missiles (fireworks)Tiger Wang2014-02-271-3/+3
| | | | | | | | | | | | | | | | | | | | + Added fireworks
* | | | | Merge branch 'master' into awesometntTiger Wang2014-03-103-12/+15
|\| | | |
| * | | | Merge branch 'master' into warningsTycho2014-03-081-11/+11
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | cBlockInfo-related changes from #723andrew2014-03-081-11/+11
| | | |/ | | |/|
| * / | Fixed warningsTycho2014-03-071-0/+3
| |/ /
| * | cBlockInfo now manages the respective cBlockHandlerandrew2014-03-021-1/+1
| | |
* | | Added extra awesomeness to TNTTiger Wang2014-03-051-1/+1
|/ / | | | | | | | | | | | | + 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
* | g_BlockXXX => cBlockInfo::XXXandrew2014-03-011-1/+1
| |
* | Fixed multiple gcc warnings about unused params.madmaxoft2014-02-281-1/+25
| |
* | Fixed crash and some warnings in map handling.madmaxoft2014-02-271-3/+3
|/ | | | Fixes #728.
* Fixed MCServer not compiling with C++03 compilersSTRWarrior2014-02-241-3/+3
|
* Maps: Improvementsandrew2014-02-232-2/+2
|
* Manual merge (Fixed conflicts)andrew2014-02-205-3/+203
|\
| * Merge pull request #697 from Howaner/SkullMattes D2014-02-192-0/+44
| |\ | | | | | | Add Skulls/Heads to MCServer
| | * Rename SkullEntity to MobHeadEntityHowaner2014-02-192-6/+4
| | |
| | * Add Heads completelyHowaner2014-02-181-0/+1
| | |
| | * Add Skulls/HeadsHowaner2014-02-172-0/+45
| | |
| * | Merge branch 'master' into itemframesTiger Wang2014-02-182-2/+102
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/Entities/Entity.h src/WorldStorage/NBTChunkSerializer.cpp
| | * | Comments & new BLOCK_FACE constantsTiger Wang2014-02-181-7/+10
| | | |
| | * | Implemented paintings, fixes #689Tiger Wang2014-02-182-2/+99
| | |/ | | | | | | | | | + Implemented paintings
| * | Fixed possible ASSERT failureTiger Wang2014-02-181-1/+1
| | |
| * | Changed BlockFace type to eBlockFaceTiger Wang2014-02-181-13/+1
| | |
| * | Added an explanatory commentTiger Wang2014-02-181-0/+2
| | |
| * | Used new BLOCK_FACE constantsTiger Wang2014-02-181-7/+8
| | | | | | | | | Also added more comments
| * | Implemented item frames, a part of #689Tiger Wang2014-02-182-0/+65
| |/ | | | | | | | | + Implemented Item Frames * Fixed Pitch and Yaw being wrongly flipped in the protocol (XOFT!)
| * Fixed TNT fizzing everywhereTiger Wang2014-02-151-1/+1
| |
* | Map decorators; Map clientsandrew2014-02-181-2/+2
| |
* | Map item handler; Fixed several bugsandrew2014-02-174-1/+68
| |
* | cMap::UpdateRadiusandrew2014-02-151-2/+4
| |
* | EmptyMap item handlerandrew2014-02-142-0/+48
|/
* Added additional parenthasiesworktycho2014-02-101-2/+1
|
* Merge branch 'master' into boatsFixTycho2014-02-101-0/+1
|\ | | | | | | | | Conflicts: src/Items/ItemBoat.h
| * Maybe fixed boat placingtonibm192014-02-101-1/+1
| |
* | Fixed stupid mistax in conditionalworktycho2014-02-101-2/+1
|/ | | 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.
* Merge branch 'master' into playerimprovementsTiger Wang2014-02-0928-40/+40
|\ | | | | | | | | Conflicts: MCServer/Plugins/APIDump/APIDesc.lua
| * Improved Type safety of eBlockFaceTycho2014-02-0428-40/+40
| | | | | | | | May Fix #640
* | Fixed #626Tiger Wang2014-02-033-13/+38
|/ | | | * Fixed consumption of carrots and potatoes
* Changed Signiture of OnUpdateTycho2014-02-023-4/+13
|
* Changed pointers to referencesTycho2014-02-012-2/+2
|
* Refactored GetPlacementBlockTypeMetaTycho2014-01-262-3/+6
|
* Fixed flint&steel failure on the Y world edges.madmaxoft2014-01-241-0/+4
|
* Merge pull request #534 from mc-server/SpawnMinecartMattes D2014-01-171-1/+1
|\ | | | | Added cWorld::SpawnMinecart.
| * Renamed cEmptyMinecart to cRideableMinecartSTRWarrior2014-01-121-1/+1
| |
| * EmptyMinecarts should be able to get a block inside of them.STRWarrior2014-01-121-1/+1
| |
* | Removed internal cEntity::GetRot() usage.madmaxoft2014-01-174-4/+4
| |
* | Removed obsoleted functionsTiger Wang2014-01-164-4/+4
| |
* | Renamed g_TorchPlaceable...Tiger Wang2014-01-111-1/+1
|/ | | | ...to g_FullyOccupiesVoxel, as recommended by @bearbin
* Fixed a few MSVC warnings.madmaxoft2014-01-071-1/+0
|
* Implented OnPlayerFishing and OnPlayerFished.STRWarrior2013-12-301-1/+7
|
* converted commneted paramater names to the unused macroTycho Bickerstaff2013-12-221-1/+7
|
* Merge branch 'master' of github.com:mc-server/MCServerTycho Bickerstaff2013-12-221-29/+173
|\
| * You are now able to sweep mobs to your position using fishing rods.STRWarrior2013-12-251-26/+64
| |
| * Made the lure enchantment work.STRWarrior2013-12-221-1/+1
| |
| * Countdown time is between 100 and 900 ticks.STRWarrior2013-12-221-1/+1
| |
| * Using regular assignments.STRWarrior2013-12-211-6/+6
| |
| * Once again better Y direction for the items given when fishing.STRWarrior2013-12-211-2/+2
| |
| * You are now able to get different items from fishing.STRWarrior2013-12-211-2/+108
| |
* | Root is now warnings cleanTycho Bickerstaff2013-12-211-1/+1
|/
* Merge branch 'master' into cmakeTycho Bickerstaff2013-12-211-2/+7
|\
| * Fixed bug where you could pickup the floater only to get one spawned instantly or the other way around.STRWarrior2013-12-211-0/+5
| |
| * Increased the range an Floater can shoot to.STRWarrior2013-12-201-1/+1
| |
| * Fish now actualy jumps to the player instead of a few block bellow them.STRWarrior2013-12-201-1/+1
| |
* | Merge branch 'master' into cmakeTycho Bickerstaff2013-12-193-0/+85
|\|
| * Merge pull request #450 from mc-server/redstonefixesMattes D2013-12-191-0/+5
| |\ | | | | | | Multiple fixes
| | * Fixed dust from being placed on nonsolidsTiger Wang2013-12-191-0/+5
| | |
| * | You can get fish from fishing :D. Only one type of fish though.STRWarrior2013-12-191-12/+27
| | |
| * | Implented cItemFishingRodHandler.STRWarrior2013-12-192-0/+65
| |/
* | Merge branch 'master' into cmakeTycho Bickerstaff2013-12-184-46/+169
|\|
| * Implented Nether Wart.STRWarrior2013-12-182-0/+56
| |
| * Fixed naming and initialization.madmaxoft2013-12-171-4/+12
| |
| * Forgot to change one Vector3d to Vector3i.STRWarrior2013-12-171-1/+1
| |
| * Renamed Pos to m_Pos.STRWarrior2013-12-171-3/+3
| |
| * Using Recommendations.STRWarrior2013-12-171-10/+23
| |
| * Made buckets work when the player does not 'look' at a block. This fixes #265STRWarrior2013-12-171-32/+53
| |
| * Boats spawn on top of a block. not between 4 blocks.STRWarrior2013-12-161-1/+1
| |
| * Using suggestions for Boat placing.STRWarrior2013-12-161-1/+1
| |
| * You can spawn boats on water.STRWarrior2013-12-161-7/+32
| |
* | more cmake stuffTycho Bickerstaff2013-12-101-0/+7
|/
* Bonemeal has particles, fixes #393Tiger Wang2013-12-081-3/+2
|
* Spawn eggs use IsGameMode()Tiger Wang2013-12-061-2/+2
| | | | Possible fix for #316.
* Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-244-4/+50
| | | | | Conflicts: GNUmakefile
* Moved source to srcAlexander Harkness2013-11-2430-0/+2173
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 03:37:54 +0100