Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Only allow rails to be placed where valid. | peterbell10 | 2017-09-21 | 1 | -1/+8 |
| | | | | Fixes #3507. | ||||
* | Changed BroadcastSoundEffect, SendSoundEffect, and CastThunderbolt parameters to vectors (#3959) | Lane Kolbly | 2017-09-19 | 5 | -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-009 | 2017-09-19 | 1 | -0/+6 |
| | |||||
* | Removed UTF-8 BOM (#4033) | Lukas Pioch | 2017-09-19 | 2 | -2/+2 |
| | |||||
* | Replace ItemCallbacks with lambdas (#3993) | peterbell10 | 2017-09-11 | 3 | -118/+57 |
| | |||||
* | Revert "Replace ItemCallbacks with lambdas (#3948)" | LogicParrot | 2017-09-02 | 3 | -57/+118 |
| | | | | This reverts commit 496c337cdfa593654018c171f6a74c28272265b5. | ||||
* | Replace ItemCallbacks with lambdas (#3948) | peterbell10 | 2017-09-01 | 3 | -118/+57 |
| | |||||
* | Drop enderchest when broken by a silk touck pick (#3986) | Bond-009 | 2017-08-31 | 2 | -1/+6 |
| | |||||
* | Bed piston fix (#3956) | Lane Kolbly | 2017-08-25 | 6 | -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) | mathiascode | 2017-08-24 | 3 | -3/+3 |
| | |||||
* | Fixed build for older clang versions (#3935) | Bond-009 | 2017-08-21 | 1 | -1/+1 |
| | |||||
* | Fully implemented leashes (#3798) | Pablo Beltrán | 2017-08-21 | 2 | -1/+66 |
| | |||||
* | Changed int parameters to vector parameters in cCuboid and simulators (#3874) | Lane Kolbly | 2017-08-17 | 5 | -6/+6 |
| | |||||
* | Replaced includes with forward declarations | Lukas Pioch | 2017-08-13 | 2 | -4/+6 |
| | |||||
* | Removed unneeded includes (#3902) | Lukas Pioch | 2017-08-06 | 22 | -25/+3 |
| | |||||
* | Remove double includes part 2 (#3890) | peterbell10 | 2017-08-03 | 4 | -6/+0 |
| | |||||
* | Removed unused forward declarations (#3888) | Lukas Pioch | 2017-08-03 | 1 | -1/+0 |
| | |||||
* | Removed double includes (#3885) | Lukas Pioch | 2017-08-02 | 2 | -2/+0 |
| | |||||
* | cBlockHandler: take player by ref | peterbell10 | 2017-08-01 | 45 | -142/+142 |
| | |||||
* | cWorld::SendBlockTo take player by ref | peterbell10 | 2017-08-01 | 8 | -10/+10 |
| | |||||
* | Check for intersection between placed blocks and entities. (#3850) | Lane Kolbly | 2017-07-28 | 6 | -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-009 | 2017-07-18 | 1 | -2/+6 |
| | |||||
* | Made cBlockHandler OnPlacedByPlayer call OnPlaced, made BlockRailHandler use NeighborChanged instead of OnNeighborChanged. | Lane Kolbly | 2017-07-18 | 2 | -16/+17 |
| | |||||
* | Allocate redstone component handlers upfront | peterbell10 | 2017-07-17 | 2 | -26/+26 |
| | |||||
* | Changing pickup lifetime and combining semantics, making these adjustable in the lua api. (#3843) | Lane Kolbly | 2017-07-12 | 1 | -0/+2 |
| | |||||
* | BigFlower fixes (#3826) | peterbell10 | 2017-07-07 | 9 | -20/+40 |
| | | | | | | | * BigFlowers fixes * Correct upper part meta * Documented parameters to DoesIgnoreBuildCollision | ||||
* | Added bed entity (#3823) | Lukas Pioch | 2017-07-07 | 5 | -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) | peterbell10 | 2017-07-03 | 1 | -1/+1 |
| | |||||
* | You can't use beds when there are hostile mobs nearby | Bond_009 | 2017-07-02 | 1 | -8/+32 |
| | |||||
* | Pressure plates can be placed on fences and hoppers (#3796) | Bond-009 | 2017-06-22 | 1 | -2/+21 |
| | |||||
* | Fix shears (and vines) | Bond-009 | 2017-06-21 | 1 | -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 blocks | peterbell10 | 2017-06-19 | 1 | -1/+4 |
| | |||||
* | Double tall grass drops seeds when broken by water (#3763) | dbhicks | 2017-06-14 | 1 | -6/+15 |
| | |||||
* | FastRandom rewrite (#3754) | peterbell10 | 2017-06-13 | 19 | -71/+59 |
| | |||||
* | Fixes problems with windows: | Lukas Pioch | 2017-06-05 | 3 | -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 fixes | Lukas Pioch | 2017-05-21 | 2 | -2/+2 |
| | | | | | - Added override keyword - Removed inherited member variables | ||||
* | BlockHandlers: vertical alignment. | Mattes D | 2017-05-09 | 1 | -159/+159 |
| | |||||
* | BlockCrops: Fixed RipeMeta off-by-one error properly. | Mattes D | 2017-05-09 | 2 | -6/+6 |
| | | | | Ref.: #3691 | ||||
* | Adjusted RipeMeta for off by one error (#3691) | dbhicks | 2017-05-06 | 1 | -2/+2 |
| | |||||
* | Replace double grass and large fern with placed block | Lukas Pioch | 2017-04-06 | 2 | -1/+28 |
| | |||||
* | Deadbushes drop sticks | Bond-009 | 2017-03-19 | 2 | -0/+47 |
| | |||||
* | BlockCrops: Fixed comments and reformatted control flow. (#3576) | Mattes D | 2017-02-25 | 1 | -46/+54 |
| | |||||
* | Updated sounds and effect IDs (#3422) | mathiascode | 2017-02-15 | 6 | -8/+8 |
| | |||||
* | Added some blocks and items (#3503) | mathiascode | 2017-02-14 | 7 | -11/+51 |
| | |||||
* | Fixed bindings for cBlockArea:Read and Write. (#3568) | Mattes D | 2017-02-05 | 3 | -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. | Altenius | 2017-01-28 | 1 | -1/+11 |
| | |||||
* | Changed big flowers so they can only be placed on dirt | Altenius | 2017-01-28 | 1 | -1/+4 |
| | |||||
* | Fix meta mirror (#3470) | Mattes D | 2016-12-09 | 1 | -32/+56 |
| | |||||
* | StyleCheck: Add "else has to be on a separate line" (#3412) | mohe2015 | 2016-10-20 | 1 | -1/+2 |
| | |||||
* | Use cChunkDef::Height for Y coord comparison where applicable. | Moritz Borcherding | 2016-09-27 | 1 | -1/+1 |
| | |||||
* | Fix breaking ice in survival not giving a water's source (#3356) | ElNounch | 2016-08-28 | 1 | -2/+1 |
| | | | Fix #3355 | ||||
* | Redstone fixes (#3285) | Tiger Wang | 2016-07-31 | 2 | -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 D | 2016-07-29 | 2 | -13/+3 |
| | |||||
* | Consolidated comparator code | Tiger Wang | 2016-07-29 | 1 | -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 instantly | Tiger Wang | 2016-07-29 | 2 | -3/+8 |
| | | | | * Fixes #3168. | ||||
* | CMake: Remove needless minimum version specifications. | Mattes D | 2016-07-18 | 1 | -2/+0 |
| | |||||
* | removed cast from BlockTrapdoor.h (#3256) | gaurav sehgal | 2016-07-07 | 2 | -3/+8 |
| | |||||
* | Fixed piston destroying other pistons | Altenius | 2016-07-06 | 1 | -5/+9 |
| | | | | Fixes #3251 | ||||
* | Reduced unnecessary block updates | LogicParrot | 2016-04-22 | 2 | -10/+9 |
| | |||||
* | Prevented snow from killing grass | LogicParrot | 2016-04-16 | 1 | -2/+4 |
| | |||||
* | Updated cChunk::SetMeta, fixed grass growth, reduced markDirty/setMeta usage | LogicParrot | 2016-04-16 | 4 | -15/+17 |
| | |||||
* | Fix Pickups of BlockFlower | Drahoslav Bednář | 2016-02-06 | 1 | -2/+3 |
| | | | | | BlockMeta is handled correctly, when converting to pickups, so flowers now drops right flower type. | ||||
* | Bulk clearing of whitespace | LogicParrot | 2016-02-05 | 56 | -171/+171 |
| | |||||
* | implement height logic for Acacia blocks | Kevin Riggle | 2016-02-04 | 1 | -1/+12 |
| | |||||
* | Fixed typo | Mathias | 2016-01-03 | 1 | -1/+1 |
| | |||||
* | More blocks that can't be mined with silktouch | Mathias | 2016-01-03 | 1 | -1/+28 |
| | |||||
* | Renamed leftover strings to Cuberite / Server, as needed. | Mattes D | 2016-01-01 | 1 | -1/+1 |
| | | | | Also upgraded the user setting file for MSVC to 2013. | ||||
* | Merge pull request #2542 from Haxi52/pinkstone | Tiger Wang | 2015-12-19 | 8 | -46/+90 |
|\ | | | | | Reorganised the redstone simulator | ||||
| * | Reorganised the redstone simulator | Tiger Wang | 2015-12-18 | 8 | -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 Harkness | 2015-12-19 | 1 | -6/+2 |
|/ | |||||
* | Moved variables into scope, removed unused variables and fixed variables | Lukas Pioch | 2015-12-17 | 1 | -8/+1 |
| | |||||
* | Merge pull request #2638 from Gargaj/master | worktycho | 2015-12-14 | 5 | -1/+61 |
|\ | | | | | Implement block heights + adapt ground checks | ||||
| * | blockheight mechanism | Gargaj | 2015-12-13 | 5 | -1/+61 |
| | | |||||
* | | Strip meta from hopper on converting to pickup | Julian Laubstein | 2015-12-13 | 1 | -0/+6 |
|/ | |||||
* | Set overgrown wart age to 3 | Safwat Halaby | 2015-12-13 | 1 | -1/+5 |
| | |||||
* | allow use failures to propagate from the entity/block to the player | Gargaj | 2015-12-13 | 20 | -28/+46 |
| | |||||
* | Nether wart only ages to 3 | Gargaj | 2015-12-12 | 1 | -2/+2 |
| | | | See http://minecraft.gamepedia.com/Nether_Wart | ||||
* | Add enum for Sound and Particle Effects | Dave Tucker | 2015-11-24 | 3 | -3/+6 |
| | | | | | | Fixes #2603 Signed-off-by: Dave Tucker <dave@dtucker.co.uk> | ||||
* | Adjusted height validation using cChunkDef::IsValidHeight() | Julian Laubstein | 2015-11-23 | 1 | -1/+1 |
| | |||||
* | Refactored code to use vectors in the cPistonHandler class | bibo38 | 2015-11-07 | 2 | -50/+40 |
| | |||||
* | Added some code improvements | bibo38 | 2015-11-07 | 2 | -22/+42 |
| | |||||
* | Renamed GetDirectionVec into VectorFromMetaData to improve code readability. | bibo38 | 2015-11-07 | 2 | -6/+6 |
| | |||||
* | Commented the GetDirectionVec method | bibo38 | 2015-11-07 | 1 | -0/+3 |
| | |||||
* | Fixed the style problems and added some comments | bibo38 | 2015-11-07 | 2 | -6/+18 |
| | |||||
* | Removed unused CanPull method | bibo38 | 2015-11-07 | 1 | -11/+0 |
| | |||||
* | Extracted block moving code into a seperate method | bibo38 | 2015-11-07 | 2 | -77/+52 |
| | |||||
* | Replaced the usage of pistonMeta with a direction vector to allow better meta value abstraction | bibo38 | 2015-11-07 | 2 | -73/+63 |
| | |||||
* | Fixed pulling/pushing of breakable blocks, which are not required to be moved | bibo38 | 2015-11-07 | 1 | -3/+20 |
| | |||||
* | Implemented the basic slime block pulling | bibo38 | 2015-11-07 | 1 | -17/+62 |
| | |||||
* | Implemented the SlimeBlock into the CanPush method to allow slimeblocks to work correctly when pushed | bibo38 | 2015-11-07 | 1 | -15/+26 |
| | |||||
* | Piston extension now works with the new recursive CanPushBlock method. | bibo38 | 2015-11-07 | 1 | -36/+41 |
| | |||||
* | Added the CanPushBlock method for the piston push check. | bibo38 | 2015-11-07 | 2 | -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. | bibo38 | 2015-11-07 | 2 | -0/+34 |
| | | | | Fixes #2530 | ||||
* | Implemented brewing | Lukas Pioch | 2015-11-03 | 1 | -4/+4 |
| | |||||
* | Prepared ScheduleTask for threading refactor | Tiger Wang | 2015-09-25 | 1 | -20/+5 |
| | | | | | * Llama-ified and condensed Schedule/QueueTask - Removed hackery done with piston animations | ||||
* | Lilypads drop when not on source water. | Mattes D | 2015-09-25 | 1 | -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 D | 2015-09-17 | 2 | -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 Erbelding | 2015-09-14 | 1 | -1/+1 |
| | |||||
* | * Logic for handling plant growth has been centralized into cBlockPlant, and all growable plants now inherit from it. | Samuel Barney | 2015-08-19 | 11 | -30/+256 |
| | | | | * Blocks now have an effect upon plant growth, just like in vanilla. | ||||
* | Some warning fixes | Julian Laubstein | 2015-08-18 | 1 | -1/+1 |
| | |||||
* | Fixed Iron Door | Nicholas W | 2015-08-01 | 1 | -1/+6 |
| | |||||
* | Unified the doxy-comment format. | Mattes D | 2015-07-31 | 2 | -24/+23 |
| | |||||
* | Silenced and fixed many warning messages across multiple files. | Samuel Barney | 2015-07-29 | 20 | -31/+26 |
| | |||||
* | Spawn baby mobs | hallucino | 2015-07-16 | 2 | -2/+2 |
| | |||||
* | Merge pull request #2349 from cuberite/maps | Tiger Wang | 2015-07-15 | 73 | -265/+683 |
|\ | | | | | Improved maps | ||||
| * | Improved maps | Tiger Wang | 2015-07-14 | 73 | -265/+683 |
| | | |||||
* | | Merge pull request #2036 from cuberite/sign-metamirror | Alexander Harkness | 2015-07-15 | 1 | -2/+2 |
|\ \ | |/ |/| | Should Fix sign flipping. | ||||
| * | Fixed bad logic. | Alexander Harkness | 2015-05-16 | 1 | -1/+1 |
| | | |||||
| * | Should Fix sign flipping. | Alexander Harkness | 2015-05-16 | 1 | -2/+2 |
| | | | | | | Fixes #1118 | ||||
* | | Merge pull request #2352 from mmdk95/master | Tiger Wang | 2015-07-14 | 1 | -0/+4 |
|\ \ | | | | | | | Fix duping doors | ||||
| * | | Fix duping doors (#1327) | mmdk95 | 2015-07-14 | 1 | -0/+4 |
| | | | |||||
* | | | Merge pull request #2346 from SamJBarney/TreeGrowthUpdate | Julian Laubstein | 2015-07-14 | 1 | -7/+135 |
|\ \ \ | | | | | | | | | Sapling Growth Update | ||||
| * | | | Sapling Growth Update | Samuel Barney | 2015-07-13 | 1 | -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 Barney | 2015-07-14 | 1 | -0/+16 |
|/ / | |||||
* | | Moved grabbing the light value to after the transparency check. | Samuel Barney | 2015-07-03 | 1 | -3/+4 |
| | | |||||
* | | Added missing parens | Samuel Barney | 2015-07-03 | 1 | -1/+1 |
| | | |||||
* | | Grass now only dies if it has an opaque block above it. | Samuel Barney | 2015-07-03 | 1 | -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 D | 2015-07-01 | 5 | -44/+63 |
| | | | | | | | | | | Fixes the OnNeighborChanged endless recursion with large melon / pumpkin fields. Fixes #2213. | ||||
* | | Added a size check for portals. | STRWarrior | 2015-06-28 | 2 | -0/+26 |
| | | | | | | | | | | | | Made the portal size configurable Alpha-sorted SetXYZNetherPortalXYZ functions | ||||
* | | Merge pull request #2282 from Haxi52/button-fixes | worktycho | 2015-06-25 | 2 | -6/+26 |
|\ \ | | | | | | | Button fixes | ||||
| * | | Buttons no longer click on when already on. Buttons now play sound when clicking off. | Hax52 | 2015-06-24 | 2 | -6/+26 |
| | | | |||||
* | | | Rebased version of Code | Samuel Barney | 2015-06-22 | 7 | -54/+16 |
|/ / | |||||
* | | Externalized cPrefabPiecePool self-test. | Mattes D | 2015-06-19 | 1 | -0/+1 |
| | | |||||
* | | implemented DoesIgnoreBuildCollision on BlockFire to allow blocks to be placed on top | Martin McArthur | 2015-06-14 | 1 | -0/+5 |
| | | |||||
* | | Fixed typo in BlockDoor.h | Lane Kolbly | 2015-06-13 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #2144 from mc-server/comparators | Alexander Harkness | 2015-06-09 | 1 | -0/+79 |
|\ \ | | | | | | | Redstone improvements [SEE DESC] | ||||
| * | | Comparators | Tiger Wang | 2015-06-06 | 1 | -0/+79 |
| | | | |||||
* | | | Fixed warnings in MSVC. | Mattes D | 2015-06-02 | 8 | -0/+42 |
|/ / | | | | | | | It complained about undefined return values or using uninitialized variables. | ||||
* | | Made -Weverything an error. | tycho | 2015-05-24 | 4 | -6/+10 |
| | | |||||
* | | Merge branch 'master' into PreventNewWarnings | tycho | 2015-05-23 | 1 | -1/+1 |
|\ \ | |||||
| * | | Fixed missing overrides and added a ignore flag for reserved macro for clang version 3.6 and higher. | Lukas Pioch | 2015-05-23 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master' into PreventNewWarnings | tycho | 2015-05-23 | 2 | -3/+22 |
|\| | | |||||
| * | | Merge pull request #2030 from beeduck/master | worktycho | 2015-05-21 | 1 | -3/+17 |
| |\ \ | | | | | | | | | Issue #1868 and Issue #1984 | ||||
| | * | | Added open/close and sound effects for all door types | b33duck | 2015-05-21 | 1 | -3/+17 |
| | | | | |||||
| * | | | Added missing fencetypes to torchhandler | Julian Laubstein | 2015-05-20 | 1 | -0/+5 |
| | | | | |||||
* | | | | Make -Werror disabling file only | tycho | 2015-05-19 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | Ad fix a load of warnings | ||||
* | | | | Fixed compile and a few more warnings | tycho | 2015-05-19 | 7 | -13/+26 |
| | | | | |||||
* | | | | Merge branch 'master' into PreventNewWarnings | tycho | 2015-05-19 | 1 | -8/+20 |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: src/Blocks/BlockLeaves.h | ||||
| * | | | Improved leaves a bit more. | Alexander Harkness | 2015-05-18 | 1 | -8/+20 |
| | | | | | | | | | | | | | | | | Should fix #2058. | ||||
* | | | | Fixed a lot of warnings | tycho | 2015-05-19 | 7 | -14/+23 |
|/ / / | |||||
* | / | Fix sapling probability. | Alexander Harkness | 2015-05-17 | 1 | -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 three | worktycho | 2015-05-16 | 1 | -2/+2 |
|/ | |||||
* | More style checking. | Mattes D | 2015-05-09 | 7 | -18/+18 |
| | | | | Spaces around some operators are checked. | ||||
* | Clay blocks are handled with the OreHandler | jammet | 2015-04-29 | 1 | -0/+1 |
| | |||||
* | Digging up a clay block spawns 4 clay items. | jammet | 2015-04-23 | 1 | -0/+5 |
| | | | | | Fixes #1884. Closes #1891. | ||||
* | Nether Quartz is handled in the Ore handler. | jammet | 2015-04-23 | 1 | -0/+5 |
| | | | | Fixes #1885, Closes #1888 | ||||
* | Merge pull request #1851 from wraith11/DoorFix | Mattes D | 2015-04-23 | 1 | -5/+20 |
|\ | | | | | Fix door placing in connection with slabs | ||||
| * | Fix door placing in connection with slabs | wraith11 | 2015-04-21 | 1 | -5/+20 |
| | | | | | | | | Except top-half slabs as transparent blocks for doors. | ||||
* | | Fixed PolishedGranite et al crafting recipes. | Mattes D | 2015-04-16 | 1 | -1/+1 |
| | | | | | | | | Fixes #1774. Ref.: #1859 | ||||
* | | Placing a fluid from bucket calls plugin hooks. | Mattes D | 2015-04-14 | 1 | -0/+17 |
|/ | | | | Ref.: #1857. | ||||
* | Merge pull request #1799 from SnappingTurtles/BlockButton | Mattes D | 2015-04-03 | 1 | -1/+5 |
|\ | | | | | Buttons can be placed on the top and on the bottom face of a block | ||||
| * | Removed 0x6, 0x7 from BlockButton. | Alexandre Guertin | 2015-03-25 | 1 | -5/+3 |
| | | |||||
| * | Buttons can be placed on the top and on the bottom face of a block | Alexandre Guertin | 2015-03-09 | 1 | -1/+7 |
| | | |||||
* | | Merge pull request #1826 from mc-server/UnifyPacketizer | Mattes D | 2015-03-24 | 1 | -5/+7 |
|\ \ | | | | | | | Unify packetizer | ||||
| * | | Changed cEntity::m_UniqueID to UInt32. | Mattes D | 2015-03-21 | 1 | -5/+7 |
| | | | |||||
* | | | Merge pull request #1775 from tommysanterre/terrainheightfix | Mattes D | 2015-03-23 | 5 | -6/+6 |
|\ \ \ | | | | | | | | | Correct all world height validations. | ||||
| * | | | Correct world height validations. | Tommy Santerre | 2015-03-20 | 5 | -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/ResettableLuaCallback | Mattes D | 2015-03-20 | 1 | -3/+3 |
|\ \ \ | | | | | | | | | Added cPluginLua::cResettable interface, used for scheduled tasks. | ||||
| * | | | Added cPluginLua::cResettable interface, used for scheduled tasks. | Mattes D | 2015-03-20 | 1 | -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 #1765 | bibo38 | 2015-03-20 | 2 | -0/+12 |
|/ / | |||||
* | | Merge pull request #1811 from mc-server/grass | worktycho | 2015-03-15 | 1 | -3/+3 |
|\ \ | | | | | | | Fixed grass spread, closes #1743 | ||||
| * | | Fixed grass spread, closes #1743 | Tiger Wang | 2015-03-14 | 1 | -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/pistons | Mattes D | 2015-03-14 | 2 | -22/+27 |
|\ \ \ | |/ / |/| | | Handle client 'leave bed' request | ||||
| * | | Reverted non-functional changes | Tiger Wang | 2015-03-05 | 2 | -10/+8 |
| | | | |||||
| * | | Handle client 'leave bed' request | Tiger Wang | 2015-02-08 | 3 | -25/+32 |
| | | | | | | | | | | | | * Fixes #1728 | ||||
* | | | Merge branch 'master' into Inventory | Howaner | 2015-03-09 | 2 | -1/+72 |
|\ \ \ | | |/ | |/| | |||||
| * | | Grass checks for sufficient light before spreading | Alexander Harkness | 2015-03-05 | 1 | -1/+13 |
| | | | |||||
| * | | Added experience drops when mining ores | STRWarrior | 2015-02-28 | 1 | -0/+59 |
| |/ | |||||
* | | Merge branch 'master' into Inventory | Howaner | 2015-01-25 | 13 | -422/+72 |
|\| | |||||
| * | Fixed defect #43661 in Coverity list. | Kirill Kirilenko | 2015-01-23 | 1 | -1/+2 |
| | | |||||
| * | Fixed door placement. | Mattes D | 2014-12-25 | 1 | -1/+2 |
| | | |||||
| * | Refactored all player block placing to go through hooks. | Mattes D | 2014-12-24 | 12 | -421/+69 |
| | | | | | | | | Fixes #1618. | ||||
* | | Merge branch 'master' into Inventory | Howaner | 2014-12-17 | 7 | -5/+104 |
|\| | |||||
| * | Merge pull request #1581 from mc-server/redstone | Mattes D | 2014-12-17 | 4 | -5/+5 |
| |\ | | | | | | | Resplit redstone .inc file and provided improvements | ||||
| | * | NULL -> nullptr | Tiger Wang | 2014-12-17 | 1 | -1/+1 |
| | | | |||||
| | * | Merge branch 'master' into redstone | Tiger Wang | 2014-12-13 | 4 | -19/+96 |
| | |\ | |||||
| | * | | Cleaned up simulators | Tiger Wang | 2014-10-25 | 1 | -0/+1 |
| | | | | |||||
| | * | | Fixed some block checks | Tiger Wang | 2014-10-25 | 2 | -4/+3 |
| | | | | | | | | | | | | | | | | * Fixes #1330 | ||||
| * | | | "& 0x0f" isn't needed | Howaner | 2014-12-14 | 1 | -2/+2 |
| | | | | |||||
| * | | | Fixes | Howaner | 2014-12-13 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'master' into Cocoa | Howaner | 2014-12-13 | 3 | -19/+84 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | Added cocoa pod. | Howaner | 2014-12-01 | 3 | -0/+99 |
| | | | | |||||
* | | | | Own classes for all windows. | Howaner | 2014-12-13 | 3 | -2/+3 |
| |/ / |/| | | |||||
* | | | BasicStyle: Added missing braces to control statements. | Mattes D | 2014-12-05 | 3 | -19/+84 |
|/ / | |||||
* | | Merge branch 'master' into MobSpawner | Howaner | 2014-11-18 | 24 | -149/+329 |
|\| | | | | | | | | | Conflicts: MCServer/Plugins/Core | ||||
| * | Signs can be placed on wallsigns. | Alexander Harkness | 2014-10-23 | 1 | -1/+1 |
| | | | | | | Fixes #1438 | ||||
| * | En masse NULL -> nullptr replace | Tiger Wang | 2014-10-23 | 7 | -11/+11 |
| | | |||||
| * | Moved tall grass pickups handle. | Howaner | 2014-10-21 | 1 | -0/+37 |
| | | |||||
| * | Merge branch 'master' into BlockFixes | Howaner | 2014-10-21 | 9 | -16/+102 |
| |\ | |||||
| | * | Added mechanics placeable on halfslabs | Julian Laubstein | 2014-10-19 | 4 | -10/+79 |
| | | | |||||
| | * | Functions in cPluginManager get references instead of pointers. | Mattes D | 2014-10-15 | 4 | -5/+22 |
| | | | |||||
| | * | Fixed compilation. | Alexander Harkness | 2014-10-11 | 1 | -1/+1 |
| | | | |||||
| * | | Corrected drops from dead bush, tall grass and cobweb. | Howaner | 2014-10-07 | 2 | -23/+24 |
| | | | |||||
| * | | Corrected IsBlockAttachable() in BlockVine.h | Howaner | 2014-10-07 | 1 | -5/+15 |
| |/ | |||||
| * | Removed BlockHaybale.h from CMakeLists.txt | Howaner | 2014-10-07 | 1 | -1/+0 |
| | | |||||
| * | Removed unused cBlockHayBaleHandler. | Howaner | 2014-10-07 | 2 | -24/+1 |
| | | |||||
| * | Merge pull request #1489 from mc-server/fixes | Mattes D | 2014-10-04 | 1 | -71/+53 |
| |\ | | | | | | | Improved torch handler | ||||
| | * | Comment suggestions | Tiger Wang | 2014-10-03 | 1 | -2/+3 |
| | | | |||||
| | * | Improved torch handler | Tiger Wang | 2014-09-30 | 1 | -70/+51 |
| | | | |||||
| * | | Added Daylight Sensors to the "can't push" list | Masy98 | 2014-10-01 | 1 | -0/+2 |
| | | | |||||
| * | | Added missing 1.8 blocks, E_METAs and sounds | Masy98 | 2014-10-01 | 1 | -0/+2 |
| | | | |||||
| * | | Code improvements | Howaner | 2014-09-30 | 3 | -3/+7 |
| | | | |||||
| * | | Fixed 1.8 dirt types | Howaner | 2014-09-30 | 1 | -1/+9 |
| | | | |||||
| * | | Fixed iron trapdoors | Howaner | 2014-09-30 | 1 | -0/+5 |
| | | | |||||
| * | | Fixed 1.8 doors. | Howaner | 2014-09-30 | 1 | -1/+14 |
| |/ | |||||
| * | Indentation | Julian Laubstein | 2014-09-30 | 1 | -3/+3 |
| | | |||||
| * | Set right indentation | Julian Laubstein | 2014-09-30 | 1 | -3/+3 |
| | | |||||
| * | actual solving of the halfslap+torch problem | Julian Laubstein | 2014-09-30 | 1 | -1/+3 |
| | | |||||
| * | Style fixes. | madmaxoft | 2014-09-29 | 1 | -6/+8 |
| | | |||||
| * | Fixed codestyle again. | Alexander Harkness | 2014-09-29 | 1 | -1/+1 |
| | | |||||
| * | BlockStone.h: fix the codestyle | w00tc0d3 | 2014-09-29 | 1 | -6/+5 |
| | | |||||
| * | BlockStone: drop the right cobblestone on onBreak(). | netchip | 2014-09-29 | 1 | -3/+9 |
| | | | | | | | | Signed-off-by: netchip <w00tc0d3@outlook.com> | ||||
| * | Update BlockTorch.h | Julian Laubstein | 2014-09-29 | 1 | -3/+3 |
| | | |||||
| * | Added torches placeable on upside-down-halfslaps | Julian Laubstein | 2014-09-29 | 1 | -1/+3 |
| | | |||||
| * | Fixed minor style issues. | madmaxoft | 2014-09-27 | 1 | -1/+1 |
| | | |||||
| * | Added default value to switch and spruce gate to fence gate handler | Masy98 | 2014-09-27 | 2 | -0/+6 |
| | | |||||
| * | Fixed convertToPickups for fence gates | Masy98 | 2014-09-27 | 1 | -1/+1 |
| | | |||||
| * | Fixed convertToPickups for doors | Masy98 | 2014-09-27 | 1 | -1/+38 |
| | | |||||
* | | Merge branch 'master' into MobSpawner | Howaner | 2014-09-26 | 21 | -77/+327 |
|\| | | | | | | | | | | | Conflicts: src/MobSpawner.h src/Mobs/Monster.h | ||||
| * | Merge pull request #1415 from Masy98/blocks | Mattes D | 2014-09-26 | 4 | -1/+49 |
| |\ | | | | | | | Added 1.8 Blocks and Items | ||||
| | * | Merge branch 'master' into blocks | Masy98 | 2014-09-26 | 20 | -159/+410 |
| | |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Items/ItemHandler.cpp src/Simulator/IncrementalRedstoneSimulator.cpp | ||||
| | * | | Added Sea Lantern drops | Masy98 | 2014-09-12 | 2 | -0/+32 |
| | | | | |||||
| | * | | Added barrier block | Masy98 | 2014-09-11 | 1 | -0/+1 |
| | | | | |||||
| | * | | Fixed incorrect handlers | Masy98 | 2014-09-11 | 1 | -3/+3 |
| | | | | |||||
| | * | | Added stone slab in BlockSlab.h | Masy98 | 2014-09-10 | 1 | -1/+3 |
| | | | | |||||
| | * | | Added new blocks to the BlockInfo | Masy98 | 2014-09-10 | 1 | -0/+1 |
| | | | | |||||
| | * | | Added new blocks to the BlockHandler | Masy98 | 2014-09-10 | 1 | -0/+12 |
| | | | | |||||
| * | | | Removed more unessicary includes | Tycho | 2014-09-26 | 14 | -16/+31 |
| | |/ | |/| | |||||
| * | | Fixed style | Tycho | 2014-09-25 | 2 | -0/+103 |
| | | | |||||
| * | | Merge branch 'master' into redstoneTests | Tycho | 2014-09-25 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: src/Mobs/Monster.h | ||||
| * \ \ | Merge branch 'master' into redstoneTests | Tycho | 2014-09-17 | 16 | -103/+167 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Blocks/ChunkInterface.h | ||||
| * | | | | Added first test to show the object can be created | Tycho | 2014-09-17 | 7 | -60/+90 |
| | | | | | |||||
| * | | | | Possibly decoupled IncrementalRedstoneSimulator from the rest of the server | Tycho | 2014-09-11 | 1 | -0/+54 |
| | |_|/ | |/| | | | | | | | | | | THis wil hopefully allow for unit testing | ||||
* | | | | Implemented mob spawner. | Howaner | 2014-09-19 | 1 | -0/+12 |
| |_|/ |/| | | |||||
* | | | Fixed minor style issues. | madmaxoft | 2014-09-17 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Improved cBlockHandler::DropBlock | Tiger Wang | 2014-09-13 | 3 | -44/+32 |
| | | |||||
* | | Only drop flint or gravel, not both. | Howaner | 2014-09-12 | 1 | -2/+4 |
| | | |||||
* | | Fixed farmland issues. | Howaner | 2014-09-12 | 7 | -57/+68 |
| | | |||||
* | | Spawn exp if you break a mob spawner. | Howaner | 2014-09-12 | 3 | -0/+45 |
| | | |||||
* | | Fixed iron ore drop. | Howaner | 2014-09-12 | 1 | -1/+2 |
| | | |||||
* | | Added flint drop and fence gate meta reset. | Howaner | 2014-09-12 | 2 | -0/+17 |
|/ | |||||
* | Merge pull request #1402 from Masy98/Sounds | Mattes D | 2014-09-10 | 47 | -298/+0 |
|\ | | | | | Moved sound-configs into BlockID.h and fixed/ added loads of sounds | ||||
| * | Removed old sound-configuration for SignPosts | Masy98 | 2014-09-09 | 1 | -6/+0 |
| | | |||||
| * | Removed old sound-configuration for Repeaters | Masy98 | 2014-09-09 | 1 | -6/+0 |
| | | |||||
| * | Removed old sound-configuration for Trapdoors | Masy98 | 2014-09-09 | 1 | -5/+0 |
| | | |||||
| * | Removed old sound-configuration for doors | Masy98 | 2014-09-09 | 2 | -10/+0 |
| | | |||||
| * | Moved sound-configs into BlockID.h and fixed/ added loads of sounds | Masy98 | 2014-09-09 | 42 | -271/+0 |
| | | |||||
* | | TimeOfDay does not need to be an Int64 | Tycho | 2014-09-08 | 1 | -2/+2 |
|/ | |||||
* | Merge remote-tracking branch 'Hircine/Enchantments' | madmaxoft | 2014-09-01 | 2 | -13/+48 |
|\ | |||||
| * | Added a_Digger check | Jaume Aloy | 2014-08-30 | 1 | -28/+31 |
| | | |||||
| * | More Enchantments | Jaume Aloy | 2014-08-22 | 1 | -1/+0 |
| | | | | | | | | - Added Thorns and Respiration enchantments | ||||
| * | Protection Enchantments, some fixes | Jaume Aloy | 2014-08-21 | 1 | -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 BlockHandler | Jaume Aloy | 2014-08-19 | 1 | -5/+2 |
| | | |||||
| * | Fixes | Jaume Aloy | 2014-08-19 | 1 | -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 switch | Jaume Aloy | 2014-08-19 | 2 | -12/+23 |
| | | |||||
| * | Added more enchantments and some fixes | Jaume Aloy | 2014-08-19 | 2 | -16/+40 |
| | | | | | | | | | | | | | | - Removed Debug messages - Added Punch enchantment effect - Added Silk Touch enchantment - Added Unbreaking enchantment effect | ||||
* | | Check range of y in HasNearLog | worktycho | 2014-08-31 | 1 | -1/+1 |
| | | | | | | Fixes #803 | ||||
* | | Fixed conversion warning. | Mattes D | 2014-08-29 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' of https://github.com/mc-server/MCServer | Hownaer | 2014-08-28 | 2 | -6/+6 |
|\ \ | |||||
| * \ | Merge remote-tracking branch 'origin/master' into CraftingFixes | Mattes D | 2014-08-28 | 26 | -157/+80 |
| |\ \ | |||||
| * | | | Fixed spaces after "template" keyword. | Mattes D | 2014-08-28 | 2 | -6/+6 |
| | |/ | |/| | |||||
* | | | Fixed anvil placing. | Hownaer | 2014-08-28 | 1 | -5/+6 |
| |/ |/| | |||||
* | | Merge branch 'master' into Fire | Howaner | 2014-08-20 | 26 | -152/+80 |
|\ \ | |||||
| * | | Removed old classes from the CMakeLists.txt | Howaner | 2014-08-20 | 1 | -2/+0 |
| | | | |||||
| * | | Code formatting fixes. | Howaner | 2014-08-19 | 25 | -150/+80 |
| |/ | |||||
* / | Moved the clicked-through block check to the top of the function. | Howaner | 2014-08-11 | 1 | -5/+0 |
|/ | |||||
* | Changed comment. | Howaner | 2014-08-10 | 1 | -3/+1 |
| | |||||
* | Added comment. | Howaner | 2014-08-08 | 1 | -0/+3 |
| | |||||
* | Send the old slab to the client when the interact cancelled. | Howaner | 2014-08-08 | 1 | -0/+11 |
| | |||||
* | Fixed signs not staying on other signs | Tiger Wang | 2014-08-04 | 2 | -2/+4 |
| | |||||
* | Merge pull request #1269 from Howaner/BlockEntitys | Mattes D | 2014-08-01 | 2 | -0/+2 |
|\ | | | | | Added beacon. | ||||
| * | Added beacon. | Howaner | 2014-07-30 | 2 | -0/+2 |
| | | |||||
* | | Changed IsSolid to FullyOccupiesVoxel | Howaner | 2014-07-31 | 1 | -1/+1 |
| | | |||||
* | | Fixed water from ice and removed packed ice drop. | Howaner | 2014-07-31 | 1 | -2/+12 |
|/ | |||||
* | Merge branch 'master' into portals | Tiger Wang | 2014-07-29 | 7 | -67/+48 |
|\ | | | | | | | | | Conflicts: src/World.h | ||||
| * | Merge branch 'master' into Inventory2 | Howaner | 2014-07-26 | 5 | -50/+39 |
| |\ | | | | | | | | | | | | | Conflicts: src/BlockInfo.cpp | ||||
| | * | Merge remote-tracking branch 'origin/master' | Tiger Wang | 2014-07-24 | 1 | -4/+4 |
| | |\ | |||||
| | | * | Removed redundant semicolons and re-added warning | archshift | 2014-07-24 | 1 | -4/+4 |
| | | | | |||||
| | * | | Fixed block drops | Tiger Wang | 2014-07-24 | 3 | -12/+16 |
| | |/ | | | | | | | | | | * Fixes #1242 (the issue addressed within) | ||||
| | * | BlockLeaves: Fixed comment style. | madmaxoft | 2014-07-23 | 1 | -2/+2 |
| | | | |||||
| | * | Fix misguided comment on bits... | Tiger Wang | 2014-07-22 | 1 | -1/+1 |
| | | | | | | | | | | | | ...obviously written by someone very confused, also known as me | ||||
| | * | Merge remote-tracking branch 'origin/master' into saplingsandleaves | Tiger Wang | 2014-07-22 | 6 | -11/+12 |
| | |\ | | | | | | | | | | | | | | | | | Conflicts: src/Defines.h | ||||
| | * \ | Merge branch 'master' into saplingsandleaves | Tiger Wang | 2014-07-20 | 48 | -175/+352 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Bindings/DeprecatedBindings.cpp src/Blocks/BlockSapling.h | ||||
| | * | | | Proper comment for DropBlock() | Tiger Wang | 2014-07-20 | 1 | -2/+5 |
| | | | | | |||||
| | * | | | Fixed issues relating to saplings and leaves | Tiger Wang | 2014-07-17 | 5 | -47/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed cBlockInfo::RequiresSpecialTool * Fixes #1195 * Fixes #1201 | ||||
| * | | | | Fix item durability. | Howaner | 2014-07-23 | 3 | -17/+9 |
| | |_|/ | |/| | | | | | | Fixes #1181 | ||||
* | | | | Suggestion and failed merge fix | Tiger Wang | 2014-07-22 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge remote-tracking branch 'origin/master' into portals | Tiger Wang | 2014-07-22 | 13 | -54/+232 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Player.cpp src/Root.cpp src/World.cpp | ||||
| * | | | Style: Normalized to no spaces before closing parenthesis. | madmaxoft | 2014-07-21 | 6 | -10/+10 |
| | | | | |||||
| * | | | Style: Normalized spaces after if, for and while. | madmaxoft | 2014-07-21 | 1 | -3/+4 |
| | |/ | |/| | |||||
| * | | Fixed style: spaces after commas. | madmaxoft | 2014-07-19 | 6 | -7/+7 |
| | | | |||||
| * | | Blocks/CMakeLists.txt: Fixed header list after merge of master | archshift | 2014-07-19 | 1 | -1/+2 |
| | | | |||||
| * | | Subdirs: Only add_library if not using MSVC | archshift | 2014-07-19 | 1 | -1/+3 |
| | | | |||||
| * | | Blocks/CMakeLists.txt: Replaced glob with list of files | archshift | 2014-07-19 | 1 | -5/+92 |
| | | | |||||
| * | | Normalized code style for both sign handlers. | madmaxoft | 2014-07-18 | 2 | -16/+20 |
| | | | |||||
| * | | Removed cBlockSignPostHandler descend. | Howaner | 2014-07-18 | 1 | -2/+28 |
| | | | |||||
| * | | Added a extra wall sign handler. | Howaner | 2014-07-18 | 3 | -24/+81 |
| | | | | | | | | | Fixes #1119 | ||||
* | | | Merge branch 'master' into portals | Tiger Wang | 2014-07-18 | 52 | -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. | madmaxoft | 2014-07-17 | 1 | -2/+2 |
| | | | |||||
| * | | More trailing whitespace fixes. | madmaxoft | 2014-07-17 | 1 | -3/+3 |
| | | | |||||
| * | | Basic style fixes. | madmaxoft | 2014-07-17 | 39 | -73/+73 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/mc-server/MCServer | madmaxoft | 2014-07-17 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Fix sapling drop. | Howaner | 2014-07-17 | 1 | -1/+1 |
| | |/ | |||||
| * / | Normalized comments. | madmaxoft | 2014-07-17 | 20 | -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/Blocks | Mattes D | 2014-07-15 | 1 | -1/+0 |
| |\ | | | | | | | Added various missing blocks in the lists in BlockInfo.cpp | ||||
| | * | Added various missing blocks in the lists in BlockInfo.cpp | Masy98 | 2014-07-15 | 1 | -1/+0 |
| | | | |||||
| * | | Fixed code formatting. | madmaxoft | 2014-07-15 | 2 | -6/+9 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/ClearMetaMixin' | madmaxoft | 2014-07-15 | 4 | -12/+34 |
| |\ \ | |||||
| | * | | Added super typedef | Tycho | 2014-07-15 | 3 | -3/+6 |
| | | | | |||||
| | * | | COnverted Lilypad back to mixin | Tycho | 2014-07-15 | 1 | -8/+2 |
| | | | | |||||
| | * | | Revert "Converted some blockhandlers to use cClearMetaOnDrop" | Tycho | 2014-07-15 | 9 | -21/+67 |
| | | | | | | | | | | | | | | | | This reverts commit 333f4f982cbd24ffcb376594eddef439b3f05e9e. | ||||
| | * | | Added documentation | Tycho | 2014-07-14 | 1 | -0/+6 |
| | | | | |||||
| | * | | Converted some blockhandlers to use cClearMetaOnDrop | Tycho | 2014-07-14 | 9 | -67/+21 |
| | | | | |||||
| | * | | Simplified ClearMetaOnDrop | Tycho | 2014-07-14 | 1 | -1/+1 |
| | | | | |||||
| | * | | Added cClearOnDrop Mixin to cPumpkin | Tycho | 2014-07-14 | 1 | -2/+2 |
| | | | | |||||
| | * | | Added first implementation of cClearMetaOnDrop | Tycho | 2014-07-14 | 2 | -2/+21 |
| | | | | |||||
| * | | | Fixed some meta resetting bugs | Tiger Wang | 2014-07-14 | 6 | -27/+28 |
| |/ / | | | | | | | | | | | | | * Fixes #1174 * Fixes #1171 | ||||
| * / | Changed BroadcastSoundEffect function to take floating pos. | Howaner | 2014-07-13 | 4 | -5/+5 |
| |/ | |||||
| * | Suggestions and bug fix | Tiger Wang | 2014-07-12 | 1 | -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 | ||||
| * | Suggestions | Tiger Wang | 2014-07-11 | 2 | -2/+3 |
| | | |||||
| * | Suggestions | Tiger Wang | 2014-07-11 | 1 | -5/+6 |
| | | |||||
| * | Implemented trapped chests & others | Tiger Wang | 2014-07-07 | 4 | -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 unpowering | Tiger Wang | 2014-07-02 | 3 | -0/+5 |
| | | | | | | | | | | * Fixed the "fix" that broke the fix for #535, thereby fixing said issue * Fixed #535 | ||||
| * | Implemented tripwire(s) (hooks) | Tiger Wang | 2014-06-28 | 4 | -2/+118 |
| | | | | | | | | * Fixes #944 | ||||
| * | Added more block exceptions to torches | Tiger Wang | 2014-06-28 | 1 | -0/+4 |
| | | |||||
| * | Minor change to buttons and levers | Tiger Wang | 2014-06-28 | 2 | -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 portals | Tiger Wang | 2014-06-24 | 6 | -19/+110 |
|\| | |||||
| * | Added a (disabled) block meta mirror / rotate test code. | madmaxoft | 2014-06-23 | 1 | -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. | madmaxoft | 2014-06-23 | 1 | -9/+6 |
| | | |||||
| * | Fixed sign and lever rotations. | madmaxoft | 2014-06-23 | 2 | -8/+9 |
| | | |||||
| * | Merge pull request #1105 from Howaner/Blocks | Mattes D | 2014-06-22 | 2 | -0/+8 |
| |\ | | | | | | | Added door and fence gate sounds. | ||||
| | * | Add fence gate sound. | Howaner | 2014-06-17 | 1 | -0/+1 |
| | | | |||||
| | * | Add UNUSED() Tags | Howaner | 2014-06-17 | 1 | -0/+6 |
| | | | |||||
| | * | Add door sound | Howaner | 2014-06-17 | 1 | -0/+1 |
| | | | |||||
* | | | Merge branch 'master' into portals | Tiger Wang | 2014-06-21 | 8 | -35/+171 |
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Entity.h src/Entities/Player.h | ||||
| * | | Merge pull request #1045 from Howaner/GlobalFixes | Mattes D | 2014-06-18 | 5 | -32/+121 |
| |\ \ | | | | | | | | | Little fixes | ||||
| | * | | Merge branch 'master' into GlobalFixes | Howaner | 2014-06-17 | 9 | -43/+430 |
| | |\| | |||||
| | * | | Check block type from cBlockEntity | Howaner | 2014-06-17 | 1 | -8/+8 |
| | | | | |||||
| | * | | Add DoWithBlockEntityAt() to WorldInterface.h | Howaner | 2014-06-17 | 2 | -37/+61 |
| | | | | |||||
| | * | | Code improvements | Howaner | 2014-05-28 | 1 | -6/+2 |
| | | | | |||||
| | * | | Fix hay place sound. | Howaner | 2014-05-28 | 2 | -1/+31 |
| | | | | |||||
| | * | | Fix fire break. | Howaner | 2014-05-28 | 1 | -2/+2 |
| | | | | |||||
| | * | | Fix skull bugs. | Howaner | 2014-05-28 | 1 | -2/+41 |
| | | | | |||||
| * | | | Merge pull request #1100 from Howaner/Slabs | archshift | 2014-06-18 | 1 | -0/+1 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | Fix doubleslab meta. | Howaner | 2014-06-16 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge pull request #1099 from Howaner/Blocks | Mattes D | 2014-06-17 | 1 | -0/+3 |
| |\ \ \ | | | | | | | | | | | Glass-made blocks don't drop pickups. | ||||
| | * | | | Glass shouldn't drop. | Howaner | 2014-06-16 | 1 | -0/+3 |
| | |/ / | |||||
| * | | | Add parenthesis | Howaner | 2014-06-17 | 1 | -2/+2 |
| | | | | |||||
| * | | | Add end lines to BlockPressurePlate.h | Howaner | 2014-06-17 | 1 | -1/+5 |
| | | | | |||||
| * | | | Add pressure plate handler | Howaner | 2014-06-17 | 2 | -0/+39 |
| |/ / | |||||
| * | | Fix a few warnings | Tycho | 2014-06-16 | 1 | -3/+3 |
| | | | |||||
* | | | Cauldrons check the heightmap | Tiger Wang | 2014-06-14 | 2 | -5/+9 |
| | | | |||||
* | | | Merge branch 'master' into portals | Tiger Wang | 2014-06-10 | 2 | -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. | madmaxoft | 2014-06-09 | 1 | -19/+40 |
| | | | |||||
| * | | Merge remote-tracking branch 'howaner/Redstone' | madmaxoft | 2014-06-09 | 2 | -31/+52 |
| |\ \ | |||||
| | * | | Moved the IsDoor check before the meta get. | Howaner | 2014-05-31 | 1 | -2/+1 |
| | | | | |||||
| | * | | Add doxy-comment | Howaner | 2014-05-31 | 1 | -3/+4 |
| | | | | |||||
| | * | | Better SetOpen() and IsOpen() function from the doors. | Howaner | 2014-05-30 | 2 | -77/+27 |
| | | | | |||||
| | * | | Add SetOpen() and IsOpen() to BlockDoor.h and fix door redstone bug. | Howaner | 2014-05-29 | 1 | -9/+80 |
| | |/ | |||||
* | | | Suggestions | Tiger Wang | 2014-06-05 | 1 | -1/+3 |
| | | | |||||
* | | | Added checks for no downfall biomes | Tiger Wang | 2014-06-04 | 1 | -1/+1 |
| | | | |||||
* | | | Merge remote-tracking branch 'origin/master' into portals | Tiger Wang | 2014-06-04 | 5 | -11/+310 |
|\| | | |||||
| * | | Suggestions two | Tiger Wang | 2014-06-01 | 1 | -3/+3 |
| | | | |||||
| * | | Suggestions | Tiger Wang | 2014-05-29 | 1 | -1/+6 |
| | | | |||||
| * | | Changed block send queue to use vectors | Tiger Wang | 2014-05-29 | 1 | -6/+17 |
| | | | | | | | | | | | | As suggested by @worktycho. | ||||
| * | | Hopefully fixed piston duplication issues | Tiger Wang | 2014-05-25 | 5 | -11/+294 |
| |/ | | | | | | | | | * Fixes #879 * Fixes #714 | ||||
* | | Implemented bed homes | Tiger Wang | 2014-06-01 | 1 | -0/+2 |
| | | | | | | | | | | | | + Implemented bed home positions * Fixed some inventory and health server/client mismatches after world change | ||||
* | | Very minor code changes | Tiger Wang | 2014-05-29 | 2 | -2/+2 |
| | | |||||
* | | Cauldrons fill | Tiger Wang | 2014-05-29 | 2 | -0/+17 |
|/ | |||||
* | Fixed cWither::KilledBy | andrew | 2014-05-21 | 1 | -0/+1 |
| | |||||
* | Cleaned up cPlayer::UpdateMovementStats; Wither achievements | andrew | 2014-05-20 | 1 | -0/+27 |
| | |||||
* | Fixed compile problem. | STRWarrior | 2014-05-10 | 1 | -1/+1 |
| | |||||
* | A portal block now chooses a number between 2000 and 0 | STRWarrior | 2014-05-10 | 1 | -1/+1 |
| | |||||
* | Each time a portal block receives a tick it has a 1 in 500 chance of spawning a zombie pigman. | STRWarrior | 2014-05-10 | 1 | -0/+14 |
| | |||||
* | Fixed MSVC 64-bit build warnings. | Mattes D | 2014-05-09 | 3 | -6/+6 |
| | |||||
* | Superfluous method override. | Howaner | 2014-05-07 | 1 | -6/+0 |
| | |||||
* | Add lava and water check to block handlers. | Howaner | 2014-05-07 | 2 | -2/+14 |
| | |||||
* | Rename CanChangeDirtToGrass to CanDirtGrowGrass | Howaner | 2014-05-07 | 6 | -9/+9 |
| | |||||
* | Merge branch 'master' into Slabs | Howaner | 2014-05-07 | 8 | -11/+59 |
|\ | |||||
| * | Add clicks, exp subtraction, item check, ... | Howaner | 2014-05-05 | 1 | -1/+1 |
| | | |||||
| * | Add anvil window and slot area. | Howaner | 2014-05-05 | 1 | -0/+7 |
| | | |||||
| * | Fixed portal Z direction loop coding failure | Tiger Wang | 2014-05-04 | 1 | -10/+9 |
| | | | | | | | | | | * Fixed portals created in the ZP/ZM direction eating its frame * Changed return type of a function | ||||
| * | Missed these CMakeLists. | archshift | 2014-04-25 | 1 | -0/+1 |
| | | |||||
| * | The new leaves don't decay anymore. | STRWarrior | 2014-04-23 | 1 | -0/+1 |
| | | | | | | | | Fixes #792 | ||||
| * | Merge pull request #909 from jfhumann/fixes | Mattes D | 2014-04-22 | 2 | -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 code | jfhumann | 2014-04-18 | 2 | -1/+2 |
| | | | |||||
| * | | Fixed Errors | daniel0916 | 2014-04-07 | 1 | -1/+1 |
| | | | |||||
| * | | Merge remote-tracking branch 'upstream/master' into Enchanting | daniel0916 | 2014-04-07 | 68 | -889/+2086 |
| |\| | |||||
| * | | first changes for enchanting (not finished) | daniel0916 | 2014-01-20 | 2 | -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 import | Howaner | 2014-04-06 | 2 | -3/+2 |
| | | | |||||
* | | | Merge branch 'master' into Slabs | Howaner | 2014-04-06 | 4 | -7/+154 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge pull request #840 from Howaner/NewBlocks | Mattes D | 2014-04-04 | 3 | -5/+152 |
| |\ \ | | | | | | | | | Add tall flower handler. | ||||
| | * | | Change CanBeAt() from big flower | Howaner | 2014-04-03 | 1 | -5/+1 |
| | | | | |||||
| | * | | Add "a_RelY < cChunkDef::Height" to BlockBigFlower | Howaner | 2014-03-29 | 1 | -0/+1 |
| | | | | |||||
| | * | | Add tallgrass drop to big flowers. | Howaner | 2014-03-28 | 2 | -8/+59 |
| | | | | | | | | | | | | Add tallgrass drop, when a players break a tallgrass with the shear. | ||||
| | * | | door -> flower | Howaner | 2014-03-28 | 1 | -1/+1 |
| | | | | |||||
| | * | | Add tall flower handler. | Howaner | 2014-03-28 | 2 | -0/+99 |
| | | | | |||||
| * | | | Fixed Clang warnings in itemhandlers. | madmaxoft | 2014-04-04 | 1 | -2/+2 |
| | | | | |||||
* | | | | Add CanChangeDirtToGrass function to Block Handlers. | Howaner | 2014-04-06 | 6 | -3/+33 |
| | | | | |||||
* | | | | Merge branch 'master' into Slabs | Howaner | 2014-04-03 | 51 | -444/+1111 |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: src/Blocks/BlockDirt.h | ||||
| * | | | Merge pull request #849 from mc-server/minorfixes | Mattes D | 2014-04-02 | 2 | -33/+12 |
| |\ \ \ | | | | | | | | | | | Minor fixes | ||||
| | * | | | With eXtra line! | Tiger Wang | 2014-04-02 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | Removed extra brackets | Tiger Wang | 2014-04-02 | 1 | -5/+2 |
| | | | | | |||||
| | * | | | Realised suggestions | Tiger Wang | 2014-03-31 | 1 | -1/+4 |
| | | | | | |||||
| | * | | | Simplified and fixed slabs, fixes #835 | Tiger Wang | 2014-03-31 | 1 | -33/+10 |
| | | | | | |||||
| | * | | | Fixed a few Y too high/low asserts | Tiger Wang | 2014-03-31 | 1 | -2/+3 |
| | | | | | |||||
| * | | | | Merge pull request #831 from mc-server/Wither | Mattes D | 2014-04-02 | 1 | -3/+105 |
| |\ \ \ \ | | | | | | | | | | | | | Wither | ||||
| | * | | | | Fixed clang compilation | andrew | 2014-03-25 | 1 | -13/+16 |
| | | | | | | |||||
| | * | | | | Fixed wither summoning | andrew | 2014-03-25 | 1 | -1/+24 |
| | | | | | | |||||
| | * | | | | Protocol: Wither metadata | andrew | 2014-03-25 | 1 | -3/+79 |
| | | | | | | |||||
| * | | | | | Fixed clang warnings in BlockHandlers. | madmaxoft | 2014-04-01 | 4 | -5/+6 |
| | | | | | | |||||
| * | | | | | Simplified the anvil placement code. | madmaxoft | 2014-04-01 | 1 | -11/+9 |
| | | | | | | |||||
| * | | | | | Fixed a few Clang warnings in BlockHandlers. | madmaxoft | 2014-03-30 | 11 | -48/+54 |
| | |/ / / | |/| | | | |||||
| * | | | | Fixed a few clang warnings. | madmaxoft | 2014-03-30 | 1 | -0/+6 |
| | | | | | |||||
| * | | | | Merge pull request #834 from narroo/issue503 | Mattes D | 2014-03-30 | 23 | -121/+372 |
| |\ \ \ \ | | | | | | | | | | | | | Issue503 pull Request | ||||
| | * | | | | Added in MetaMirrorXY and MetaMirrorYZ to cBlockSignHandler. | narroo | 2014-03-29 | 1 | -0/+19 |
| | | | | | | |||||
| | * | | | | Altered the rotates for cBlockSignHandler. The functions as a whole is still unfinished though; no wall sign or mirroring support yet. | narroo | 2014-03-26 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | Fixed Minor typos. | narroo | 2014-03-26 | 3 | -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....) | narroo | 2014-03-25 | 1 | -2/+8 |
| | | | | | | |||||
| | * | | | | Fixed spelling; Rotater to Rotator. | narroo | 2014-03-25 | 15 | -46/+46 |
| | | | | | | |||||
| | * | | | | Changed Rotater to Rotator. Added partial sign post rotation support. | narroo | 2014-03-25 | 2 | -0/+12 |
| | | | | | | |||||
| | * | | | | Added MetaRotate/Mirror Support for a number of classes. | narroo | 2014-03-24 | 12 | -84/+295 |
| | | | | | | |||||
| * | | | | | Merge pull request #838 from mc-server/lilypads | worktycho | 2014-03-30 | 2 | -0/+30 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Lilypads | ||||
| | * | | | | | Some fixes to lilypads | Tiger Wang | 2014-03-28 | 1 | -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 placement | Tiger Wang | 2014-03-23 | 2 | -0/+86 |
| | | | | | | | |||||
| * | | | | | | Fixed non-virtual destructors warnings. | madmaxoft | 2014-03-28 | 2 | -2/+4 |
| | |_|_|/ / | |/| | | | | |||||
| * | | | | | Change SpreadSource prefix to ss | Howaner | 2014-03-27 | 2 | -2/+2 |
| | | | | | | |||||
| * | | | | | Wrong if in BlockLeaves | Howaner | 2014-03-27 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Add SpreadSource | Howaner | 2014-03-27 | 4 | -2/+13 |
| | | | | | | |||||
| * | | | | | Add new leaves to all classes. | Howaner | 2014-03-27 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Merge pull request #828 from mc-server/Wither | Mattes D | 2014-03-25 | 1 | -0/+14 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | Wither invulnerability | ||||
| | * | | | | Wither invulnerability | andrew | 2014-03-24 | 1 | -0/+14 |
| | |/ / / | |||||
| * | | | | Merge pull request #829 from Howaner/Cake | Mattes D | 2014-03-24 | 1 | -1/+7 |
| |\ \ \ \ | | |/ / / | |/| | | | Add log pickups. | ||||
| | * | | | Add log pickups. | Howaner | 2014-03-24 | 1 | -1/+7 |
| | | | | | |||||
| * | | | | Merge pull request #782 from mc-server/beds | Mattes D | 2014-03-16 | 3 | -10/+76 |
| |\ \ \ \ | | | | | | | | | | | | | Beds now work properly, fixes #707 | ||||
| | * | | | | Fixed VERIFY | Tiger Wang | 2014-03-09 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Beds now work properly fixes #707 | Tiger Wang | 2014-03-09 | 3 | -10/+76 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixes FS392 Conflicts: src/Blocks/WorldInterface.h src/ClientHandle.cpp | ||||
| * | | | | | Merge pull request #809 from Howaner/BlockEntitys | Mattes D | 2014-03-16 | 2 | -0/+65 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | More entity saving. | ||||
| | * | | | | | Fix anvil pickups. | Howaner | 2014-03-16 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Add anvil direction. | Howaner | 2014-03-16 | 2 | -0/+65 |
| | | |_|/ / | | |/| | | | |||||
| * | | | | | Wrong if in BlockLeaves | Howaner | 2014-03-16 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Add new leaves to all classes. | Howaner | 2014-03-16 | 3 | -2/+4 |
| | |_|/ / | |/| | | | |||||
| * | | | | Change if-clause in BlockCake.h | Howaner | 2014-03-16 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Add cake | Howaner | 2014-03-16 | 2 | -0/+57 |
| |/ / / | |||||
| * / / | Silenced useless MSVC warnings in cMetaRotater. | madmaxoft | 2014-03-09 | 1 | -0/+21 |
| |/ / | |||||
| * | | Merge pull request #775 from worktycho/warnings | Mattes D | 2014-03-09 | 3 | -3/+23 |
| |\ \ | | | | | | | | | Fixed a few warnings | ||||
| | * | | Fixed issues with int vs size_t and a few other warnings | Tycho | 2014-03-08 | 1 | -0/+2 |
| | | | | |||||
| | * | | Merge branch 'master' into warnings | Tycho | 2014-03-08 | 1 | -0/+1 |
| | |\ \ | |||||
| | * | | | Fixed warnings | Tycho | 2014-03-07 | 2 | -3/+21 |
| | | | | | |||||
| * | | | | Merge pull request #729 from worktycho/MetaRotate | Mattes D | 2014-03-08 | 13 | -151/+202 |
| |\ \ \ \ | | |_|/ / | |/| | | | Alternitive solution to #503 | ||||
| | * | | | Moved returns | worktycho | 2014-03-08 | 1 | -3/+3 |
| | | | | | |||||
| | * | | | Reformatted | Tycho | 2014-03-02 | 10 | -20/+20 |
| | | | | | |||||
| | * | | | Reformated MetaRotater | Tycho | 2014-03-02 | 1 | -19/+30 |
| | | | | | |||||
| | * | | | Reverted BlockVine | worktycho | 2014-03-02 | 1 | -3/+27 |
| | | | | | |||||
| | * | | | Fixed errors | Tycho | 2014-03-01 | 2 | -2/+2 |
| | | | | | |||||
| | * | | | Revesed typedef | Tycho | 2014-03-01 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Implemented Rotations | Tycho | 2014-03-01 | 11 | -170/+28 |
| | | | | | |||||
| | * | | | Merge branch 'master' into MetaRotate | Tycho | 2014-03-01 | 1 | -9/+22 |
| | |\ \ \ | |||||
| | * | | | | Final implementation of MetaRotater | Tycho | 2014-03-01 | 1 | -45/+51 |
| | | | | | | |||||
| | * | | | | Added some Metadate rotaters using templated Mixin | Tycho | 2014-02-27 | 10 | -16/+168 |
| | | | | | | |||||
| * | | | | | cBlockInfo-related changes from #723 | andrew | 2014-03-08 | 1 | -0/+1 |
| | |_|/ / | |/| | | | |||||
| * | | | | Merge pull request #763 from Howaner/BlockEntitys | Mattes D | 2014-03-07 | 2 | -82/+6 |
| |\ \ \ \ | | | | | | | | | | | | | Add Flower Pots | ||||
| | * | | | | Add Lua Bindings for FlowerPotEntity.h and add documentation. | Howaner | 2014-03-07 | 1 | -2/+3 |
| | | | | | | |||||
| | * | | | | Add Flower Pots | Howaner | 2014-03-07 | 1 | -80/+3 |
| | | | | | | |||||
| * | | | | | Fix comment | Howaner | 2014-03-06 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Add SendBlockTo to cWorldInterface | Howaner | 2014-03-05 | 8 | -9/+17 |
| | | | | | | |||||
| * | | | | | Set tnt step sound to step.grass | Howaner | 2014-03-05 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Add data backsending, when the Client interacts a Block and the Interact is cancelled. | Howaner | 2014-03-05 | 9 | -2/+92 |
| |/ / / / | |||||
| * | | | | Merge pull request #746 from Howaner/Slabs | Mattes D | 2014-03-03 | 1 | -1/+3 |
| |\ \ \ \ | | | | | | | | | | | | | Add Trapdoor Functions to cWorld and fix Trapdoor Redstone Bugs | ||||
| * | | | | | cBlockInfo now manages the respective cBlockHandler | andrew | 2014-03-02 | 3 | -63/+6 |
| | | | | | | |||||
| * | | | | | Merge pull request #738 from xdot/master | Mattes D | 2014-03-02 | 11 | -15/+15 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Refactored global block property arrays | ||||
| | * | | | | | g_BlockXXX => cBlockInfo::XXX | andrew | 2014-03-01 | 11 | -15/+15 |
| | | |_|/ / | | |/| | | | |||||
| * | | | | | Merge pull request #733 from Howaner/Slabs | Mattes D | 2014-03-02 | 1 | -12/+21 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | Fix Double Slabs, fix Slab Meta and add more things to burnable | ||||
| * | | | | | Forgotten changes to cChunkInterface. | madmaxoft | 2014-03-01 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Removed cBlockHandler forward declaration from cChunkInterface. | madmaxoft | 2014-03-01 | 1 | -9/+22 |
| | |_|/ / | |/| | | | | | | | | | | | | | Wasn't needed. Also reformatted the code. | ||||
* | | | | | Remove old function | Howaner | 2014-04-03 | 1 | -6/+0 |
| | | | | | |||||
* | | | | | Grass now grows under up-side-down slabs | Howaner | 2014-04-03 | 1 | -3/+12 |
| |_|/ / |/| | | | |||||
* | | | | Add Trapdoor Functions to cWorld and fix Trapdoor Redstone Bugs | Howaner | 2014-03-02 | 1 | -1/+3 |
| |/ / |/| | | |||||
* | | | Use switch in GetStepSound | Howaner | 2014-02-28 | 1 | -7/+5 |
| | | | |||||
* | | | Fix Double Slabs, fix Slab Meta and add more things to burnable | Howaner | 2014-02-28 | 1 | -12/+23 |
|/ / | |||||
* | | Merge pull request #704 from Howaner/GlobalFixes | Mattes D | 2014-02-20 | 1 | -9/+15 |
|\ \ | | | | | | | Global fixes | ||||
| * | | Fix Cauldron | Howaner | 2014-02-20 | 1 | -8/+11 |
| | | | |||||
| * | | Add 'Meta < 3' to Cauldron | Howaner | 2014-02-20 | 1 | -5/+8 |
| | | | |||||
* | | | Merge pull request #702 from TheJumper/master | Mattes D | 2014-02-20 | 1 | -7/+18 |
|\ \ \ | |/ / |/| | | BlockBed.cpp: Fixed Multiple people in one bed. | ||||
| * | | BlockBed.cpp: Fixed space at if statement | TheJumper | 2014-02-20 | 1 | -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. | TheJumper | 2014-02-20 | 1 | -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/GlobalFixes | Mattes D | 2014-02-20 | 3 | -0/+48 |
|\ \ \ | |/ / |/| | | Add new Trees (without Generator) | ||||
| * | | Add BlockNewLeaves.h and rename Darkoac to Darkoak | Howaner | 2014-02-19 | 1 | -0/+42 |
| | | | |||||
| * | | Add new Trees (without Generator) | Howaner | 2014-02-19 | 2 | -0/+6 |
| | | | |||||
* | | | Rename SkullEntity to MobHeadEntity | Howaner | 2014-02-19 | 2 | -10/+10 |
| | | | |||||
* | | | Add Heads completely | Howaner | 2014-02-18 | 2 | -0/+71 |
|/ / | |||||
* | | Fixed compile and some warnings in MSVS | Tiger Wang | 2014-02-09 | 3 | -3/+3 |
| | | |||||
* | | Merge branch 'master' into playerimprovements | Tiger Wang | 2014-02-09 | 35 | -93/+167 |
|\ \ | | | | | | | | | | | | | Conflicts: MCServer/Plugins/APIDump/APIDesc.lua | ||||
| * \ | Merge pull request #644 from worktycho/warningfixes | Mattes D | 2014-02-04 | 35 | -89/+91 |
| |\ \ | | | | | | | | | Improved Type safety of eBlockFace | ||||
| | * | | Fix gcc not having operator ++ on enums | Tycho | 2014-02-04 | 1 | -6/+7 |
| | | | | |||||
| | * | | Improved Type safety of eBlockFace | Tycho | 2014-02-04 | 35 | -85/+86 |
| | | | | | | | | | | | | | | | | May Fix #640 | ||||
| * | | | Fixed chest placement. | madmaxoft | 2014-02-04 | 1 | -2/+4 |
| |/ / | | | | | | | | | | Fixes #624. | ||||
| * | | Named the different quartz block. | STRWarrior | 2014-02-03 | 1 | -1/+1 |
| | | | |||||
| * | | Fixed some issues. | STRWarrior | 2014-02-03 | 1 | -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. | STRWarrior | 2014-02-03 | 2 | -4/+4 |
| | | | |||||
| * | | This renames the cBlockWoodHandler to cBlockSidewaysHandler, and implements a new cBlockQuartzHandler to handle the quartz pillars. | STRWarrior | 2014-02-03 | 3 | -5/+74 |
| | | | |||||
* | | | Server internally uses new functions | Tiger Wang | 2014-02-06 | 1 | -1/+1 |
| | | | |||||
* | | | Fixed a bunch of MSVS warnings | Tiger Wang | 2014-02-05 | 3 | -4/+4 |
| | | | | | | | | | | | | | | | * Possibly also fixed some bugs with pathfinding and TNT, though unlikely | ||||
* | | | Fixed issues with farmland | Tiger Wang | 2014-02-03 | 2 | -1/+3 |
|/ / | | | | | | | | | | | * Fixed farmland reversion checks not taking into account carrots and potatoes * Fixed #623 | ||||
* | | Merge branch 'master' of https://github.com/mc-server/MCServer | Tiger Wang | 2014-02-02 | 58 | -372/+515 |
|\ \ | |||||
| * | | Fixed dark oak and acacia placement. | madmaxoft | 2014-02-02 | 1 | -0/+1 |
| | | | | | | | | | | | | Fixes #621. | ||||
| * | | Added missing files | Tycho | 2014-02-02 | 2 | -0/+20 |
| | | | |||||
| * | | Merge branch 'master' into GeneratingBenchmark2 | Tycho | 2014-02-02 | 1 | -1/+2 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: src/Blocks/BlockTorch.h | ||||
| * | | | Changed Signiture of OnUpdate | Tycho | 2014-02-02 | 13 | -26/+27 |
| | | | | |||||
| * | | | Changed Signiture of OnDigging | Tycho | 2014-02-01 | 3 | -4/+4 |
| | | | | |||||
| * | | | Changed Signiture of OnDestroyedByPlayer | Tycho | 2014-02-01 | 11 | -13/+23 |
| | | | | |||||
| * | | | Changed pointers to references | Tycho | 2014-02-01 | 51 | -230/+230 |
| | | | | |||||
| * | | | Changed signitures of Several BLockHandler Methods | Tycho | 2014-02-01 | 49 | -185/+194 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the signitures of the following to use interfaces: GetPlacementBlockTypeMeta OnPlaced OnPlacedByPlayer OnDestroyed OnNeighbourChanged NeighbourChanged OnUse CanBeAt Check | ||||
| * | | | Removed cWorld Include | Tycho | 2014-01-26 | 3 | -3/+0 |
| | | | | |||||
| * | | | Refactored GetPlacementBlockTypeMeta | Tycho | 2014-01-26 | 5 | -8/+6 |
| | | | | |||||
| * | | | Merge branch 'master' into GeneratingBenchmark2 | Tycho | 2014-01-26 | 1 | -9/+19 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Blocks/BlockRail.h src/World.h | ||||
| * | | | | Refactored cBlockHandler::OnUse and dependents | Tycho | 2014-01-26 | 15 | -142/+208 |
| | | | | | |||||
| * | | | | First attempt at Implementing Interfaces | Tycho | 2014-01-25 | 17 | -33/+74 |
| | |_|/ | |/| | | |||||
* | | | | Fixed #624 | Tiger Wang | 2014-02-02 | 1 | -0/+6 |
| |_|/ |/| | | |||||
* | | | Fixed #620 | Tiger Wang | 2014-02-02 | 1 | -1/+2 |
| |/ |/| | |||||
* | | Merge pull request #589 from mc-server/minecartimprovements | Mattes D | 2014-01-26 | 1 | -9/+19 |
|\ \ | |/ |/| | Minecart improvements | ||||
| * | Fixed weird meta with curved rails | Tiger Wang | 2014-01-19 | 1 | -5/+15 |
| | | |||||
| * | Added more rail functionality | Tiger Wang | 2014-01-19 | 1 | -4/+4 |
| | | |||||
* | | Improved command blocks | Tiger Wang | 2014-01-19 | 2 | -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. | madmaxoft | 2014-01-17 | 11 | -16/+16 |
| | |||||
* | Fixed #535 | Tiger Wang | 2014-01-16 | 1 | -1/+1 |
| | |||||
* | Removed obsoleted functions | Tiger Wang | 2014-01-16 | 11 | -13/+13 |
| | |||||
* | Merge pull request #529 from mc-server/derpstonerefactor | Alexander Harkness | 2014-01-12 | 2 | -4/+4 |
|\ | | | | | Major refactoring of redstone | ||||
| * | Renamed g_TorchPlaceable... | Tiger Wang | 2014-01-11 | 2 | -4/+4 |
| | | | | | | | | ...to g_FullyOccupiesVoxel, as recommended by @bearbin | ||||
* | | Fixed glowstone drop count | andrew | 2014-01-11 | 1 | -2/+2 |
|/ | |||||
* | converted commneted paramater names to the unused macro | Tycho Bickerstaff | 2013-12-22 | 1 | -1/+5 |
| | |||||
* | Merge branch 'master' of github.com:mc-server/MCServer | Tycho Bickerstaff | 2013-12-22 | 3 | -1/+99 |
|\ | |||||
| * | Merge pull request #461 from mc-server/repeaters | Mattes D | 2013-12-26 | 1 | -0/+34 |
| |\ | | | | | | | Repeaters, pressure plates, and others | ||||
| | * | Fixed rails not updating with diagonals | Tiger Wang | 2013-12-25 | 1 | -0/+34 |
| | | | |||||
| * | | Merge branch 'fixes&features' of git://github.com/tonibm19/MCServer | madmaxoft | 2013-12-25 | 1 | -9/+58 |
| |\ \ | |||||
| | * | | (Hopefully) fixed if conditions | tonibm19 | 2013-12-25 | 1 | -4/+1 |
| | | | | |||||
| | * | | Implemented xoft suggestion (partly) | tonibm19 | 2013-12-25 | 1 | -25/+29 |
| | | | | | | | | | | | | I only get it working in first condition. It seems it's not compatible with else if... | ||||
| | * | | BLOCKTYPE... | tonibm19 | 2013-12-24 | 1 | -2/+2 |
| | | | | |||||
| | * | | Fixed compilation | tonibm19 | 2013-12-24 | 1 | -29/+9 |
| | | | | |||||
| | * | | Implemented xoft suggestion | tonibm19 | 2013-12-24 | 1 | -7/+11 |
| | | | | |||||
| | * | | Using BLOCKTYPE instead of int | tonibm19 | 2013-12-24 | 1 | -2/+2 |
| | | | | |||||
| | * | | Fixed comments | tonibm19 | 2013-12-24 | 1 | -8/+8 |
| | | | | |||||
| | * | | Changed a little how detection works and added comments. | tonibm19 | 2013-12-24 | 1 | -28/+31 |
| | | | | |||||
| | * | | Storing Y -1 and -2 blocks in a variable | tonibm19 | 2013-12-24 | 1 | -5/+7 |
| | | | | |||||
| | * | | Using parenthesis | tonibm19 | 2013-12-24 | 1 | -8/+8 |
| | | | | |||||
| | * | | Fixed a possible crash | tonibm19 | 2013-12-24 | 1 | -39/+42 |
| | | | | |||||
| | * | | Improved iron golem detection algorithm | tonibm19 | 2013-12-23 | 1 | -3/+16 |
| | | | | | | | | | | | | | | | | - You need to make it like in vanilla - Only used blocks are removed | ||||
| | * | | You can now spawn iron golems. | tonibm19 | 2013-12-23 | 1 | -3/+20 |
| |/ / | | | | | | | You can spawn them like in vanilla. | ||||
| * | | You can spawn snow golems with snow blocks and pumpkins. | STRWarrior | 2013-12-22 | 1 | -0/+15 |
| | | | |||||
| * | | Fixed cacus breaking when next to any non-air block. | STRWarrior | 2013-12-22 | 1 | -1/+1 |
| | | | |||||
* | | | Piston is now warnings clean | Tycho Bickerstaff | 2013-12-21 | 1 | -1/+1 |
|/ / | |||||
* | | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-20 | 6 | -10/+10 |
|\| | |||||
| * | Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT). | madmaxoft | 2013-12-20 | 4 | -5/+5 |
| | | |||||
| * | Fixed melon and pumpkin growing. | madmaxoft | 2013-12-20 | 1 | -1/+1 |
| | | |||||
| * | Fixed missing parenthesis. | madmaxoft | 2013-12-20 | 1 | -4/+4 |
| | | |||||
* | | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-19 | 1 | -1/+1 |
|\| | |||||
| * | Fixed assertion during dirt block OnUpdate() | Tiger Wang | 2013-12-20 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-19 | 1 | -1/+1 |
|\| | |||||
| * | Fixed dust from being placed on nonsolids | Tiger Wang | 2013-12-19 | 1 | -1/+1 |
| | | |||||
* | | added blocks and blockentities | Tycho Bickerstaff | 2013-12-19 | 1 | -1/+5 |
| | | |||||
* | | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-18 | 2 | -0/+54 |
|\| | |||||
| * | Implented Nether Wart. | STRWarrior | 2013-12-18 | 2 | -0/+54 |
| | | |||||
* | | Merge branch 'master' of github.com:mc-server/MCServer into cmake | Tycho Bickerstaff | 2013-12-11 | 1 | -7/+6 |
|\| | |||||
| * | Merge branch 'master' into quickfixs | Tycho Bickerstaff | 2013-12-11 | 1 | -1/+1 |
| |\ | |||||
| * | | fixed unused expression warnings in blockFire | Tycho Bickerstaff | 2013-12-10 | 1 | -7/+6 |
| | | | |||||
* | | | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-11 | 1 | -1/+1 |
|\ \ \ | | |/ | |/| | |||||
| * | | Provides a possible fix for repeater timings | Tiger Wang | 2013-12-10 | 1 | -1/+1 |
| |/ | | | | | | | Not completely reliable, but at least some types of clock work. | ||||
* / | more cmake stuff | Tycho Bickerstaff | 2013-12-10 | 1 | -0/+7 |
|/ | |||||
* | Improved pickups spawning speed again | Tiger Wang | 2013-12-10 | 1 | -3/+2 |
| | |||||
* | Readded redstone lamp handler | Tiger Wang | 2013-12-08 | 1 | -0/+2 |
| | |||||
* | Merge branch 'master' of https://github.com/mc-server/MCServer into fixesnfeatures | Tiger Wang | 2013-12-08 | 1 | -4/+3 |
|\ | | | | | | | | | | | | | Conflicts: src/Bindings/Bindings.cpp src/Bindings/Bindings.h src/Blocks/BlockHandler.cpp | ||||
| * | Moved bindings-related to a Bindings subfolder. | madmaxoft | 2013-12-08 | 1 | -1/+1 |
| | | | | | | | | Ref.: #407 | ||||
| * | Fixed stationary water starting fires and flowing lava not. | madmaxoft | 2013-12-08 | 1 | -2/+2 |
| | | |||||
* | | Fixed water starting fires | Tiger Wang | 2013-12-07 | 1 | -1/+0 |
| | | |||||
* | | Fixed some new 1.7 client crash bugs | Tiger Wang | 2013-12-07 | 3 | -0/+35 |
| | | | | | | | | | | Some technical blocks were removed; trying to render them as items caused a crash. | ||||
* | | Added basic ender chests | Tiger Wang | 2013-12-07 | 2 | -4/+46 |
| | | | | | | | | Note that they just mirror chests now, so no per player inventory. | ||||
* | | Fixed duplication glitch with QueueSetBlock | Tiger Wang | 2013-12-06 | 1 | -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 detection | Tiger Wang | 2013-12-06 | 1 | -2/+0 |
| | | |||||
* | | Fixed trapdoors not overriding OnUse | Tiger Wang | 2013-12-06 | 1 | -1/+1 |
| | | |||||
* | | Cleaned up torch code and added comments | Tiger Wang | 2013-12-06 | 1 | -31/+7 |
| | | |||||
* | | Removed another export and inline'd stuff | Tiger Wang | 2013-12-06 | 1 | -5/+5 |
| | | |||||
* | | Removed exporting of a torch function | Tiger Wang | 2013-12-06 | 1 | -3/+3 |
|/ | |||||
* | Lava can spawn fire. | madmaxoft | 2013-12-04 | 2 | -6/+87 |
| | | | | Settable in world.ini, lava can spawn fire to fuel blocks near it. Fix #65. | ||||
* | Merge pull request #387 from mc-server/trapdoors | Mattes D | 2013-11-30 | 16 | -240/+261 |
|\ | | | | | Trapdoors, redstone fixes, and snow | ||||
| * | Fixed thin snow CanBeAt checking | Tiger Wang | 2013-11-30 | 1 | -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 #264 | Tiger Wang | 2013-11-30 | 2 | -16/+39 |
| | | |||||
| * | Stairs reset meta when dropped, fixes #269 | Tiger Wang | 2013-11-29 | 1 | -2/+22 |
| | | | | | | | | Additionally, they now have walking sounds. | ||||
| * | Implemented trapdoors, fixes #43 and #105 | Tiger Wang | 2013-11-29 | 2 | -0/+110 |
| | | | | | | | | Also updated redstone simulator to support it | ||||
| * | Removed unneeded CPP files | Tiger Wang | 2013-11-29 | 11 | -221/+77 |
| | | | | | | | | Also removed unneeded #include in BlockStems | ||||
* | | Changed cBlockHandler->OnUpdate() to use cChunk directly. | madmaxoft | 2013-11-30 | 10 | -56/+73 |
| | | |||||
* | | Grass doesn't spread to podzol or grassless dirt blocks. | madmaxoft | 2013-11-30 | 1 | -2/+3 |
|/ | |||||
* | Merged master into redstonefixes | Tiger Wang | 2013-11-27 | 5 | -12/+56 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into foldermove2 | Alexander Harkness | 2013-11-24 | 8 | -38/+87 |
| | | | | | Conflicts: GNUmakefile | ||||
* | Moved source to src | Alexander Harkness | 2013-11-24 | 69 | -0/+5903 |