summaryrefslogtreecommitdiffstats
path: root/src/Items (follow)
Commit message (Collapse)AuthorAgeFilesLines
* goodTiger Wang2016-12-186-33/+12
|
* Fix issue #3312Alexander Harkness2016-08-121-0/+1
| | | Nether brick fences now drop their item.
* CMake: Remove needless minimum version specifications.Mattes D2016-07-181-2/+0
|
* Fixes for boat entities (#3265)beeduck2016-07-181-1/+16
| | | protocol for vehicles now properly handled, protocol for boat paddles now properly handled, boats can no longer spawn underwater, boats now properly float, boat metadata now properly broadcasted.
* Bulk clearing of whitespaceLogicParrot2016-02-0528-119/+119
|
* Updated old forum linksMathias2016-01-311-1/+1
|
* Renamed leftover strings to Cuberite / Server, as needed.Mattes D2016-01-011-1/+1
| | | | Also upgraded the user setting file for MSVC to 2013.
* add handling of water bottleGargaj2015-12-223-0/+98
|
* Tilling dirt should send block updateGargaj2015-12-061-1/+1
| | | | There are BUD switches that are built on this (https://www.youtube.com/watch?v=Bk_ChvmtCNY) but more prominently, torches placed on dirt blocks should pop off when the dirt block is tilled.
* Merge mushroom soup into generic food handlerGargaj2015-12-034-56/+25
| | | | ...and fix eating the bowl when eating rabbit stew
* remove slab from inventory when using it on another slab (fixes #2610)Gargaj2015-11-091-3/+27
|
* Added CircleCI for stylechecking.Mattes D2015-09-171-2/+5
| | | | This will allow us to remove the stylecheck from Travis builds, making them a bit faster, and having fast style checks
* Silenced and fixed many warning messages across multiple files.Samuel Barney2015-07-299-20/+26
|
* Spawn baby mobshallucino2015-07-163-4/+4
|
* Improved mapsTiger Wang2015-07-147-10/+10
|
* Doors now get placed on the server-side.bibo382015-06-251-1/+0
| | | | | | The Y-Value is already the lower door block(From ItemHandler.cpp:346). Increasing it once again, places the door into the air, which is blocked by Cuberite. Bugfix #2279
* Fixed right-click with bonemeal.Mattes D2015-06-231-1/+1
| | | | The client would send invalid right-click events with Y set to 0x7ff, which would crash the server. Only process bonemeal for valid clicks (valid blockface).
* Refactored block placement workflow.Mattes D2015-06-217-85/+156
| | | | Multi-blocks can now use the default OnPlayerPlaced() callback in cItemHandler.
* Merge branch 'master' into PreventNewWarningstycho2015-05-283-4/+4
|\ | | | | | | | | Conflicts: src/Inventory.cpp
| * Merge pull request #2061 from mc-server/fixesAlexander Harkness2015-05-273-4/+4
| |\ | | | | | | Fixes
| | * Fixes #2052Tiger Wang2015-05-183-4/+4
| | |
* | | Merge branch 'master' into PreventNewWarningstycho2015-05-241-0/+14
|\| |
| * | Merge pull request #2091 from Rakete1111/masterworktycho2015-05-241-0/+14
| |\ \ | | | | | | | | Placing buckets up to 25 blocks away #2059
| | * | Fixes #2059Blitz Rakete2015-05-211-0/+14
| | |/
* | | Made -Weverything an error.tycho2015-05-243-4/+11
| | |
* | | Merge branch 'master' into PreventNewWarningstycho2015-05-231-1/+1
|\| |
| * | Fixed missing overrides and added a ignore flag for reserved macro for clang version 3.6 and higher.Lukas Pioch2015-05-231-1/+1
| |/
* / Make -Werror disabling file onlytycho2015-05-191-0/+4
|/ | | | Ad fix a load of warnings
* CheckBasicStyle: checks spaces around * and &.Mattes D2015-05-092-2/+2
|
* More style checking.Mattes D2015-05-092-2/+2
| | | | Spaces around some operators are checked.
* Rabbit and cooked rabbit now stackablejammet2015-05-091-1/+3
| | | | And corrected the alphabetical ordering.
* Fixed #1893Tri1252015-05-071-0/+1
| | | | Quartz ore now stack properly
* Merge pull request #1851 from wraith11/DoorFixMattes D2015-04-231-1/+1
|\ | | | | Fix door placing in connection with slabs
| * Fix door placing in connection with slabswraith112015-04-211-1/+1
| | | | | | | | Except top-half slabs as transparent blocks for doors.
* | Merge pull request #1852 from wraith11/SlabPlacingMattes D2015-04-231-0/+23
|\ \ | | | | | | Fix slab placing
| * | Fix slab placingwraith112015-04-221-0/+23
| |/
* | ItemHandler type fixes.Mattes D2015-04-201-2/+2
| |
* | ItemHandler: Using automatic array bounds.Mattes D2015-04-201-1/+1
| |
* | Fixed PolishedGranite et al crafting recipes.Mattes D2015-04-161-2/+2
| | | | | | | | Fixes #1774. Ref.: #1859
* | Scooping up fluid calls the player placement hooks.Mattes D2015-04-141-4/+12
| | | | | | | | Ref.: #1857.
* | Placing a fluid from bucket calls plugin hooks.Mattes D2015-04-1418-51/+165
|/ | | | Ref.: #1857.
* Fixed placing bottom half-slabs by clicking a top half-slab.Mattes D2015-03-281-2/+2
| | | | Ref.: #1837
* Merge pull request #1826 from mc-server/UnifyPacketizerMattes D2015-03-243-4/+4
|\ | | | | Unify packetizer
| * Changed cEntity::m_UniqueID to UInt32.Mattes D2015-03-213-4/+4
| |
* | Correct world height validations.Tommy Santerre2015-03-201-1/+1
|/ | | | | Unify the way we test block above the current one (Height - 1 instead of a_RelY + 1). Allow generation of world of flat height = 255
* cPainting saving implementedTiger Wang2015-03-141-16/+3
| | | | Additionally, it now inherits from cHangingEntity.
* Fixed door placement.Mattes D2015-02-281-4/+17
| | | | Doors now have hinges on the correct side, based on what the surroundings are when placing them.
* Door handler: Removed needless check.Mattes D2015-02-211-1/+1
| | | | The Y coord has already been checked above.
* Fix door placement checkFreddie Wang2015-02-211-7/+3
|
* Fixed various warnings.Mattes D2015-01-181-6/+6
|
* MobHead: Fixed wither spawning.Mattes D2014-12-251-13/+40
|
* MobHeads: fixed regular head placement.Mattes D2014-12-251-2/+22
|
* Fixed door placement.Mattes D2014-12-251-2/+2
|
* Fixed forgotten big flower handler.Mattes D2014-12-251-1/+2
|
* Fixed redstone dust placement on upside-down slabs.Mattes D2014-12-241-1/+36
|
* Refactored all player block placing to go through hooks.Mattes D2014-12-2412-108/+1041
| | | | Fixes #1618.
* Added RabbitsMasy982014-12-201-0/+1
|
* Merge branch 'master' into entitiesMasy982014-12-181-2/+44
|\
| * FixesHowaner2014-12-131-0/+5
| |
| * Added cocoa pod.Howaner2014-12-011-2/+39
| |
* | Added Entity GuardianMasy982014-12-181-0/+1
|/
* En masse NULL -> nullptr replaceTiger Wang2014-10-236-10/+10
|
* Moved tall grass pickups handle.Howaner2014-10-211-9/+0
|
* Leaves are harvest-able.Howaner2014-10-071-2/+0
|
* Corrected drops from dead bush, tall grass and cobweb.Howaner2014-10-072-11/+35
|
* Fixed sortingMasy982014-10-011-2/+2
|
* Fixed Red Sandstone and Prismarine dropsMasy982014-10-012-17/+23
|
* Fixed 1.8 dirt typesHowaner2014-09-301-2/+25
|
* Merge pull request #1415 from Masy98/blocksMattes D2014-09-263-28/+72
|\ | | | | Added 1.8 Blocks and Items
| * Moved curly brace to seperate lineMasy982014-09-261-1/+2
| |
| * Merge branch 'master' into blocksMasy982014-09-269-38/+112
| |\ | | | | | | | | | | | | | | | Conflicts: src/Items/ItemHandler.cpp src/Simulator/IncrementalRedstoneSimulator.cpp
| * | Fixed 1.8 Item stacking and block harvestingMasy982014-09-121-25/+43
| | |
| * | Added new doors in ItemDoor.hMasy982014-09-111-1/+15
| | |
| * | Fixed mutton name in Sheep.cppMasy982014-09-111-2/+10
| | |
| * | Fixed mutton name in ItemHandlerMasy982014-09-111-1/+1
| | |
| * | Added 1.8 food to the food listMasy982014-09-111-1/+4
| | |
* | | Removed more unessicary includesTycho2014-09-261-0/+1
| |/ |/|
* | Merge branch 'master' into redstoneTestsTycho2014-09-251-1/+0
|\ \ | | | | | | | | | | | | Conflicts: src/Mobs/Monster.h
| * \ Merge branch 'master' into 1.8-ProtocolHowaner2014-09-146-7/+74
| |\ \
| * \ \ Merge branch 'master' into 1.8-ProtocolHowaner2014-09-133-5/+8
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/Items/ItemHoe.h
| * | | | Fixed many right click issues.Howaner2014-09-121-3/+7
| | |_|/ | |/| |
* | | | Merge branch 'master' into redstoneTestsTycho2014-09-178-8/+83
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | Conflicts: src/Blocks/ChunkInterface.h
| * | | Improved cBlockHandler::DropBlockTiger Wang2014-09-131-1/+1
| | | |
| * | | Merge pull request #1353 from mc-server/EffectsMattes D2014-09-136-6/+73
| |\ \ \ | | |_|/ | |/| | Added speed entity effect.
| | * | Added extra mushroom handler.Howaner2014-09-123-3/+60
| | | |
| | * | Merge branch 'master' into EffectsHowaner2014-09-123-5/+9
| | |\|
| | * | Merge branch 'master' into EffectsHowaner2014-09-022-2/+12
| | |\ \
| | * | | Fixed potion removing in creative mode.Howaner2014-08-304-4/+14
| | | | |
| * | | | Fixed farmland issues.Howaner2014-09-121-1/+1
| | | | |
| * | | | Only place farmland if no block is upper than dirt/grass.Howaner2014-09-121-1/+6
| | | | |
| * | | | Added hoe interact sound.Howaner2014-09-121-0/+1
| | | | |
| * | | | Spawn exp if you break a mob spawner.Howaner2014-09-121-0/+1
| | | | |
| * | | | Disabled mobspawner itemdrop.Howaner2014-09-121-0/+1
| | |_|/ | |/| |
* / | | Added first test to show the object can be createdTycho2014-09-171-28/+28
|/ / /
* | | In 1.8, carrots and potatoes yield one less hunger point.archshift2014-09-042-2/+2
| | |
* | | Fixed style and alpha-sorting.madmaxoft2014-09-032-7/+7
| | |
* | | Added mutton, which sheep now drop when killedarchshift2014-09-032-0/+4
| |/ |/|
* | Merge remote-tracking branch 'Hircine/Enchantments'madmaxoft2014-09-011-1/+11
|\ \
| * | FixesJaume Aloy2014-08-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | - Changed m_TicksLeftBurning > 0 for IsOnFire() - Tried to do the changes in BlockHandler.cpp - Removed m_Creator in ArrowEntity - Added m_Enchantments in ProjectileEntity CreatorData - Added blank lines between functions
| * | Added some EnchantmentsJaume Aloy2014-08-191-1/+11
| | | | | | | | | | | | | | | | | | - Bow enchantments: Infinity, Flame and Power - Sword and tools enchantments: Fire Aspect, Bane of Arthropods, Smite, Sharpness
* | | Merge branch 'master' of https://github.com/mc-server/MCServerTiger Wang2014-08-294-3/+12
|\ \ \ | | |/ | |/| | | | | | | Conflicts: src/Server.cpp
| * | Code formatting fixes.Howaner2014-08-192-2/+1
| |/
| * Fixed unsigned long comparison to size_tarchshift2014-08-051-1/+1
| |
| * Changed arrow comment.Howaner2014-08-041-1/+1
| |
| * Added arrow consuming on shootingHowaner2014-08-041-0/+10
| |
* | Removed unused codeTiger Wang2014-08-291-1/+1
|/
* Merge pull request #1272 from Howaner/FoodMattes D2014-08-014-25/+136
|\ | | | | Fixed hunger bugs, Implemented golden apple, added jump statistic, added...
| * Fixed hunger bugs, Implemented golden apple, added jump statistic, added correct food effects.Howaner2014-07-314-25/+136
| |
* | Fixed water from ice and removed packed ice drop.Howaner2014-07-311-0/+1
|/
* Hotfixed compilation problems.madmaxoft2014-07-272-2/+2
|
* Merge pull request #1236 from Howaner/Inventory2Mattes D2014-07-277-13/+107
|\ | | | | Fix item durability.
| * Derp.Howaner2014-07-261-1/+1
| |
| * Rename function.Howaner2014-07-264-6/+6
| |
| * Merge branch 'master' into Inventory2Howaner2014-07-265-13/+61
| |\ | | | | | | | | | | | | Conflicts: src/BlockInfo.cpp
| * | Fix item durability.Howaner2014-07-235-10/+91
| | | | | | | | | Fixes #1181
* | | Fixed indentations, removed redundant init code in SplashPotionEntity.cpparchshift2014-07-261-3/+5
| | |
* | | Moved potion static functions to EntityEffect to create splash potions through worldarchshift2014-07-261-129/+7
| |/ |/|
* | Fixed block dropsTiger Wang2014-07-242-5/+43
| | | | | | | | * Fixes #1242 (the issue addressed within)
* | Merge remote-tracking branch 'origin/master' into saplingsandleavesTiger Wang2014-07-223-5/+5
|\| | | | | | | | | Conflicts: src/Defines.h
| * Style: Normalized to no spaces before closing parenthesis.madmaxoft2014-07-213-4/+4
| |
| * Style: Normalized spaces after if, for and while.madmaxoft2014-07-211-1/+1
| |
* | Merge branch 'master' into saplingsandleavesTiger Wang2014-07-2026-78/+136
|\| | | | | | | | | | | Conflicts: src/Bindings/DeprecatedBindings.cpp src/Blocks/BlockSapling.h
| * Fixed style: spaces after commas.madmaxoft2014-07-192-2/+2
| |
| * Merge pull request #1214 from mc-server/anti-globMattes D2014-07-191-5/+49
| |\ | | | | | | CMake - Explicitly lists all source files
| | * Subdirs: Only add_library if not using MSVCarchshift2014-07-191-1/+3
| | |
| | * Items/CMakeLists.txt: Replaced glob with list of filesarchshift2014-07-191-5/+47
| | |
| * | Splash potions: Renamed PotionParticleType to PotionColor for clarityarchshift2014-07-191-3/+3
| |/
| * Added a extra wall sign handler.Howaner2014-07-181-3/+4
| | | | | | Fixes #1119
| * Fixed tabs used for alignment.madmaxoft2014-07-172-8/+8
| |
| * More trailing whitespace fixes.madmaxoft2014-07-173-6/+6
| |
| * Basic style fixes.madmaxoft2014-07-1719-25/+25
| |
| * Normalized comments.madmaxoft2014-07-1710-26/+39
| | | | | | | | | | This was mostly done automatically and then visually inspected for obvious errors. All //-style comments should have a 2-space separation from the code, and 1 space after the comment sign.
* | Fixed issues relating to saplings and leavesTiger Wang2014-07-171-6/+3
|/ | | | | | - Removed cBlockInfo::RequiresSpecialTool * Fixes #1195 * Fixes #1201
* Reformatted cItemPotionHandler.madmaxoft2014-07-171-47/+77
|
* Merge remote-tracking branch 'origin/master' into potionsmadmaxoft2014-07-171-1/+1
|\
| * Fixed a bug with bucketsTiger Wang2014-07-161-1/+1
| | | | | | | | | | * Additionally fixed cLineBlockTracer's EntryFace parameter when a block was hit on the first iteration along the projected line
* | Merge branch 'master' into potionsmadmaxoft2014-07-154-38/+58
|\|
| * Fixed placing liquids over liquidsTiger Wang2014-07-141-1/+1
| | | | | | | | * Fixes #1182
| * Adjusted calls to CreateProjectile that passed ItemsTycho2014-07-131-2/+2
| |
| * Changed BroadcastSoundEffect function to take floating pos.Howaner2014-07-133-12/+5
| |
| * Comment grammar correctionTiger Wang2014-07-121-1/+1
| |
| * Simplified buckets code slightlyTiger Wang2014-07-121-32/+15
| |
| * Merge pull request #1162 from daniel0916/FixesTiger Wang2014-07-121-23/+67
| |\ | | | | | | Fix for bucket placing
| | * Changesdaniel09162014-07-121-5/+4
| | |
| | * Changesdaniel09162014-07-111-24/+16
| | |
| | * Changesdaniel09162014-07-101-20/+22
| | |
| | * Maybe fixed whitespacesdaniel09162014-07-101-7/+7
| | |
| | * Maybe fixed whitespacesdaniel09162014-07-101-1/+1
| | |
| | * Fixed Bucket Placingdaniel09162014-07-101-6/+57
| | |
| | * Fixed Bucket placingdaniel09162014-07-091-1/+1
| | |
* | | ItemHandler.cpp: removed redundant food and drink checksarchshift2014-07-141-33/+0
| | |
* | | Readability and clarity changesarchshift2014-07-141-30/+45
| | |
* | | For now, removed creator member from Entity Effect for pointer safetyarchshift2014-07-121-2/+2
| | |
* | | Merge remote-tracking branch 'origin/master' into potionsarchshift2014-07-105-11/+62
|\| | | | | | | | | | | | | | | | | Conflicts: src/Entities/Player.cpp src/Entities/ProjectileEntity.cpp
| * | Fixed bow chargeTiger Wang2014-07-091-11/+2
| |/
| * Only fixes the server crash.Howaner2014-07-011-1/+1
| |
| * Fix server-crash with non-existing items.Howaner2014-07-011-1/+1
| |
| * Implemented tripwire(s) (hooks)Tiger Wang2014-06-282-0/+41
| | | | | | | | * Fixes #944
| * Merge branch 'master' into BowHowaner2014-06-264-0/+14
| |\
| | * Nullify deleted pointers.archshift2014-06-193-0/+3
| | |
| | * Merge branch 'master' into GlobalFixesHowaner2014-06-176-6/+6
| | |\
| | * | Add throw sound and fix arrow server crash.Howaner2014-05-281-0/+11
| | | |
| * | | 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
| | |/ | |/|
* | | EntityEffects.x -> EntityEffect.x, Object-Oriented effectsarchshift2014-06-191-1/+1
| | | | | | | | | | | | Changed effect map to take a pointer of the effect as a result.
* | | Entity Effects: Clarified user, added it to AddEntityEffectarchshift2014-06-171-1/+1
| | | | | | | | | | | | Added second AddEntityEffect with a pass-by-value of the class.
* | | Changed the AddEntityEffect() params for easier calls.madmaxoft2014-06-171-2/+1
| | |
* | | Fixed MSVC compilation.madmaxoft2014-06-171-7/+7
| | |
* | | Pawn: renamed HandleEntityEffects to HandleEntityEffectarchshift2014-06-171-1/+1
| | | | | | | | | | | | Exported entity effect functions for ToLua and documented them in APIDesc.lua
* | | Removed long function wrappingarchshift2014-06-171-10/+2
| | |
* | | ItemHandler: changed IsDrinkable() to take a short argumentarchshift2014-06-174-15/+10
| | |
* | | Splash potion: Adjusted speed, fixed spawn positionarchshift2014-06-171-6/+3
| | |
* | | Entity effect type: use 'eff' as a prefix instead of 'ef'archshift2014-06-171-33/+33
| | |
* | | Added splash potion functionalityarchshift2014-06-171-1/+35
| | |
* | | Implemented drinkable potions, noeffect entity effect,archshift2014-06-174-3/+146
| | | | | | | | | | | | Clears entity effects on death
* | | Implemented milk, added documentation to Pawn.harchshift2014-06-173-1/+47
| | |
* | | Player: Removed food-poisoning-specific code, set duration to 30 secondsarchshift2014-06-171-1/+1
|/ / | | | | | | http://minecraft.gamepedia.com/Hunger#Behavior
* / 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-23 00:58:24 +0100