summaryrefslogtreecommitdiffstats
path: root/src/BlockID.h (follow)
Commit message (Collapse)AuthorAgeFilesLines
* SuggestionsTiger Wang2014-07-211-1/+1
|
* Merge branch 'master' into portalsTiger Wang2014-07-181-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.madmaxoft2014-07-171-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.madmaxoft2014-07-171-1/+1
| | | | | | | | There should be at least two spaces in front and one space after //-style comments.
| * Fixed basic whitespace problems.madmaxoft2014-07-171-2/+2
| | | | | | | | Indenting by spaces and alignment by spaces, as well as trailing whitespace on non-empty lines.
| * Reformatted cItemPotionHandler.madmaxoft2014-07-171-1/+2
| |
| * Added wither damage type, wither entity effect.archshift2014-06-171-0/+2
| |
* | Merge branch 'master' into portalsTiger Wang2014-06-101-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 D2014-06-081-0/+1
| | | | | | | | Fixes #1039, fixes #851
* | Portal improvements and suggestionsTiger Wang2014-06-101-1/+6
|/
* Implemented weighted pressure platesTiger Wang2014-04-171-0/+4
|
* Change SpreadSource prefix to ssHowaner2014-03-271-5/+5
|
* Add SpreadSourceHowaner2014-03-271-0/+13
|
* Fixed code style after recent merge.madmaxoft2014-03-201-1/+5
|
* ENUMified shrapnel levelTiger Wang2014-03-201-4/+8
|
* Removed g_BlockXXX arraysandrew2014-03-021-14/+0
|
* Better Jukebox APIHowaner2014-02-211-0/+4
|
* Add BlockNewLeaves.h and rename Darkoac to DarkoakHowaner2014-02-191-6/+6
|
* Add new Trees (without Generator)Howaner2014-02-191-0/+2
|
* Implemented paintings, fixes #689Tiger Wang2014-02-181-1/+1
| | | | + Implemented paintings
* Merge pull request #633 from mc-server/More_Sideways_BlocksMattes D2014-02-031-0/+5
|\ | | | | More sideways blocks.
| * Named the different quartz block.STRWarrior2014-02-031-0/+5
| |
* | TNT improvementsTiger Wang2014-02-021-0/+1
|/ | | | | | + Added entity damage + Added entity propulsion * Fixed #67 and fixed #230
* Merge pull request #529 from mc-server/derpstonerefactorAlexander Harkness2014-01-121-1/+1
|\ | | | | Major refactoring of redstone
| * Renamed g_TorchPlaceable...Tiger Wang2014-01-111-1/+1
| | | | | | | | ...to g_FullyOccupiesVoxel, as recommended by @bearbin
* | Move biome definition to separate filesBill Derouin2014-01-091-3/+0
|/
* Replaced esCreeper with esMonster.madmaxoft2013-12-231-2/+5
| | | | Any monster will be able to explode, and also this fixes #425.
* Merge pull request #387 from mc-server/trapdoorsMattes D2013-11-301-3/+2
|\ | | | | Trapdoors, redstone fixes, and snow
| * Implemented trapdoors, fixes #43 and #105Tiger Wang2013-11-291-3/+2
| | | | | | | | Also updated redstone simulator to support it
* | Alpha-sorted BlockMetas, added red sand.madmaxoft2013-11-291-125/+128
| |
* | Added new biomes to old composition generator.madmaxoft2013-11-281-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 srcAlexander Harkness2013-11-241-0/+907
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-27 23:18:54 +0200