Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
| * | 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 |
| | | |||||
* | | 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. | ||||
* | 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 |