Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into saplingsandleaves | Tiger Wang | 2014-07-20 | 1 | -25/+25 |
|\ | | | | | | | | | | | Conflicts: src/Bindings/DeprecatedBindings.cpp src/Blocks/BlockSapling.h | ||||
| * | Fixed style: spaces after commas. | madmaxoft | 2014-07-19 | 1 | -19/+19 |
| | | |||||
| * | Normalized comments. | madmaxoft | 2014-07-17 | 1 | -9/+9 |
| | | | | | | | | | | 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. | ||||
* | | Fixed issues relating to saplings and leaves | Tiger Wang | 2014-07-17 | 1 | -27/+0 |
|/ | | | | | | - Removed cBlockInfo::RequiresSpecialTool * Fixes #1195 * Fixes #1201 | ||||
* | Removed the bindings to set old g_BlockXXX arrays. | Mattes D | 2014-04-03 | 1 | -297/+65 |
| | | | | | Those were supposed to be read-only; there's no point in writing to them anyway. Also fixed MSVC type warnings in the code. | ||||
* | More fixes to get it to compile for me on Mac 10.9. Mostly just newline additions, but some of the unused variables were causing errors, so I wrapped them in #ifndef __APPLE__ calls, since I didn't know if they were going to be used in the future. | Samuel Barney | 2014-03-25 | 1 | -0/+1 |
| | | | | Also had to undefine TOLUA_TEMPLATE_BIND a couple of times. | ||||
* | Fixed MSVC warnings in DeprecatedBindings. | madmaxoft | 2014-03-02 | 1 | -8/+76 |
| | |||||
* | GetById => Get | andrew | 2014-03-02 | 1 | -9/+9 |
| | |||||
* | Removed g_BlockXXX arrays | andrew | 2014-03-02 | 1 | -0/+4 |
| | |||||
* | Manually exported g_Block tables | andrew | 2014-03-02 | 1 | -0/+434 |