summaryrefslogtreecommitdiffstats
path: root/src/Blocks (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | Add Trapdoor Functions to cWorld and fix Trapdoor Redstone BugsHowaner2014-03-021-1/+3
| | | |
* | | | 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
| * | Use switch in GetStepSoundHowaner2014-02-281-7/+5
| | |
| * | Fix Double Slabs, fix Slab Meta and add more things to burnableHowaner2014-02-281-12/+23
| |/
* | 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.
* 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-20 18:31:00 +0100