Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into saplingsandleaves | Tiger Wang | 2014-07-22 | 6 | -11/+12 |
|\ | | | | | | | | | Conflicts: src/Defines.h | ||||
| * | 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 |
| | | |||||
* | | Merge branch 'master' into saplingsandleaves | Tiger Wang | 2014-07-20 | 48 | -175/+352 |
|\| | | | | | | | | | | | Conflicts: src/Bindings/DeprecatedBindings.cpp src/Blocks/BlockSapling.h | ||||
| * | 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 | ||||
| * | 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. | ||||
* | | 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 | ||||
* | 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 | ||||
* | 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 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 |
| | | |||||
* | | 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 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 | ||||
* | 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 |