summaryrefslogtreecommitdiffstats
path: root/src/Blocks (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Fix Snow Spawn on Cobblestone Slab (#4564)Xenoxis2020-03-281-1/+1
|
* Furnace and brewing stand drops (#4534)Mat2020-03-242-6/+36
| | | | | | | | | | | | | * Furnace drops contents * Brewing stand drops contents * Fix lit furnace drop * Fix brewing stand drop * Style * Style
* Fix certain item drops (#4536)Mat2020-03-236-12/+51
| | | | | | | | | | | * Fix certain item drops * Revert unwanted changes * Revert unwanted changes * Revert change * Style fixes
* Jukebox improvements (#4537)Mat2020-03-232-1/+38
| | | | | * Add jukebox block handler Co-authored-by: peterbell10 <peterbell10@live.co.uk>
* Cocoa pods have three growing stagesMat2020-03-231-2/+2
|
* Don't push blocks outside world height limits (#4516)Mat2020-03-221-0/+5
| | | | | | | | | | | | | | | | | | | | | | | * Don't push blocks outside world height limits * Style fix * Apply suggestion Co-Authored-By: peterbell10 <peterbell10@live.co.uk> * Apply suggestion Co-Authored-By: peterbell10 <peterbell10@live.co.uk> * Improvements * Add block type check back * Revert line break changes * Update BlockPiston.cpp Co-authored-by: peterbell10 <peterbell10@live.co.uk>
* Don't remove items twice (#4524)Mat2020-03-221-4/+2
| | | * Don't remove items twice
* Ender chest is not affected by piston (#4526)Mat2020-03-221-1/+1
|
* Silk touch pickaxe drops grass block (#4485)Mat2020-03-173-101/+134
|
* Moved growing from cWorld / cChunk to cBlockHandler descendants.Mattes D2019-10-2820-193/+567
|
* Refactored block-to-pickup conversion. (#4417)Mattes D2019-10-1688-1286/+1944
|
* Refactored more of Entities and BlockEntities to use Vector3. (#4403)Mattes D2019-09-291-1/+1
|
* Fix building with clang 8.0 (#4346)Bond-0092019-08-112-8/+10
|
* Register vanilla blocks in BlockTypeRegistry.Mattes D2019-08-052-1/+718
|
* * Sponge: Add water absorbtion (#4333)Zach DeCook2019-06-112-0/+159
| | | | Closes #1411
* Create Ender Portal with Eyes of Ender (#4126)Zach DeCook2019-05-113-0/+261
| | | | | | | | | The algorithm was designed so All portals must be facing the center, no matter which block had the eye inserted in last. Note: Still need to create a block entity so that portals don't become invisible when you relog. Addresses part of #3445 Fixes #3695
* Force all headers other than "Globals.h" to be included with relative paths (#4269)peterbell102018-08-2912-15/+16
| | | | | | | Closes #4236 CMake now creates a header file in the build directory under the path "include/Globals.h" which just includes "src/Globals.h" with an absolute path. Then instead of adding "src/" to the include directories, it adds "include/". #include "Globals.h" still works by including the build generated file and any other src-relative path will not work.
* Store and pass entity effect duration as an int not a short. (#4293)Alexander Harkness2018-08-261-1/+1
| | | Fixes #4292.
* Fixes bed item 26 and 355 being spawned, only 355 spawns now (#4290)Rick van Schijndel2018-08-231-0/+1
|
* Experience orb (#4259)changyong guo2018-08-023-2/+6
| | | | | | | * Replace cWorld::FindClosesPlayer with cWorld::DoWithClosestPlayer * Implement experience reward splitting into the orb sizes used in vanilla * Modified speed calculation in cExpOrb::Tick to make the orbs fly towards the player Fixes #4216
* cWorld: Manually bind deprecated broadcast functions (#4265)peterbell102018-07-272-2/+2
| | | Ref: https://github.com/cuberite/cuberite/pull/4264#discussion_r204769193
* CheckBasicStyle: Check number of empty lines between functions (#4267)peterbell102018-07-264-16/+5
| | | | Add check for number of empty lines between functions and fix the corresponding failures
* At long last... Piston animations!Tiger Wang2018-07-252-59/+105
| | | | | * Fixes #3198 * Fixes #57 (again lol)
* Broadcast refactor (#4264)peterbell102018-07-243-9/+59
| | | | | | | | | | | | | | | | | | | | | | | * Move Broadcast functions from cChunkMap to cBroadcaster - Remove cBroadcastInterface in favour of cBroadcaster. - cChunk: Remove broadcast functions. * resurect broadcast interface * Absorb cBroadcaster into cWorld. Removes the need for forwarding the function calls. * Improve const-correctness * Use Int8 instead of char + Comment `ForClients` functions * Improve comments * Broadcaster: Rename ForClients functions
* fix dispenser pickup display bug (#4247)changyong guo2018-06-301-0/+7
| | | fix dispenser pickup bug by ignore meta data during pickup creation
* Deal with covered switches consistently (#4161)peterbell102018-02-058-32/+8
| | | | | | | * Fixes a number of "<function>: not all control paths return a value" warnings on MSVC. * Introduces the UNREACHABLE global macro and uses it instead of conditionally compiled switch defaults. * Move cNBTParseErrorCategory from FastNBT.h into FastNBT.cpp to prevent bad calls to message()
* Rewrite cClientHandle::HandleRightClick (#4089)9caihezi2018-01-081-1/+2
| | | | | | | | | | | | | * Add hand parameter to distinguish main hand/off hand. * Add a new function cClientHandle::HandleUseItem to separate the functionality of using an item without a target block. This matches the protocol with client version >= 1.9 * Always actively update the status of a block if the placement fails (by out of reach or rejected by plugin). * Do not call plugin callback CallHookPlayerRightClick(-1, 255, -1, -1, 0, 0, 0) when using item. The CallHookPlayerUsingItem will still be called. Now at most one of CallHookPlayerRightClick, CallHookPlayerUsingBlock, CallHookPlayerUsingItem and CallHookPlayerEating will be called based on the type of action (not including the used version of callbacks). * Do not count using item as BlockInteractionsRate check (Using item takes time). * Now we can open chests(etc.) when sneaking as long as the player's hand is empty. This is what vanilla server does.
* Sugar cane can be near frosted ice (#4133)Bond-0092018-01-051-1/+1
|
* Item durability loss now depends on the item used. (#4123)Alexander Harkness2018-01-051-4/+2
| | | | | | | Armour durability also no longer changes when it is used to break blocks or attack mobs. Fixes #4119
* Add the fmt library (#4065)peterbell102018-01-031-0/+1
| | | | | | | * Replaces AppendVPrintf with fmt::sprintf * fmt::ArgList now used as a type safe alternative to varargs. * Removed SIZE_T_FMT compatibility macros. fmt::sprintf is fully portable and supports %zu. * Adds FLOG functions to log with fmt's native formatting style.
* Concrete mixing (#4096)Zach DeCook2018-01-033-0/+109
| | | | | | | | | Adds a block handler for concrete powder and implements hardening to concrete. Concrete powder turns into concrete when: * It is next to water when it receives a block update * It falls onto a water block (even with Physics SandInstantFall=1)
* Lilypads can be on top of (frosted) ice (#4122)Bond-0092017-12-271-2/+2
| | | Fixes #4117
* improve rain simulation (#4017)Alexander Harkness2017-12-261-1/+1
| | | | | | | | | | | * Uses vanilla logic to decide which blocks rain falls through. * Rain falls infinitely above the world, and stops at y=0. * Entities will now be extinguished if they are under rain-blocking blocks, and fire will now be extinguished by rain similarly. * Create IsWeatherWetAtXYZ to identify wetness at a particular location. * Use new code for enderman rain detection. * Fixes issue #916 * Disable warnings for global constructors in the fire simulator.
* cBlockRail: Fix assertion failure (#4075)peterbell102017-11-211-3/+3
|
* cChunkInterface GetBlock, GetBlockMeta, GetBlockTypeMeta use vectors (#4050)Bond-0092017-11-2031-177/+168
|
* Only allow snow to be placed where valid. Fixes #2920.peterbell102017-09-211-12/+38
|
* Only allow rails to be placed where valid.peterbell102017-09-211-1/+8
| | | | Fixes #3507.
* Changed BroadcastSoundEffect, SendSoundEffect, and CastThunderbolt parameters to vectors (#3959)Lane Kolbly2017-09-195-9/+9
| | | | | | | | | | | | | | | | | | * Made BroadcastSoundEffect take vector parameters. * Added docs for new vectored methods * Removed old code * Fixed lua warnings * Made old BroadcastSoundEffect not an override. * m_Block to m_BlockPos, used Vector3d constructor where prettier. * a_Block to a_BlockPos * Changed thunderbolt a_Block to a_BlockPos
* Leaves now drop with the correct meta when broken by a pickaxe with silk touch (#4034)Bond-0092017-09-191-0/+6
|
* Removed UTF-8 BOM (#4033)Lukas Pioch2017-09-192-2/+2
|
* Replace ItemCallbacks with lambdas (#3993)peterbell102017-09-113-118/+57
|
* Revert "Replace ItemCallbacks with lambdas (#3948)"LogicParrot2017-09-023-57/+118
| | | | This reverts commit 496c337cdfa593654018c171f6a74c28272265b5.
* Replace ItemCallbacks with lambdas (#3948)peterbell102017-09-013-118/+57
|
* Drop enderchest when broken by a silk touck pick (#3986)Bond-0092017-08-312-1/+6
|
* Bed piston fix (#3956)Lane Kolbly2017-08-256-9/+12
| | | | | | | | | | | | * Threaded world interface into ConvertBlockToPickups * Changed how cBlockPiston::PushBlocks sets the old block to air, so that the block exists for the DropBlock call. * Removed unused a_Digger argument. * Removed incorrect comment * This time actually removed a_Digger references.
* Minor changes (#3909)mathiascode2017-08-243-3/+3
|
* Fixed build for older clang versions (#3935)Bond-0092017-08-211-1/+1
|
* Fully implemented leashes (#3798)Pablo Beltrán2017-08-212-1/+66
|
* Changed int parameters to vector parameters in cCuboid and simulators (#3874)Lane Kolbly2017-08-175-6/+6
|
* Replaced includes with forward declarationsLukas Pioch2017-08-132-4/+6
|
* Removed unneeded includes (#3902)Lukas Pioch2017-08-0622-25/+3
|
* Remove double includes part 2 (#3890)peterbell102017-08-034-6/+0
|
* Removed unused forward declarations (#3888)Lukas Pioch2017-08-031-1/+0
|
* Removed double includes (#3885)Lukas Pioch2017-08-022-2/+0
|
* cBlockHandler: take player by refpeterbell102017-08-0145-142/+142
|
* cWorld::SendBlockTo take player by refpeterbell102017-08-018-10/+10
|
* Check for intersection between placed blocks and entities. (#3850)Lane Kolbly2017-07-286-1/+122
| | | | | | | | | | | | | * Check for intersection between placed blocks and entities. + Implemented GetPlacementCollisionBox, to permit custom placement collision boxes for blocks. * Factored block-entity placement checking into another function in cPlayer. - Removed vector min/max functions * Use GetWorld to get the world in DoesPlacingBlocksIntersectEntity. + Added block height checks, allow different cEntity subclasses to decide whether they will prevent block placement.
* Break the cactus block when it grows next to a block. (#3851)Bond-0092017-07-181-2/+6
|
* Made cBlockHandler OnPlacedByPlayer call OnPlaced, made BlockRailHandler use NeighborChanged instead of OnNeighborChanged.Lane Kolbly2017-07-182-16/+17
|
* Allocate redstone component handlers upfrontpeterbell102017-07-172-26/+26
|
* Changing pickup lifetime and combining semantics, making these adjustable in the lua api. (#3843)Lane Kolbly2017-07-121-0/+2
|
* BigFlower fixes (#3826)peterbell102017-07-079-20/+40
| | | | | | | * BigFlowers fixes * Correct upper part meta * Documented parameters to DoesIgnoreBuildCollision
* Added bed entity (#3823)Lukas Pioch2017-07-075-12/+88
| | | | | | | | | | * Added bed entity * Export cBedEntity to lua * Set color of bed through item damage value * Added bed entity to APIDoc * NBT: Added loading and saving * Crafting recipes for the colored beds
* cBlockInfo static initialisation (#3832)peterbell102017-07-031-1/+1
|
* You can't use beds when there are hostile mobs nearbyBond_0092017-07-021-8/+32
|
* Pressure plates can be placed on fences and hoppers (#3796)Bond-0092017-06-221-2/+21
|
* Fix shears (and vines)Bond-0092017-06-211-1/+7
| | | | | | | * Shears now lose durability when breaking any block * Leaves don't drop 2 leaves anymore when broken by shears * Removed the chance to drop saplings or apples when leaves are broken by shears * Vines can't be attached to ender chests, pistons and redstone repeaters
* Generated tall flowers have flower type meta in both blockspeterbell102017-06-191-1/+4
|
* Double tall grass drops seeds when broken by water (#3763)dbhicks2017-06-141-6/+15
|
* FastRandom rewrite (#3754)peterbell102017-06-1319-71/+59
|
* Fixes problems with windows:Lukas Pioch2017-06-053-3/+3
| | | | | - Changed cPlayer:OpenWindow to accept a ref, tolua adds a nil check - Close open lua window in destructor, to avoid dangling pointers
* Clang 5.0 fixesLukas Pioch2017-05-212-2/+2
| | | | | - Added override keyword - Removed inherited member variables
* BlockHandlers: vertical alignment.Mattes D2017-05-091-159/+159
|
* BlockCrops: Fixed RipeMeta off-by-one error properly.Mattes D2017-05-092-6/+6
| | | | Ref.: #3691
* Adjusted RipeMeta for off by one error (#3691)dbhicks2017-05-061-2/+2
|
* Replace double grass and large fern with placed blockLukas Pioch2017-04-062-1/+28
|
* Deadbushes drop sticksBond-0092017-03-192-0/+47
|
* BlockCrops: Fixed comments and reformatted control flow. (#3576)Mattes D2017-02-251-46/+54
|
* Updated sounds and effect IDs (#3422)mathiascode2017-02-156-8/+8
|
* Added some blocks and items (#3503)mathiascode2017-02-147-11/+51
|
* Fixed bindings for cBlockArea:Read and Write. (#3568)Mattes D2017-02-053-4/+4
| | | The original bindings accepted nil as the World param, causing a crash.
* Changed big flowers so they don't need air above them.Altenius2017-01-281-1/+11
|
* Changed big flowers so they can only be placed on dirtAltenius2017-01-281-1/+4
|
* Fix meta mirror (#3470)Mattes D2016-12-091-32/+56
|
* StyleCheck: Add "else has to be on a separate line" (#3412)mohe20152016-10-201-1/+2
|
* Use cChunkDef::Height for Y coord comparison where applicable.Moritz Borcherding2016-09-271-1/+1
|
* Fix breaking ice in survival not giving a water's source (#3356)ElNounch2016-08-281-2/+1
| | | Fix #3355
* Redstone fixes (#3285)Tiger Wang2016-07-312-3/+13
| | | | | | | | * Comparators and pistons no longer update instantly * Fixes #3168. * Consolidated comparator code * As a result, fixed an issue where GetPowerLevel didn't consider block entities behind it (only GetFrontPowerLevel did)
* Revert "Redstone fixes"Mattes D2016-07-292-13/+3
|
* Consolidated comparator codeTiger Wang2016-07-291-0/+5
| | | | | * As a result, fixed an issue where GetPowerLevel didn't consider block entities behind it (only GetFrontPowerLevel did)
* Comparators and pistons no longer update instantlyTiger Wang2016-07-292-3/+8
| | | | * Fixes #3168.
* CMake: Remove needless minimum version specifications.Mattes D2016-07-181-2/+0
|
* removed cast from BlockTrapdoor.h (#3256)gaurav sehgal2016-07-072-3/+8
|
* Fixed piston destroying other pistonsAltenius2016-07-061-5/+9
| | | | Fixes #3251
* Reduced unnecessary block updatesLogicParrot2016-04-222-10/+9
|
* Prevented snow from killing grassLogicParrot2016-04-161-2/+4
|
* Updated cChunk::SetMeta, fixed grass growth, reduced markDirty/setMeta usageLogicParrot2016-04-164-15/+17
|
* Fix Pickups of BlockFlowerDrahoslav Bednář2016-02-061-2/+3
| | | | | BlockMeta is handled correctly, when converting to pickups, so flowers now drops right flower type.
* Bulk clearing of whitespaceLogicParrot2016-02-0556-171/+171
|
* implement height logic for Acacia blocksKevin Riggle2016-02-041-1/+12
|
* Fixed typoMathias2016-01-031-1/+1
|
* More blocks that can't be mined with silktouchMathias2016-01-031-1/+28
|
* Renamed leftover strings to Cuberite / Server, as needed.Mattes D2016-01-011-1/+1
| | | | Also upgraded the user setting file for MSVC to 2013.
* Merge pull request #2542 from Haxi52/pinkstoneTiger Wang2015-12-198-46/+90
|\ | | | | Reorganised the redstone simulator
| * Reorganised the redstone simulatorTiger Wang2015-12-188-46/+90
| | | | | | | | | | | | -> Many thanks to @worktycho for the idea, and @Haxi52 for the implementation plan! * Uses classes and inheritance now * Speed should be improved
* | Added HTTPS links wherever they are supported.Alexander Harkness2015-12-191-6/+2
|/
* Moved variables into scope, removed unused variables and fixed variablesLukas Pioch2015-12-171-8/+1
|
* Merge pull request #2638 from Gargaj/masterworktycho2015-12-145-1/+61
|\ | | | | Implement block heights + adapt ground checks
| * blockheight mechanismGargaj2015-12-135-1/+61
| |
* | Strip meta from hopper on converting to pickupJulian Laubstein2015-12-131-0/+6
|/
* Set overgrown wart age to 3Safwat Halaby2015-12-131-1/+5
|
* allow use failures to propagate from the entity/block to the playerGargaj2015-12-1320-28/+46
|
* Nether wart only ages to 3Gargaj2015-12-121-2/+2
| | | See http://minecraft.gamepedia.com/Nether_Wart
* Add enum for Sound and Particle EffectsDave Tucker2015-11-243-3/+6
| | | | | | Fixes #2603 Signed-off-by: Dave Tucker <dave@dtucker.co.uk>
* Adjusted height validation using cChunkDef::IsValidHeight()Julian Laubstein2015-11-231-1/+1
|
* Refactored code to use vectors in the cPistonHandler classbibo382015-11-072-50/+40
|
* Added some code improvementsbibo382015-11-072-22/+42
|
* Renamed GetDirectionVec into VectorFromMetaData to improve code readability.bibo382015-11-072-6/+6
|
* Commented the GetDirectionVec methodbibo382015-11-071-0/+3
|
* Fixed the style problems and added some commentsbibo382015-11-072-6/+18
|
* Removed unused CanPull methodbibo382015-11-071-11/+0
|
* Extracted block moving code into a seperate methodbibo382015-11-072-77/+52
|
* Replaced the usage of pistonMeta with a direction vector to allow better meta value abstractionbibo382015-11-072-73/+63
|
* Fixed pulling/pushing of breakable blocks, which are not required to be movedbibo382015-11-071-3/+20
|
* Implemented the basic slime block pullingbibo382015-11-071-17/+62
|
* Implemented the SlimeBlock into the CanPush method to allow slimeblocks to work correctly when pushedbibo382015-11-071-15/+26
|
* Piston extension now works with the new recursive CanPushBlock method.bibo382015-11-071-36/+41
|
* Added the CanPushBlock method for the piston push check.bibo382015-11-072-24/+41
| | | | This allows the recursive check for blocks to push, which is needed to implement the slime blocks into the piston system.
* Implemented the slime block dropping behaviour.bibo382015-11-072-0/+34
| | | | Fixes #2530
* Implemented brewingLukas Pioch2015-11-031-4/+4
|
* Prepared ScheduleTask for threading refactorTiger Wang2015-09-251-20/+5
| | | | | * Llama-ified and condensed Schedule/QueueTask - Removed hackery done with piston animations
* Lilypads drop when not on source water.Mattes D2015-09-251-0/+16
| | | | | Lilypad blocks now break and drop as items when the block below them changes to non-water or non-source water. Fixes #2404.
* Added CircleCI for stylechecking.Mattes D2015-09-172-6/+12
| | | | This will allow us to remove the stylecheck from Travis builds, making them a bit faster, and having fast style checks
* Fixed flint drop rates from 1/30 to 1/10 to match the wiki.David Erbelding2015-09-141-1/+1
|
* * Logic for handling plant growth has been centralized into cBlockPlant, and all growable plants now inherit from it.Samuel Barney2015-08-1911-30/+256
| | | | * Blocks now have an effect upon plant growth, just like in vanilla.
* Some warning fixesJulian Laubstein2015-08-181-1/+1
|
* Fixed Iron DoorNicholas W2015-08-011-1/+6
|
* Unified the doxy-comment format.Mattes D2015-07-312-24/+23
|
* Silenced and fixed many warning messages across multiple files.Samuel Barney2015-07-2920-31/+26
|
* Spawn baby mobshallucino2015-07-162-2/+2
|
* Merge pull request #2349 from cuberite/mapsTiger Wang2015-07-1573-265/+683
|\ | | | | Improved maps
| * Improved mapsTiger Wang2015-07-1473-265/+683
| |
* | Merge pull request #2036 from cuberite/sign-metamirrorAlexander Harkness2015-07-151-2/+2
|\ \ | |/ |/| Should Fix sign flipping.
| * Fixed bad logic.Alexander Harkness2015-05-161-1/+1
| |
| * Should Fix sign flipping.Alexander Harkness2015-05-161-2/+2
| | | | | | Fixes #1118
* | Merge pull request #2352 from mmdk95/masterTiger Wang2015-07-141-0/+4
|\ \ | | | | | | Fix duping doors
| * | Fix duping doors (#1327)mmdk952015-07-141-0/+4
| | |
* | | Merge pull request #2346 from SamJBarney/TreeGrowthUpdateJulian Laubstein2015-07-141-7/+135
|\ \ \ | | | | | | | | Sapling Growth Update
| * | | Sapling Growth UpdateSamuel Barney2015-07-131-7/+135
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | * Growth has been slowed down * Saplings do not grow if they do not have enough space to grow * Saplings do not grow unless the light level is 9 or above * Dark Oak doesn't grow unless it is in a 2x2 Jungle Trees now will grow into a large tree when 2x2 saplings are used.
* / / Torches can now be placed on top of upside down stairs.Samuel Barney2015-07-141-0/+16
|/ /
* | Moved grabbing the light value to after the transparency check.Samuel Barney2015-07-031-3/+4
| |
* | Added missing parensSamuel Barney2015-07-031-1/+1
| |
* | Grass now only dies if it has an opaque block above it.Samuel Barney2015-07-031-4/+7
| | | | | | | | Grass only spreads to a dirt block if the light level is above 4 and the block above it is transparent.
* | Added neighbor specification in the OnNeighborChanged() block callback.Mattes D2015-07-015-44/+63
| | | | | | | | | | Fixes the OnNeighborChanged endless recursion with large melon / pumpkin fields. Fixes #2213.
* | Added a size check for portals.STRWarrior2015-06-282-0/+26
| | | | | | | | | | | | Made the portal size configurable Alpha-sorted SetXYZNetherPortalXYZ functions
* | Merge pull request #2282 from Haxi52/button-fixesworktycho2015-06-252-6/+26
|\ \ | | | | | | Button fixes
| * | Buttons no longer click on when already on. Buttons now play sound when clicking off.Hax522015-06-242-6/+26
| | |
* | | Rebased version of CodeSamuel Barney2015-06-227-54/+16
|/ /
* | Externalized cPrefabPiecePool self-test.Mattes D2015-06-191-0/+1
| |
* | implemented DoesIgnoreBuildCollision on BlockFire to allow blocks to be placed on topMartin McArthur2015-06-141-0/+5
| |
* | Fixed typo in BlockDoor.hLane Kolbly2015-06-131-1/+1
| |
* | Merge pull request #2144 from mc-server/comparatorsAlexander Harkness2015-06-091-0/+79
|\ \ | | | | | | Redstone improvements [SEE DESC]
| * | ComparatorsTiger Wang2015-06-061-0/+79
| | |
* | | Fixed warnings in MSVC.Mattes D2015-06-028-0/+42
|/ / | | | | | | It complained about undefined return values or using uninitialized variables.
* | Made -Weverything an error.tycho2015-05-244-6/+10
| |
* | 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
| | |
* | | Merge branch 'master' into PreventNewWarningstycho2015-05-232-3/+22
|\| |
| * | Merge pull request #2030 from beeduck/masterworktycho2015-05-211-3/+17
| |\ \ | | | | | | | | Issue #1868 and Issue #1984
| | * | Added open/close and sound effects for all door typesb33duck2015-05-211-3/+17
| | | |
| * | | Added missing fencetypes to torchhandlerJulian Laubstein2015-05-201-0/+5
| | | |
* | | | Make -Werror disabling file onlytycho2015-05-191-0/+1
| | | | | | | | | | | | | | | | Ad fix a load of warnings
* | | | Fixed compile and a few more warningstycho2015-05-197-13/+26
| | | |
* | | | Merge branch 'master' into PreventNewWarningstycho2015-05-191-8/+20
|\| | | | | | | | | | | | | | | | | | | Conflicts: src/Blocks/BlockLeaves.h
| * | | Improved leaves a bit more.Alexander Harkness2015-05-181-8/+20
| | | | | | | | | | | | | | | | Should fix #2058.
* | | | Fixed a lot of warningstycho2015-05-197-14/+23
|/ / /
* | / Fix sapling probability.Alexander Harkness2015-05-171-1/+1
| |/ |/| | | | | | | Probability is 5% of leaves drop a sapling. This should really be different for jungle leaves (2.5%) and the Fortune enchantment should increase the probability.
* | Bed uses bottom two bits for direction not threeworktycho2015-05-161-2/+2
|/
* More style checking.Mattes D2015-05-097-18/+18
| | | | Spaces around some operators are checked.
* Clay blocks are handled with the OreHandlerjammet2015-04-291-0/+1
|
* Digging up a clay block spawns 4 clay items.jammet2015-04-231-0/+5
| | | | | Fixes #1884. Closes #1891.
* Nether Quartz is handled in the Ore handler.jammet2015-04-231-0/+5
| | | | Fixes #1885, Closes #1888
* Merge pull request #1851 from wraith11/DoorFixMattes D2015-04-231-5/+20
|\ | | | | Fix door placing in connection with slabs
| * Fix door placing in connection with slabswraith112015-04-211-5/+20
| | | | | | | | Except top-half slabs as transparent blocks for doors.
* | Fixed PolishedGranite et al crafting recipes.Mattes D2015-04-161-1/+1
| | | | | | | | Fixes #1774. Ref.: #1859
* | Placing a fluid from bucket calls plugin hooks.Mattes D2015-04-141-0/+17
|/ | | | Ref.: #1857.
* Merge pull request #1799 from SnappingTurtles/BlockButtonMattes D2015-04-031-1/+5
|\ | | | | Buttons can be placed on the top and on the bottom face of a block
| * Removed 0x6, 0x7 from BlockButton.Alexandre Guertin2015-03-251-5/+3
| |
| * Buttons can be placed on the top and on the bottom face of a blockAlexandre Guertin2015-03-091-1/+7
| |
* | Merge pull request #1826 from mc-server/UnifyPacketizerMattes D2015-03-241-5/+7
|\ \ | | | | | | Unify packetizer
| * | Changed cEntity::m_UniqueID to UInt32.Mattes D2015-03-211-5/+7
| | |
* | | Merge pull request #1775 from tommysanterre/terrainheightfixMattes D2015-03-235-6/+6
|\ \ \ | | | | | | | | Correct all world height validations.
| * | | Correct world height validations.Tommy Santerre2015-03-205-6/+6
| |/ / | | | | | | | | | | | | 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
* | | Merge pull request #1822 from mc-server/ResettableLuaCallbackMattes D2015-03-201-3/+3
|\ \ \ | | | | | | | | Added cPluginLua::cResettable interface, used for scheduled tasks.
| * | | Added cPluginLua::cResettable interface, used for scheduled tasks.Mattes D2015-03-201-3/+3
| |/ / | | | | | | | | | | | | This allows plugins to register objects that can "survive" the plugin unloading - they will simply bail out if the plugin is already unloaded, instead of referencing bad plugin data. Fixes #1556.
* / / Removed Metavalue from Piston drops. Bugfix #1765bibo382015-03-202-0/+12
|/ /
* | Merge pull request #1811 from mc-server/grassworktycho2015-03-151-3/+3
|\ \ | | | | | | Fixed grass spread, closes #1743
| * | Fixed grass spread, closes #1743Tiger Wang2015-03-141-3/+3
| | | | | | | | | | | | | | | - Removed the salt parameter in cFastRandom functions, it wasn't doing what we thought it was following the move to C++11
* | | Merge pull request #1734 from mc-server/pistonsMattes D2015-03-142-22/+27
|\ \ \ | |/ / |/| | Handle client 'leave bed' request
| * | Reverted non-functional changesTiger Wang2015-03-052-10/+8
| | |
| * | Handle client 'leave bed' requestTiger Wang2015-02-083-25/+32
| | | | | | | | | | | | * Fixes #1728
* | | Merge branch 'master' into InventoryHowaner2015-03-092-1/+72
|\ \ \ | | |/ | |/|
| * | Grass checks for sufficient light before spreadingAlexander Harkness2015-03-051-1/+13
| | |
| * | Added experience drops when mining oresSTRWarrior2015-02-281-0/+59
| |/
* | Merge branch 'master' into InventoryHowaner2015-01-2513-422/+72
|\|
| * Fixed defect #43661 in Coverity list.Kirill Kirilenko2015-01-231-1/+2
| |
| * Fixed door placement.Mattes D2014-12-251-1/+2
| |
| * Refactored all player block placing to go through hooks.Mattes D2014-12-2412-421/+69
| | | | | | | | Fixes #1618.
* | Merge branch 'master' into InventoryHowaner2014-12-177-5/+104
|\|
| * Merge pull request #1581 from mc-server/redstoneMattes D2014-12-174-5/+5
| |\ | | | | | | Resplit redstone .inc file and provided improvements
| | * NULL -> nullptrTiger Wang2014-12-171-1/+1
| | |
| | * Merge branch 'master' into redstoneTiger Wang2014-12-134-19/+96
| | |\
| | * | Cleaned up simulatorsTiger Wang2014-10-251-0/+1
| | | |
| | * | Fixed some block checksTiger Wang2014-10-252-4/+3
| | | | | | | | | | | | | | | | * Fixes #1330
| * | | "& 0x0f" isn't neededHowaner2014-12-141-2/+2
| | | |
| * | | FixesHowaner2014-12-131-2/+2
| | | |
| * | | Merge branch 'master' into CocoaHowaner2014-12-133-19/+84
| |\ \ \ | | | |/ | | |/|
| * | | Added cocoa pod.Howaner2014-12-013-0/+99
| | | |
* | | | Own classes for all windows.Howaner2014-12-133-2/+3
| |/ / |/| |
* | | BasicStyle: Added missing braces to control statements.Mattes D2014-12-053-19/+84
|/ /
* | Merge branch 'master' into MobSpawnerHowaner2014-11-1824-149/+329
|\| | | | | | | | | Conflicts: MCServer/Plugins/Core
| * Signs can be placed on wallsigns.Alexander Harkness2014-10-231-1/+1
| | | | | | Fixes #1438
| * En masse NULL -> nullptr replaceTiger Wang2014-10-237-11/+11
| |
| * Moved tall grass pickups handle.Howaner2014-10-211-0/+37
| |
| * Merge branch 'master' into BlockFixesHowaner2014-10-219-16/+102
| |\
| | * Added mechanics placeable on halfslabsJulian Laubstein2014-10-194-10/+79
| | |
| | * Functions in cPluginManager get references instead of pointers.Mattes D2014-10-154-5/+22
| | |
| | * Fixed compilation.Alexander Harkness2014-10-111-1/+1
| | |
| * | Corrected drops from dead bush, tall grass and cobweb.Howaner2014-10-072-23/+24
| | |
| * | Corrected IsBlockAttachable() in BlockVine.hHowaner2014-10-071-5/+15
| |/
| * Removed BlockHaybale.h from CMakeLists.txtHowaner2014-10-071-1/+0
| |
| * Removed unused cBlockHayBaleHandler.Howaner2014-10-072-24/+1
| |
| * Merge pull request #1489 from mc-server/fixesMattes D2014-10-041-71/+53
| |\ | | | | | | Improved torch handler
| | * Comment suggestionsTiger Wang2014-10-031-2/+3
| | |
| | * Improved torch handlerTiger Wang2014-09-301-70/+51
| | |
| * | Added Daylight Sensors to the "can't push" listMasy982014-10-011-0/+2
| | |
| * | Added missing 1.8 blocks, E_METAs and soundsMasy982014-10-011-0/+2
| | |
| * | Code improvementsHowaner2014-09-303-3/+7
| | |
| * | Fixed 1.8 dirt typesHowaner2014-09-301-1/+9
| | |
| * | Fixed iron trapdoorsHowaner2014-09-301-0/+5
| | |
| * | Fixed 1.8 doors.Howaner2014-09-301-1/+14
| |/
| * IndentationJulian Laubstein2014-09-301-3/+3
| |
| * Set right indentationJulian Laubstein2014-09-301-3/+3
| |
| * actual solving of the halfslap+torch problemJulian Laubstein2014-09-301-1/+3
| |
| * Style fixes.madmaxoft2014-09-291-6/+8
| |
| * Fixed codestyle again.Alexander Harkness2014-09-291-1/+1
| |
| * BlockStone.h: fix the codestylew00tc0d32014-09-291-6/+5
| |
| * BlockStone: drop the right cobblestone on onBreak().netchip2014-09-291-3/+9
| | | | | | | | Signed-off-by: netchip <w00tc0d3@outlook.com>
| * Update BlockTorch.hJulian Laubstein2014-09-291-3/+3
| |
| * Added torches placeable on upside-down-halfslapsJulian Laubstein2014-09-291-1/+3
| |
| * Fixed minor style issues.madmaxoft2014-09-271-1/+1
| |
| * Added default value to switch and spruce gate to fence gate handlerMasy982014-09-272-0/+6
| |
| * Fixed convertToPickups for fence gatesMasy982014-09-271-1/+1
| |
| * Fixed convertToPickups for doorsMasy982014-09-271-1/+38
| |
* | Merge branch 'master' into MobSpawnerHowaner2014-09-2621-77/+327
|\| | | | | | | | | | | Conflicts: src/MobSpawner.h src/Mobs/Monster.h
| * Merge pull request #1415 from Masy98/blocksMattes D2014-09-264-1/+49
| |\ | | | | | | Added 1.8 Blocks and Items
| | * Merge branch 'master' into blocksMasy982014-09-2620-159/+410
| | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: src/Items/ItemHandler.cpp src/Simulator/IncrementalRedstoneSimulator.cpp
| | * | Added Sea Lantern dropsMasy982014-09-122-0/+32
| | | |
| | * | Added barrier blockMasy982014-09-111-0/+1
| | | |
| | * | Fixed incorrect handlersMasy982014-09-111-3/+3
| | | |
| | * | Added stone slab in BlockSlab.hMasy982014-09-101-1/+3
| | | |
| | * | Added new blocks to the BlockInfoMasy982014-09-101-0/+1
| | | |
| | * | Added new blocks to the BlockHandlerMasy982014-09-101-0/+12
| | | |
| * | | Removed more unessicary includesTycho2014-09-2614-16/+31
| | |/ | |/|
| * | Fixed styleTycho2014-09-252-0/+103
| | |
| * | Merge branch 'master' into redstoneTestsTycho2014-09-251-1/+1
| |\ \ | | | | | | | | | | | | | | | | Conflicts: src/Mobs/Monster.h
| * \ \ Merge branch 'master' into redstoneTestsTycho2014-09-1716-103/+167
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/Blocks/ChunkInterface.h
| * | | | Added first test to show the object can be createdTycho2014-09-177-60/+90
| | | | |
| * | | | Possibly decoupled IncrementalRedstoneSimulator from the rest of the serverTycho2014-09-111-0/+54
| | |_|/ | |/| | | | | | | | | | THis wil hopefully allow for unit testing
* | | | Implemented mob spawner.Howaner2014-09-191-0/+12
| |_|/ |/| |
* | | Fixed minor style issues.madmaxoft2014-09-171-1/+1
| |/ |/|
* | Improved cBlockHandler::DropBlockTiger Wang2014-09-133-44/+32
| |
* | Only drop flint or gravel, not both.Howaner2014-09-121-2/+4
| |
* | Fixed farmland issues.Howaner2014-09-127-57/+68
| |
* | Spawn exp if you break a mob spawner.Howaner2014-09-123-0/+45
| |
* | Fixed iron ore drop.Howaner2014-09-121-1/+2
| |
* | Added flint drop and fence gate meta reset.Howaner2014-09-122-0/+17
|/
* Merge pull request #1402 from Masy98/SoundsMattes D2014-09-1047-298/+0
|\ | | | | Moved sound-configs into BlockID.h and fixed/ added loads of sounds
| * Removed old sound-configuration for SignPostsMasy982014-09-091-6/+0
| |
| * Removed old sound-configuration for RepeatersMasy982014-09-091-6/+0
| |
| * Removed old sound-configuration for TrapdoorsMasy982014-09-091-5/+0
| |
| * Removed old sound-configuration for doorsMasy982014-09-092-10/+0
| |
| * Moved sound-configs into BlockID.h and fixed/ added loads of soundsMasy982014-09-0942-271/+0
| |
* | TimeOfDay does not need to be an Int64Tycho2014-09-081-2/+2
|/
* Merge remote-tracking branch 'Hircine/Enchantments'madmaxoft2014-09-012-13/+48
|\
| * Added a_Digger checkJaume Aloy2014-08-301-28/+31
| |
| * More EnchantmentsJaume Aloy2014-08-221-1/+0
| | | | | | | | - Added Thorns and Respiration enchantments
| * Protection Enchantments, some fixesJaume Aloy2014-08-211-7/+8
| | | | | | | | | | | | | | | | - Protection echantments (fire, blast, feather falling, protection and projectile). It isn't finished, add secondary effects and optimize the code. - Removed some brackets. - Silk touch fixed.
| * Changed if in BlockHandlerJaume Aloy2014-08-191-5/+2
| |
| * FixesJaume Aloy2014-08-191-35/+35
| | | | | | | | | | | | | | | | - 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
| * Changed if for switchJaume Aloy2014-08-192-12/+23
| |
| * Added more enchantments and some fixesJaume Aloy2014-08-192-16/+40
| | | | | | | | | | | | | | - Removed Debug messages - Added Punch enchantment effect - Added Silk Touch enchantment - Added Unbreaking enchantment effect
* | Check range of y in HasNearLogworktycho2014-08-311-1/+1
| | | | | | Fixes #803
* | Fixed conversion warning.Mattes D2014-08-291-1/+1
| |
* | Merge branch 'master' of https://github.com/mc-server/MCServerHownaer2014-08-282-6/+6
|\ \
| * \ Merge remote-tracking branch 'origin/master' into CraftingFixesMattes D2014-08-2826-157/+80
| |\ \
| * | | Fixed spaces after "template" keyword.Mattes D2014-08-282-6/+6
| | |/ | |/|
* | | Fixed anvil placing.Hownaer2014-08-281-5/+6
| |/ |/|
* | Merge branch 'master' into FireHowaner2014-08-2026-152/+80
|\ \
| * | Removed old classes from the CMakeLists.txtHowaner2014-08-201-2/+0
| | |
| * | Code formatting fixes.Howaner2014-08-1925-150/+80
| |/
* / Moved the clicked-through block check to the top of the function.Howaner2014-08-111-5/+0
|/
* Changed comment.Howaner2014-08-101-3/+1
|
* Added comment.Howaner2014-08-081-0/+3
|
* Send the old slab to the client when the interact cancelled.Howaner2014-08-081-0/+11
|
* Fixed signs not staying on other signsTiger Wang2014-08-042-2/+4
|
* Merge pull request #1269 from Howaner/BlockEntitysMattes D2014-08-012-0/+2
|\ | | | | Added beacon.
| * Added beacon.Howaner2014-07-302-0/+2
| |
* | Changed IsSolid to FullyOccupiesVoxelHowaner2014-07-311-1/+1
| |
* | Fixed water from ice and removed packed ice drop.Howaner2014-07-311-2/+12
|/
* Merge branch 'master' into portalsTiger Wang2014-07-297-67/+48
|\ | | | | | | | | Conflicts: src/World.h
| * Merge branch 'master' into Inventory2Howaner2014-07-265-50/+39
| |\ | | | | | | | | | | | | Conflicts: src/BlockInfo.cpp
| | * Merge remote-tracking branch 'origin/master'Tiger Wang2014-07-241-4/+4
| | |\
| | | * Removed redundant semicolons and re-added warningarchshift2014-07-241-4/+4
| | | |
| | * | Fixed block dropsTiger Wang2014-07-243-12/+16
| | |/ | | | | | | | | | * Fixes #1242 (the issue addressed within)
| | * BlockLeaves: Fixed comment style.madmaxoft2014-07-231-2/+2
| | |
| | * Fix misguided comment on bits...Tiger Wang2014-07-221-1/+1
| | | | | | | | | | | | ...obviously written by someone very confused, also known as me
| | * Merge remote-tracking branch 'origin/master' into saplingsandleavesTiger Wang2014-07-226-11/+12
| | |\ | | | | | | | | | | | | | | | | Conflicts: src/Defines.h
| | * \ Merge branch 'master' into saplingsandleavesTiger Wang2014-07-2048-175/+352
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Bindings/DeprecatedBindings.cpp src/Blocks/BlockSapling.h
| | * | | Proper comment for DropBlock()Tiger Wang2014-07-201-2/+5
| | | | |
| | * | | Fixed issues relating to saplings and leavesTiger Wang2014-07-175-47/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed cBlockInfo::RequiresSpecialTool * Fixes #1195 * Fixes #1201
| * | | | Fix item durability.Howaner2014-07-233-17/+9
| | |_|/ | |/| | | | | | Fixes #1181
* | | | Suggestion and failed merge fixTiger Wang2014-07-221-1/+1
| | | |
* | | | Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-07-2213-54/+232
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Player.cpp src/Root.cpp src/World.cpp
| * | | Style: Normalized to no spaces before closing parenthesis.madmaxoft2014-07-216-10/+10
| | | |
| * | | Style: Normalized spaces after if, for and while.madmaxoft2014-07-211-3/+4
| | |/ | |/|
| * | Fixed style: spaces after commas.madmaxoft2014-07-196-7/+7
| | |
| * | Blocks/CMakeLists.txt: Fixed header list after merge of masterarchshift2014-07-191-1/+2
| | |
| * | Subdirs: Only add_library if not using MSVCarchshift2014-07-191-1/+3
| | |
| * | Blocks/CMakeLists.txt: Replaced glob with list of filesarchshift2014-07-191-5/+92
| | |
| * | Normalized code style for both sign handlers.madmaxoft2014-07-182-16/+20
| | |
| * | Removed cBlockSignPostHandler descend.Howaner2014-07-181-2/+28
| | |
| * | Added a extra wall sign handler.Howaner2014-07-183-24/+81
| | | | | | | | | Fixes #1119
* | | Merge branch 'master' into portalsTiger Wang2014-07-1852-214/+354
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Blocks/WorldInterface.h src/ClientHandle.cpp src/ClientHandle.h src/Entities/Player.cpp src/Entities/Player.h src/Generating/FinishGen.cpp src/Protocol/Protocol.h src/Protocol/Protocol125.cpp src/Protocol/Protocol125.h src/Protocol/Protocol16x.cpp src/Protocol/Protocol16x.h src/Protocol/Protocol17x.cpp src/Protocol/Protocol17x.h src/Protocol/ProtocolRecognizer.cpp src/Protocol/ProtocolRecognizer.h src/Root.h src/World.cpp
| * | Fixed tabs used for alignment.madmaxoft2014-07-171-2/+2
| | |
| * | More trailing whitespace fixes.madmaxoft2014-07-171-3/+3
| | |
| * | Basic style fixes.madmaxoft2014-07-1739-73/+73
| | |
| * | Merge branch 'master' of https://github.com/mc-server/MCServermadmaxoft2014-07-171-1/+1
| |\ \
| | * | Fix sapling drop.Howaner2014-07-171-1/+1
| | |/
| * / Normalized comments.madmaxoft2014-07-1720-55/+55
| |/ | | | | | | | | 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.
| * Merge pull request #1189 from Masy98/BlocksMattes D2014-07-151-1/+0
| |\ | | | | | | Added various missing blocks in the lists in BlockInfo.cpp
| | * Added various missing blocks in the lists in BlockInfo.cppMasy982014-07-151-1/+0
| | |
| * | Fixed code formatting.madmaxoft2014-07-152-6/+9
| | |
| * | Merge remote-tracking branch 'origin/ClearMetaMixin'madmaxoft2014-07-154-12/+34
| |\ \
| | * | Added super typedefTycho2014-07-153-3/+6
| | | |
| | * | COnverted Lilypad back to mixinTycho2014-07-151-8/+2
| | | |
| | * | Revert "Converted some blockhandlers to use cClearMetaOnDrop"Tycho2014-07-159-21/+67
| | | | | | | | | | | | | | | | This reverts commit 333f4f982cbd24ffcb376594eddef439b3f05e9e.
| | * | Added documentationTycho2014-07-141-0/+6
| | | |
| | * | Converted some blockhandlers to use cClearMetaOnDropTycho2014-07-149-67/+21
| | | |
| | * | Simplified ClearMetaOnDropTycho2014-07-141-1/+1
| | | |
| | * | Added cClearOnDrop Mixin to cPumpkinTycho2014-07-141-2/+2
| | | |
| | * | Added first implementation of cClearMetaOnDropTycho2014-07-142-2/+21
| | | |
| * | | Fixed some meta resetting bugsTiger Wang2014-07-146-27/+28
| |/ / | | | | | | | | | | | | * Fixes #1174 * Fixes #1171
| * / Changed BroadcastSoundEffect function to take floating pos.Howaner2014-07-134-5/+5
| |/
| * Suggestions and bug fixTiger Wang2014-07-121-7/+5
| | | | | | | | | | | | * Fixed hoppers pushing/pulling to/from (trapped)chests that do not form a double-chest with the chest type directly connected to said hopper; thank you, @madmaxoft
| * SuggestionsTiger Wang2014-07-112-2/+3
| |
| * SuggestionsTiger Wang2014-07-111-5/+6
| |
| * Implemented trapped chests & othersTiger Wang2014-07-074-38/+27
| | | | | | | | | | | | | | + Added trapped chests * Fixed a bunch of bugs in the redstone simulator concerning wires and repeaters * Other potential bugfixes
| * Redstone simulator is alerted to lever unpoweringTiger Wang2014-07-023-0/+5
| | | | | | | | | | * Fixed the "fix" that broke the fix for #535, thereby fixing said issue * Fixed #535
| * Implemented tripwire(s) (hooks)Tiger Wang2014-06-284-2/+118
| | | | | | | | * Fixes #944
| * Added more block exceptions to torchesTiger Wang2014-06-281-0/+4
| |
| * Minor change to buttons and leversTiger Wang2014-06-282-3/+3
| | | | | | | | | | + They now detect if the block they are on occupies its voxel, instead of just being solid
* | Merge branch 'master' of https://github.com/mc-server/MCServer into portalsTiger Wang2014-06-246-19/+110
|\|
| * Added a (disabled) block meta mirror / rotate test code.madmaxoft2014-06-231-2/+87
| | | | | | | | This will perform basic sanity checks on block metadata mirroring and rotating. cMetaRotator must disable its asserts in order for this to work.
| * Fixed the slab vertical mirroring.madmaxoft2014-06-231-9/+6
| |
| * Fixed sign and lever rotations.madmaxoft2014-06-232-8/+9
| |
| * Merge pull request #1105 from Howaner/BlocksMattes D2014-06-222-0/+8
| |\ | | | | | | Added door and fence gate sounds.
| | * Add fence gate sound.Howaner2014-06-171-0/+1
| | |
| | * Add UNUSED() TagsHowaner2014-06-171-0/+6
| | |
| | * Add door soundHowaner2014-06-171-0/+1
| | |
* | | Merge branch 'master' into portalsTiger Wang2014-06-218-35/+171
|\| | | | | | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Entity.h src/Entities/Player.h
| * | Merge pull request #1045 from Howaner/GlobalFixesMattes D2014-06-185-32/+121
| |\ \ | | | | | | | | Little fixes
| | * | Merge branch 'master' into GlobalFixesHowaner2014-06-179-43/+430
| | |\|
| | * | Check block type from cBlockEntityHowaner2014-06-171-8/+8
| | | |
| | * | Add DoWithBlockEntityAt() to WorldInterface.hHowaner2014-06-172-37/+61
| | | |
| | * | Code improvementsHowaner2014-05-281-6/+2
| | | |
| | * | Fix hay place sound.Howaner2014-05-282-1/+31
| | | |
| | * | Fix fire break.Howaner2014-05-281-2/+2
| | | |
| | * | Fix skull bugs.Howaner2014-05-281-2/+41
| | | |
| * | | Merge pull request #1100 from Howaner/Slabsarchshift2014-06-181-0/+1
| |\ \ \ | | |_|/ | |/| |
| | * | Fix doubleslab meta.Howaner2014-06-161-0/+1
| | | |
| * | | Merge pull request #1099 from Howaner/BlocksMattes D2014-06-171-0/+3
| |\ \ \ | | | | | | | | | | Glass-made blocks don't drop pickups.
| | * | | Glass shouldn't drop.Howaner2014-06-161-0/+3
| | |/ /
| * | | Add parenthesisHowaner2014-06-171-2/+2
| | | |
| * | | Add end lines to BlockPressurePlate.hHowaner2014-06-171-1/+5
| | | |
| * | | Add pressure plate handlerHowaner2014-06-172-0/+39
| |/ /
| * | Fix a few warningsTycho2014-06-161-3/+3
| | |
* | | Cauldrons check the heightmapTiger Wang2014-06-142-5/+9
| | |
* | | Merge branch 'master' into portalsTiger Wang2014-06-102-32/+74
|\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/Entities/Player.cpp src/Entities/Player.h src/Protocol/Protocol125.cpp src/Protocol/Protocol17x.cpp
| * | Added Y coord checks and documentation to cBlockDoorHandler.madmaxoft2014-06-091-19/+40
| | |
| * | Merge remote-tracking branch 'howaner/Redstone'madmaxoft2014-06-092-31/+52
| |\ \
| | * | Moved the IsDoor check before the meta get.Howaner2014-05-311-2/+1
| | | |
| | * | Add doxy-commentHowaner2014-05-311-3/+4
| | | |
| | * | Better SetOpen() and IsOpen() function from the doors.Howaner2014-05-302-77/+27
| | | |
| | * | Add SetOpen() and IsOpen() to BlockDoor.h and fix door redstone bug.Howaner2014-05-291-9/+80
| | |/
* | | SuggestionsTiger Wang2014-06-051-1/+3
| | |
* | | Added checks for no downfall biomesTiger Wang2014-06-041-1/+1
| | |
* | | Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-06-045-11/+310
|\| |
| * | Suggestions twoTiger Wang2014-06-011-3/+3
| | |
| * | SuggestionsTiger Wang2014-05-291-1/+6
| | |
| * | Changed block send queue to use vectorsTiger Wang2014-05-291-6/+17
| | | | | | | | | | | | As suggested by @worktycho.
| * | Hopefully fixed piston duplication issuesTiger Wang2014-05-255-11/+294
| |/ | | | | | | | | * Fixes #879 * Fixes #714
* | Implemented bed homesTiger Wang2014-06-011-0/+2
| | | | | | | | | | | | + Implemented bed home positions * Fixed some inventory and health server/client mismatches after world change
* | Very minor code changesTiger Wang2014-05-292-2/+2
| |
* | Cauldrons fillTiger Wang2014-05-292-0/+17
|/
* Fixed cWither::KilledByandrew2014-05-211-0/+1
|
* Cleaned up cPlayer::UpdateMovementStats; Wither achievementsandrew2014-05-201-0/+27
|
* Fixed compile problem.STRWarrior2014-05-101-1/+1
|
* A portal block now chooses a number between 2000 and 0STRWarrior2014-05-101-1/+1
|
* Each time a portal block receives a tick it has a 1 in 500 chance of spawning a zombie pigman.STRWarrior2014-05-101-0/+14
|
* Fixed MSVC 64-bit build warnings.Mattes D2014-05-093-6/+6
|
* Superfluous method override.Howaner2014-05-071-6/+0
|
* Add lava and water check to block handlers.Howaner2014-05-072-2/+14
|
* Rename CanChangeDirtToGrass to CanDirtGrowGrassHowaner2014-05-076-9/+9
|
* Merge branch 'master' into SlabsHowaner2014-05-078-11/+59
|\
| * Add clicks, exp subtraction, item check, ...Howaner2014-05-051-1/+1
| |
| * Add anvil window and slot area.Howaner2014-05-051-0/+7
| |
| * Fixed portal Z direction loop coding failureTiger Wang2014-05-041-10/+9
| | | | | | | | | | * Fixed portals created in the ZP/ZM direction eating its frame * Changed return type of a function
| * Missed these CMakeLists.archshift2014-04-251-0/+1
| |
| * The new leaves don't decay anymore.STRWarrior2014-04-231-0/+1
| | | | | | | | Fixes #792
| * Merge pull request #909 from jfhumann/fixesMattes D2014-04-222-1/+2
| |\ | | | | | | | | | | | | Bug fixes and optimizations. We need to visit the API functions and check that they return only those values expected. `cWorld::CreateProjectile()` seems affected, too, by the same issue of ToLua returning extra values. In the cleanest form, these functions will need moving to ManualBindings.cpp
| | * Did some static analysis, fixed some bugs and optimized a lot of codejfhumann2014-04-182-1/+2
| | |
| * | Fixed Errorsdaniel09162014-04-071-1/+1
| | |
| * | Merge remote-tracking branch 'upstream/master' into Enchantingdaniel09162014-04-0768-889/+2086
| |\|
| * | first changes for enchanting (not finished)daniel09162014-01-202-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | - added enchanting table block handler and added it to the blockhandler - added enchanting window - drop item in the slot 0 when the player close the window - added enchanting packet (1.7 only) - some more...
* | | Remove old importHowaner2014-04-062-3/+2
| | |
* | | Merge branch 'master' into SlabsHowaner2014-04-064-7/+154
|\ \ \ | | |/ | |/|
| * | Merge pull request #840 from Howaner/NewBlocksMattes D2014-04-043-5/+152
| |\ \ | | | | | | | | Add tall flower handler.
| | * | Change CanBeAt() from big flowerHowaner2014-04-031-5/+1
| | | |
| | * | Add "a_RelY < cChunkDef::Height" to BlockBigFlowerHowaner2014-03-291-0/+1
| | | |
| | * | Add tallgrass drop to big flowers.Howaner2014-03-282-8/+59
| | | | | | | | | | | | Add tallgrass drop, when a players break a tallgrass with the shear.
| | * | door -> flowerHowaner2014-03-281-1/+1
| | | |
| | * | Add tall flower handler.Howaner2014-03-282-0/+99
| | | |
| * | | Fixed Clang warnings in itemhandlers.madmaxoft2014-04-041-2/+2
| | | |
* | | | Add CanChangeDirtToGrass function to Block Handlers.Howaner2014-04-066-3/+33
| | | |
* | | | Merge branch 'master' into SlabsHowaner2014-04-0351-444/+1111
|\| | | | | | | | | | | | | | | | | | | Conflicts: src/Blocks/BlockDirt.h
| * | | Merge pull request #849 from mc-server/minorfixesMattes D2014-04-022-33/+12
| |\ \ \ | | | | | | | | | | Minor fixes
| | * | | With eXtra line!Tiger Wang2014-04-021-0/+1
| | | | |
| | * | | Removed extra bracketsTiger Wang2014-04-021-5/+2
| | | | |
| | * | | Realised suggestionsTiger Wang2014-03-311-1/+4
| | | | |
| | * | | Simplified and fixed slabs, fixes #835Tiger Wang2014-03-311-33/+10
| | | | |
| | * | | Fixed a few Y too high/low assertsTiger Wang2014-03-311-2/+3
| | | | |
| * | | | Merge pull request #831 from mc-server/WitherMattes D2014-04-021-3/+105
| |\ \ \ \ | | | | | | | | | | | | Wither
| | * | | | Fixed clang compilationandrew2014-03-251-13/+16
| | | | | |
| | * | | | Fixed wither summoningandrew2014-03-251-1/+24
| | | | | |
| | * | | | Protocol: Wither metadataandrew2014-03-251-3/+79
| | | | | |
| * | | | | Fixed clang warnings in BlockHandlers.madmaxoft2014-04-014-5/+6
| | | | | |
| * | | | | Simplified the anvil placement code.madmaxoft2014-04-011-11/+9
| | | | | |
| * | | | | Fixed a few Clang warnings in BlockHandlers.madmaxoft2014-03-3011-48/+54
| | |/ / / | |/| | |
| * | | | Fixed a few clang warnings.madmaxoft2014-03-301-0/+6
| | | | |
| * | | | Merge pull request #834 from narroo/issue503Mattes D2014-03-3023-121/+372
| |\ \ \ \ | | | | | | | | | | | | Issue503 pull Request
| | * | | | Added in MetaMirrorXY and MetaMirrorYZ to cBlockSignHandler.narroo2014-03-291-0/+19
| | | | | |
| | * | | | Altered the rotates for cBlockSignHandler. The functions as a whole is still unfinished though; no wall sign or mirroring support yet.narroo2014-03-261-2/+2
| | | | | |
| | * | | | Fixed Minor typos.narroo2014-03-263-9/+12
| | | | | |
| | * | | | Added a comment about the behavior of doors under mirros. Simply put, the current implementation of MetaMirror causes glitchy behavior. The door class itself needs to be edited. (I've got an idea on that....)narroo2014-03-251-2/+8
| | | | | |
| | * | | | Fixed spelling; Rotater to Rotator.narroo2014-03-2515-46/+46
| | | | | |
| | * | | | Changed Rotater to Rotator. Added partial sign post rotation support.narroo2014-03-252-0/+12
| | | | | |
| | * | | | Added MetaRotate/Mirror Support for a number of classes.narroo2014-03-2412-84/+295
| | | | | |
| * | | | | Merge pull request #838 from mc-server/lilypadsworktycho2014-03-302-0/+30
| |\ \ \ \ \ | | | | | | | | | | | | | | Lilypads
| | * | | | | Some fixes to lilypadsTiger Wang2014-03-281-61/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-232-0/+86
| | | | | | |
| * | | | | | Fixed non-virtual destructors warnings.madmaxoft2014-03-282-2/+4
| | |_|_|/ / | |/| | | |
| * | | | | Change SpreadSource prefix to ssHowaner2014-03-272-2/+2
| | | | | |
| * | | | | Wrong if in BlockLeavesHowaner2014-03-271-1/+1
| | | | | |
| * | | | | Add SpreadSourceHowaner2014-03-274-2/+13
| | | | | |
| * | | | | Add new leaves to all classes.Howaner2014-03-271-1/+1
| | | | | |
| * | | | | Merge pull request #828 from mc-server/WitherMattes D2014-03-251-0/+14
| |\ \ \ \ \ | | | |_|/ / | | |/| | | Wither invulnerability
| | * | | | Wither invulnerabilityandrew2014-03-241-0/+14
| | |/ / /
| * | | | Merge pull request #829 from Howaner/CakeMattes D2014-03-241-1/+7
| |\ \ \ \ | | |/ / / | |/| | | Add log pickups.
| | * | | Add log pickups.Howaner2014-03-241-1/+7
| | | | |
| * | | | Merge pull request #782 from mc-server/bedsMattes D2014-03-163-10/+76
| |\ \ \ \ | | | | | | | | | | | | Beds now work properly, fixes #707
| | * | | | Fixed VERIFYTiger Wang2014-03-091-1/+1
| | | | | |
| | * | | | Beds now work properly fixes #707Tiger Wang2014-03-093-10/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixes FS392 Conflicts: src/Blocks/WorldInterface.h src/ClientHandle.cpp
| * | | | | Merge pull request #809 from Howaner/BlockEntitysMattes D2014-03-162-0/+65
| |\ \ \ \ \ | | | | | | | | | | | | | | More entity saving.
| | * | | | | Fix anvil pickups.Howaner2014-03-161-1/+1
| | | | | | |
| | * | | | | Add anvil direction.Howaner2014-03-162-0/+65
| | | |_|/ / | | |/| | |
| * | | | | Wrong if in BlockLeavesHowaner2014-03-161-1/+1
| | | | | |
| * | | | | Add new leaves to all classes.Howaner2014-03-163-2/+4
| | |_|/ / | |/| | |
| * | | | Change if-clause in BlockCake.hHowaner2014-03-161-1/+1
| | | | |
| * | | | Add cakeHowaner2014-03-162-0/+57
| |/ / /
| * / / Silenced useless MSVC warnings in cMetaRotater.madmaxoft2014-03-091-0/+21
| |/ /
| * | Merge pull request #775 from worktycho/warningsMattes D2014-03-093-3/+23
| |\ \ | | | | | | | | Fixed a few warnings
| | * | Fixed issues with int vs size_t and a few other warningsTycho2014-03-081-0/+2
| | | |
| | * | Merge branch 'master' into warningsTycho2014-03-081-0/+1
| | |\ \
| | * | | Fixed warningsTycho2014-03-072-3/+21
| | | | |
| * | | | Merge pull request #729 from worktycho/MetaRotateMattes D2014-03-0813-151/+202
| |\ \ \ \ | | |_|/ / | |/| | | Alternitive solution to #503
| | * | | Moved returnsworktycho2014-03-081-3/+3
| | | | |
| | * | | ReformattedTycho2014-03-0210-20/+20
| | | | |
| | * | | Reformated MetaRotaterTycho2014-03-021-19/+30
| | | | |
| | * | | Reverted BlockVineworktycho2014-03-021-3/+27
| | | | |
| | * | | Fixed errorsTycho2014-03-012-2/+2
| | | | |
| | * | | Revesed typedefTycho2014-03-011-1/+1
| | | | |
| | * | | Implemented RotationsTycho2014-03-0111-170/+28
| | | | |
| | * | | Merge branch 'master' into MetaRotateTycho2014-03-011-9/+22
| | |\ \ \
| | * | | | Final implementation of MetaRotaterTycho2014-03-011-45/+51
| | | | | |
| | * | | | Added some Metadate rotaters using templated MixinTycho2014-02-2710-16/+168
| | | | | |
| * | | | | cBlockInfo-related changes from #723andrew2014-03-081-0/+1
| | |_|/ / | |/| | |
| * | | | Merge pull request #763 from Howaner/BlockEntitysMattes D2014-03-072-82/+6
| |\ \ \ \ | | | | | | | | | | | | Add Flower Pots
| | * | | | Add Lua Bindings for FlowerPotEntity.h and add documentation.Howaner2014-03-071-2/+3
| | | | | |
| | * | | | Add Flower PotsHowaner2014-03-071-80/+3
| | | | | |
| * | | | | Fix commentHowaner2014-03-061-1/+1
| | | | | |
| * | | | | Add SendBlockTo to cWorldInterfaceHowaner2014-03-058-9/+17
| | | | | |
| * | | | | Set tnt step sound to step.grassHowaner2014-03-051-1/+1
| | | | | |
| * | | | | Add data backsending, when the Client interacts a Block and the Interact is cancelled.Howaner2014-03-059-2/+92
| |/ / / /
| * | | | Merge pull request #746 from Howaner/SlabsMattes D2014-03-031-1/+3
| |\ \ \ \ | | | | | | | | | | | | Add Trapdoor Functions to cWorld and fix Trapdoor Redstone Bugs
| * | | | | cBlockInfo now manages the respective cBlockHandlerandrew2014-03-023-63/+6
| | | | | |
| * | | | | Merge pull request #738 from xdot/masterMattes D2014-03-0211-15/+15
| |\ \ \ \ \ | | | | | | | | | | | | | | Refactored global block property arrays
| | * | | | | g_BlockXXX => cBlockInfo::XXXandrew2014-03-0111-15/+15
| | | |_|/ / | | |/| | |
| * | | | | Merge pull request #733 from Howaner/SlabsMattes D2014-03-021-12/+21
| |\ \ \ \ \ | | |/ / / / | |/| | | | Fix Double Slabs, fix Slab Meta and add more things to burnable
| * | | | | Forgotten changes to cChunkInterface.madmaxoft2014-03-011-2/+2
| | | | | |
| * | | | | Removed cBlockHandler forward declaration from cChunkInterface.madmaxoft2014-03-011-9/+22
| | |_|/ / | |/| | | | | | | | | | | | | Wasn't needed. Also reformatted the code.
* | | | | Remove old functionHowaner2014-04-031-6/+0
| | | | |
* | | | | Grass now grows under up-side-down slabsHowaner2014-04-031-3/+12
| |_|/ / |/| | |
* | | | Add Trapdoor Functions to cWorld and fix Trapdoor Redstone BugsHowaner2014-03-021-1/+3
| |/ / |/| |
* | | Use switch in GetStepSoundHowaner2014-02-281-7/+5
| | |
* | | Fix Double Slabs, fix Slab Meta and add more things to burnableHowaner2014-02-281-12/+23
|/ /
* | Merge pull request #704 from Howaner/GlobalFixesMattes D2014-02-201-9/+15
|\ \ | | | | | | Global fixes
| * | Fix CauldronHowaner2014-02-201-8/+11
| | |
| * | Add 'Meta < 3' to CauldronHowaner2014-02-201-5/+8
| | |
* | | Merge pull request #702 from TheJumper/masterMattes D2014-02-201-7/+18
|\ \ \ | |/ / |/| | BlockBed.cpp: Fixed Multiple people in one bed.
| * | BlockBed.cpp: Fixed space at if statementTheJumper2014-02-201-1/+1
| | | | | | | | | Added a space after an if statement and before the first bracket to keep up code conventions.
| * | BlockBed.cpp: Fixed Multiple people in one bed.TheJumper2014-02-201-7/+18
| | | | | | | | | OnUse in BlockBed.cpp now checks whether bit flag 0x4 in the Data values of the bed is set before somebody can try to sleep in the bed.
* | | Merge pull request #700 from Howaner/GlobalFixesMattes D2014-02-203-0/+48
|\ \ \ | |/ / |/| | Add new Trees (without Generator)
| * | Add BlockNewLeaves.h and rename Darkoac to DarkoakHowaner2014-02-191-0/+42
| | |
| * | Add new Trees (without Generator)Howaner2014-02-192-0/+6
| | |
* | | Rename SkullEntity to MobHeadEntityHowaner2014-02-192-10/+10
| | |
* | | Add Heads completelyHowaner2014-02-182-0/+71
|/ /
* | Fixed compile and some warnings in MSVSTiger Wang2014-02-093-3/+3
| |
* | Merge branch 'master' into playerimprovementsTiger Wang2014-02-0935-93/+167
|\ \ | | | | | | | | | | | | Conflicts: MCServer/Plugins/APIDump/APIDesc.lua
| * \ Merge pull request #644 from worktycho/warningfixesMattes D2014-02-0435-89/+91
| |\ \ | | | | | | | | Improved Type safety of eBlockFace
| | * | Fix gcc not having operator ++ on enumsTycho2014-02-041-6/+7
| | | |
| | * | Improved Type safety of eBlockFaceTycho2014-02-0435-85/+86
| | | | | | | | | | | | | | | | May Fix #640
| * | | Fixed chest placement.madmaxoft2014-02-041-2/+4
| |/ / | | | | | | | | | Fixes #624.
| * | Named the different quartz block.STRWarrior2014-02-031-1/+1
| | |
| * | Fixed some issues.STRWarrior2014-02-031-1/+2
| | | | | | | | | | | | | | | Meta wasn't set if the block wasn't a pillar. Fixed typo.
| * | Renamed cBlockQuartsHandler to cBlockQuartzHandler. Fixed not being able to place normal quartz blocks.STRWarrior2014-02-032-4/+4
| | |
| * | This renames the cBlockWoodHandler to cBlockSidewaysHandler, and implements a new cBlockQuartzHandler to handle the quartz pillars.STRWarrior2014-02-033-5/+74
| | |
* | | Server internally uses new functionsTiger Wang2014-02-061-1/+1
| | |
* | | Fixed a bunch of MSVS warningsTiger Wang2014-02-053-4/+4
| | | | | | | | | | | | | | | * Possibly also fixed some bugs with pathfinding and TNT, though unlikely
* | | Fixed issues with farmlandTiger Wang2014-02-032-1/+3
|/ / | | | | | | | | | | * Fixed farmland reversion checks not taking into account carrots and potatoes * Fixed #623
* | Merge branch 'master' of https://github.com/mc-server/MCServerTiger Wang2014-02-0258-372/+515
|\ \
| * | Fixed dark oak and acacia placement.madmaxoft2014-02-021-0/+1
| | | | | | | | | | | | Fixes #621.
| * | Added missing filesTycho2014-02-022-0/+20
| | |
| * | Merge branch 'master' into GeneratingBenchmark2Tycho2014-02-021-1/+2
| |\ \ | | | | | | | | | | | | | | | | Conflicts: src/Blocks/BlockTorch.h
| * | | Changed Signiture of OnUpdateTycho2014-02-0213-26/+27
| | | |
| * | | Changed Signiture of OnDiggingTycho2014-02-013-4/+4
| | | |
| * | | Changed Signiture of OnDestroyedByPlayerTycho2014-02-0111-13/+23
| | | |
| * | | Changed pointers to referencesTycho2014-02-0151-230/+230
| | | |
| * | | Changed signitures of Several BLockHandler MethodsTycho2014-02-0149-185/+194
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the signitures of the following to use interfaces: GetPlacementBlockTypeMeta OnPlaced OnPlacedByPlayer OnDestroyed OnNeighbourChanged NeighbourChanged OnUse CanBeAt Check
| * | | Removed cWorld IncludeTycho2014-01-263-3/+0
| | | |
| * | | Refactored GetPlacementBlockTypeMetaTycho2014-01-265-8/+6
| | | |
| * | | Merge branch 'master' into GeneratingBenchmark2Tycho2014-01-261-9/+19
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Blocks/BlockRail.h src/World.h
| * | | | Refactored cBlockHandler::OnUse and dependentsTycho2014-01-2615-142/+208
| | | | |
| * | | | First attempt at Implementing InterfacesTycho2014-01-2517-33/+74
| | |_|/ | |/| |
* | | | Fixed #624Tiger Wang2014-02-021-0/+6
| |_|/ |/| |
* | | Fixed #620Tiger Wang2014-02-021-1/+2
| |/ |/|
* | Merge pull request #589 from mc-server/minecartimprovementsMattes D2014-01-261-9/+19
|\ \ | |/ |/| Minecart improvements
| * Fixed weird meta with curved railsTiger Wang2014-01-191-5/+15
| |
| * Added more rail functionalityTiger Wang2014-01-191-4/+4
| |
* | Improved command blocksTiger Wang2014-01-192-0/+34
|/ | | | | | | * Their command and previous output are displayed on the client * They have a BlockHandler implementation, so you can't place blocks on them anymore + As a side effect, implemented UpdateBlockEntity
* Removed internal cEntity::GetRot() usage.madmaxoft2014-01-1711-16/+16
|
* Fixed #535Tiger Wang2014-01-161-1/+1
|
* Removed obsoleted functionsTiger Wang2014-01-1611-13/+13
|
* Merge pull request #529 from mc-server/derpstonerefactorAlexander Harkness2014-01-122-4/+4
|\ | | | | Major refactoring of redstone
| * Renamed g_TorchPlaceable...Tiger Wang2014-01-112-4/+4
| | | | | | | | ...to g_FullyOccupiesVoxel, as recommended by @bearbin
* | Fixed glowstone drop countandrew2014-01-111-2/+2
|/
* converted commneted paramater names to the unused macroTycho Bickerstaff2013-12-221-1/+5
|
* Merge branch 'master' of github.com:mc-server/MCServerTycho Bickerstaff2013-12-223-1/+99
|\
| * Merge pull request #461 from mc-server/repeatersMattes D2013-12-261-0/+34
| |\ | | | | | | Repeaters, pressure plates, and others
| | * Fixed rails not updating with diagonalsTiger Wang2013-12-251-0/+34
| | |
| * | Merge branch 'fixes&features' of git://github.com/tonibm19/MCServermadmaxoft2013-12-251-9/+58
| |\ \
| | * | (Hopefully) fixed if conditionstonibm192013-12-251-4/+1
| | | |
| | * | Implemented xoft suggestion (partly)tonibm192013-12-251-25/+29
| | | | | | | | | | | | I only get it working in first condition. It seems it's not compatible with else if...
| | * | BLOCKTYPE...tonibm192013-12-241-2/+2
| | | |
| | * | Fixed compilationtonibm192013-12-241-29/+9
| | | |
| | * | Implemented xoft suggestiontonibm192013-12-241-7/+11
| | | |
| | * | Using BLOCKTYPE instead of inttonibm192013-12-241-2/+2
| | | |
| | * | Fixed commentstonibm192013-12-241-8/+8
| | | |
| | * | Changed a little how detection works and added comments.tonibm192013-12-241-28/+31
| | | |
| | * | Storing Y -1 and -2 blocks in a variabletonibm192013-12-241-5/+7
| | | |
| | * | Using parenthesistonibm192013-12-241-8/+8
| | | |
| | * | Fixed a possible crashtonibm192013-12-241-39/+42
| | | |
| | * | Improved iron golem detection algorithmtonibm192013-12-231-3/+16
| | | | | | | | | | | | | | | | - You need to make it like in vanilla - Only used blocks are removed
| | * | You can now spawn iron golems.tonibm192013-12-231-3/+20
| |/ / | | | | | | You can spawn them like in vanilla.
| * | You can spawn snow golems with snow blocks and pumpkins.STRWarrior2013-12-221-0/+15
| | |
| * | Fixed cacus breaking when next to any non-air block.STRWarrior2013-12-221-1/+1
| | |
* | | Piston is now warnings cleanTycho Bickerstaff2013-12-211-1/+1
|/ /
* | Merge branch 'master' into cmakeTycho Bickerstaff2013-12-206-10/+10
|\|
| * Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT).madmaxoft2013-12-204-5/+5
| |
| * Fixed melon and pumpkin growing.madmaxoft2013-12-201-1/+1
| |
| * Fixed missing parenthesis.madmaxoft2013-12-201-4/+4
| |
* | Merge branch 'master' into cmakeTycho Bickerstaff2013-12-191-1/+1
|\|
| * Fixed assertion during dirt block OnUpdate()Tiger Wang2013-12-201-1/+1
| |
* | Merge branch 'master' into cmakeTycho Bickerstaff2013-12-191-1/+1
|\|
| * Fixed dust from being placed on nonsolidsTiger Wang2013-12-191-1/+1
| |
* | added blocks and blockentitiesTycho Bickerstaff2013-12-191-1/+5
| |
* | Merge branch 'master' into cmakeTycho Bickerstaff2013-12-182-0/+54
|\|
| * Implented Nether Wart.STRWarrior2013-12-182-0/+54
| |
* | Merge branch 'master' of github.com:mc-server/MCServer into cmakeTycho Bickerstaff2013-12-111-7/+6
|\|
| * Merge branch 'master' into quickfixsTycho Bickerstaff2013-12-111-1/+1
| |\
| * | fixed unused expression warnings in blockFireTycho Bickerstaff2013-12-101-7/+6
| | |
* | | Merge branch 'master' into cmakeTycho Bickerstaff2013-12-111-1/+1
|\ \ \ | | |/ | |/|
| * | Provides a possible fix for repeater timingsTiger Wang2013-12-101-1/+1
| |/ | | | | | | Not completely reliable, but at least some types of clock work.
* / more cmake stuffTycho Bickerstaff2013-12-101-0/+7
|/
* Improved pickups spawning speed againTiger Wang2013-12-101-3/+2
|
* Readded redstone lamp handlerTiger Wang2013-12-081-0/+2
|
* Merge branch 'master' of https://github.com/mc-server/MCServer into fixesnfeaturesTiger Wang2013-12-081-4/+3
|\ | | | | | | | | | | | | Conflicts: src/Bindings/Bindings.cpp src/Bindings/Bindings.h src/Blocks/BlockHandler.cpp
| * Moved bindings-related to a Bindings subfolder.madmaxoft2013-12-081-1/+1
| | | | | | | | Ref.: #407
| * Fixed stationary water starting fires and flowing lava not.madmaxoft2013-12-081-2/+2
| |
* | Fixed water starting firesTiger Wang2013-12-071-1/+0
| |
* | Fixed some new 1.7 client crash bugsTiger Wang2013-12-073-0/+35
| | | | | | | | | | Some technical blocks were removed; trying to render them as items caused a crash.
* | Added basic ender chestsTiger Wang2013-12-072-4/+46
| | | | | | | | Note that they just mirror chests now, so no per player inventory.
* | Fixed duplication glitch with QueueSetBlockTiger Wang2013-12-061-2/+2
| | | | | | | | | | | | | | If a coordinate was queued, and then the block there was broken, it would reappear: double items! Also now just sets meta if previous and current blocktypes matched.
* | Added trapdoor cursor Y detectionTiger Wang2013-12-061-2/+0
| |
* | Fixed trapdoors not overriding OnUseTiger Wang2013-12-061-1/+1
| |
* | Cleaned up torch code and added commentsTiger Wang2013-12-061-31/+7
| |
* | Removed another export and inline'd stuffTiger Wang2013-12-061-5/+5
| |
* | Removed exporting of a torch functionTiger Wang2013-12-061-3/+3
|/
* Lava can spawn fire.madmaxoft2013-12-042-6/+87
| | | | Settable in world.ini, lava can spawn fire to fuel blocks near it. Fix #65.
* Merge pull request #387 from mc-server/trapdoorsMattes D2013-11-3016-240/+261
|\ | | | | Trapdoors, redstone fixes, and snow
| * Fixed thin snow CanBeAt checkingTiger Wang2013-11-301-1/+13
| | | | | | | | | | Now takes into account the possibility that thin snow can be on top of full thin snow.
| * Properly fixed snow height, fixes #98 and #264Tiger Wang2013-11-302-16/+39
| |
| * Stairs reset meta when dropped, fixes #269Tiger Wang2013-11-291-2/+22
| | | | | | | | Additionally, they now have walking sounds.
| * Implemented trapdoors, fixes #43 and #105Tiger Wang2013-11-292-0/+110
| | | | | | | | Also updated redstone simulator to support it
| * Removed unneeded CPP filesTiger Wang2013-11-2911-221/+77
| | | | | | | | Also removed unneeded #include in BlockStems
* | Changed cBlockHandler->OnUpdate() to use cChunk directly.madmaxoft2013-11-3010-56/+73
| |
* | Grass doesn't spread to podzol or grassless dirt blocks.madmaxoft2013-11-301-2/+3
|/
* Merged master into redstonefixesTiger Wang2013-11-275-12/+56
|
* Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-248-38/+87
| | | | | Conflicts: GNUmakefile
* Moved source to srcAlexander Harkness2013-11-2469-0/+5903
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 23:01:47 +0100