Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Added type to block type enum. | Mattes D | 2014-10-26 | 1 | -1/+11 |
| | |||||
* | Merge branch 'master' into issue850 | Alexander Harkness | 2014-10-11 | 1 | -13/+87 |
|\ | | | | | | | | | Conflicts: src/BlockID.h | ||||
| * | Fixed eMonsterType Lua API mismatch. | madmaxoft | 2014-10-05 | 1 | -3/+0 |
| | | |||||
| * | Fix spelling of PRISMRAINE | Alexander Harkness | 2014-10-02 | 1 | -1/+1 |
| | | | | | | Fixes #1497 | ||||
| * | Fixed Red Sandstone and Prismarine drops | Masy98 | 2014-10-01 | 1 | -7/+7 |
| | | |||||
| * | Fixed ":" | Masy98 | 2014-10-01 | 1 | -11/+11 |
| | | |||||
| * | Added missing 1.8 blocks, E_METAs and sounds | Masy98 | 2014-10-01 | 1 | -6/+47 |
| | | |||||
| * | Fixed 1.8 dirt types | Howaner | 2014-09-30 | 1 | -0/+1 |
| | | |||||
| * | Tabs -> spaces | w00tc0d3 | 2014-09-29 | 1 | -4/+4 |
| | | |||||
| * | BlockStone: drop the right cobblestone on onBreak(). | netchip | 2014-09-29 | 1 | -0/+6 |
| | | | | | | | | Signed-off-by: netchip <w00tc0d3@outlook.com> | ||||
| * | Fixed 1.8 Item stacking and block harvesting | Masy98 | 2014-09-12 | 1 | -1/+1 |
| | | |||||
| * | Added barrier block | Masy98 | 2014-09-11 | 1 | -0/+1 |
| | | |||||
| * | Added 1.8 food to the food list | Masy98 | 2014-09-11 | 1 | -1/+1 |
| | | |||||
| * | Added new blocks to the BlockInfo | Masy98 | 2014-09-10 | 1 | -12/+12 |
| | | |||||
| * | Added 1.8 Blocks and Items | Masy98 | 2014-09-10 | 1 | -0/+37 |
| | | |||||
| * | Fixed style and alpha-sorting. | madmaxoft | 2014-09-03 | 1 | -2/+2 |
| | | |||||
| * | Added mutton, which sheep now drop when killed | archshift | 2014-09-03 | 1 | -0/+2 |
| | | |||||
* | | Fixed typo and removed useless right side up slab meta. | Alexander Harkness | 2014-10-11 | 1 | -2/+1 |
| | | |||||
* | | Renamed NEWLEAVES and NEWLOG to LEAVES and LOG. | archshift | 2014-07-30 | 1 | -34/+34 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into issue850 | archshift | 2014-07-29 | 1 | -7/+16 |
|\| | | | | | | | | | | | Conflicts: src/Blocks/BlockLeaves.h src/Generating/Trees.cpp | ||||
| * | Suggestions | Tiger Wang | 2014-07-21 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' into portals | Tiger Wang | 2014-07-18 | 1 | -6/+9 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | Normalized comments. | madmaxoft | 2014-07-17 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | 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 spaces around single-line comments. | madmaxoft | 2014-07-17 | 1 | -1/+1 |
| | | | | | | | | | | | | There should be at least two spaces in front and one space after //-style comments. | ||||
| | * | Fixed basic whitespace problems. | madmaxoft | 2014-07-17 | 1 | -2/+2 |
| | | | | | | | | | | | | Indenting by spaces and alignment by spaces, as well as trailing whitespace on non-empty lines. | ||||
| | * | Reformatted cItemPotionHandler. | madmaxoft | 2014-07-17 | 1 | -1/+2 |
| | | | |||||
| | * | Added wither damage type, wither entity effect. | archshift | 2014-06-17 | 1 | -0/+2 |
| | | | |||||
| * | | Merge branch 'master' into portals | Tiger Wang | 2014-06-10 | 1 | -0/+1 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/Entities/Player.cpp src/Entities/Player.h src/Protocol/Protocol125.cpp src/Protocol/Protocol17x.cpp | ||||
| | * | Fixed deadlock when moving players to other worlds. | Mattes D | 2014-06-08 | 1 | -0/+1 |
| | | | | | | | | | | | | Fixes #1039, fixes #851 | ||||
| * | | Portal improvements and suggestions | Tiger Wang | 2014-06-10 | 1 | -1/+6 |
| |/ | |||||
* | | Spacing fixes and a few more BLOCK_META constants. | narroo | 2014-07-02 | 1 | -131/+152 |
| | | |||||
* | | Fixed E_META_...Typos in BlockID.h | narroo | 2014-06-08 | 1 | -10/+0 |
| | | |||||
* | | Fixed some E_META_*** Names | narroo | 2014-05-20 | 1 | -71/+67 |
| | | |||||
* | | Fixed Formmating | narroo | 2014-04-28 | 1 | -69/+69 |
| | | |||||
* | | Added some E_META_* values to BlockID.h | narroo | 2014-04-28 | 1 | -20/+120 |
|/ | |||||
* | Implemented weighted pressure plates | Tiger Wang | 2014-04-17 | 1 | -0/+4 |
| | |||||
* | Change SpreadSource prefix to ss | Howaner | 2014-03-27 | 1 | -5/+5 |
| | |||||
* | Add SpreadSource | Howaner | 2014-03-27 | 1 | -0/+13 |
| | |||||
* | Fixed code style after recent merge. | madmaxoft | 2014-03-20 | 1 | -1/+5 |
| | |||||
* | ENUMified shrapnel level | Tiger Wang | 2014-03-20 | 1 | -4/+8 |
| | |||||
* | Removed g_BlockXXX arrays | andrew | 2014-03-02 | 1 | -14/+0 |
| | |||||
* | Better Jukebox API | Howaner | 2014-02-21 | 1 | -0/+4 |
| | |||||
* | Add BlockNewLeaves.h and rename Darkoac to Darkoak | Howaner | 2014-02-19 | 1 | -6/+6 |
| | |||||
* | Add new Trees (without Generator) | Howaner | 2014-02-19 | 1 | -0/+2 |
| | |||||
* | Implemented paintings, fixes #689 | Tiger Wang | 2014-02-18 | 1 | -1/+1 |
| | | | | + Implemented paintings | ||||
* | Merge pull request #633 from mc-server/More_Sideways_Blocks | Mattes D | 2014-02-03 | 1 | -0/+5 |
|\ | | | | | More sideways blocks. | ||||
| * | Named the different quartz block. | STRWarrior | 2014-02-03 | 1 | -0/+5 |
| | | |||||
* | | TNT improvements | Tiger Wang | 2014-02-02 | 1 | -0/+1 |
|/ | | | | | | + Added entity damage + Added entity propulsion * Fixed #67 and fixed #230 | ||||
* | Merge pull request #529 from mc-server/derpstonerefactor | Alexander Harkness | 2014-01-12 | 1 | -1/+1 |
|\ | | | | | Major refactoring of redstone | ||||
| * | Renamed g_TorchPlaceable... | Tiger Wang | 2014-01-11 | 1 | -1/+1 |
| | | | | | | | | ...to g_FullyOccupiesVoxel, as recommended by @bearbin | ||||
* | | Move biome definition to separate files | Bill Derouin | 2014-01-09 | 1 | -3/+0 |
|/ | |||||
* | Replaced esCreeper with esMonster. | madmaxoft | 2013-12-23 | 1 | -2/+5 |
| | | | | Any monster will be able to explode, and also this fixes #425. | ||||
* | Merge pull request #387 from mc-server/trapdoors | Mattes D | 2013-11-30 | 1 | -3/+2 |
|\ | | | | | Trapdoors, redstone fixes, and snow | ||||
| * | Implemented trapdoors, fixes #43 and #105 | Tiger Wang | 2013-11-29 | 1 | -3/+2 |
| | | | | | | | | Also updated redstone simulator to support it | ||||
* | | Alpha-sorted BlockMetas, added red sand. | madmaxoft | 2013-11-29 | 1 | -125/+128 |
| | | |||||
* | | Added new biomes to old composition generator. | madmaxoft | 2013-11-28 | 1 | -0/+4 |
|/ | | | | Mostly placeholders only, true per-biome characteristics still need to be implemented. This is only to test the new biome generators. | ||||
* | Moved source to src | Alexander Harkness | 2013-11-24 | 1 | -0/+907 |