summaryrefslogtreecommitdiffstats
path: root/src/BlockID.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Fixed a ToLua warning - operator = not supported.madmaxoft2014-08-031-1/+1
|
* Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-07-221-1/+2
|\ | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Player.cpp src/Root.cpp src/World.cpp
| * Code style: Fixed braces on separate lines.madmaxoft2014-07-191-1/+2
| |
* | Merge branch 'master' into portalsTiger Wang2014-07-181-1/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Fixed basic whitespace problems.madmaxoft2014-07-171-1/+1
| | | | | | | | Indenting by spaces and alignment by spaces, as well as trailing whitespace on non-empty lines.
| * Added wither damage type, wither entity effect.archshift2014-06-171-0/+3
| |
* | Implemented PR suggestionsarchshift2014-06-161-4/+0
| | | | | | | | | | | | | | Furnace.txt: newline BlockID: removed extraneous dimension mapping cEntity: fixed typo cPlayer: WorldPtr typedef
* | Portal improvements and suggestionsTiger Wang2014-06-101-0/+35
|/
* Fixed warning in BlockID.madmaxoft2014-05-011-1/+1
|
* Removed extraneous switch{} in Start()archshift2014-04-261-2/+3
| | | | Squashed a warning.
* Removed g_BlockXXX arraysandrew2014-03-021-399/+0
|
* Add Light weighted pressure platesHowaner2014-02-201-0/+4
|
* Added dtExplosion to damage<->string functions.madmaxoft2014-02-041-1/+2
|
* Fixed #624Tiger Wang2014-02-021-0/+1
|
* E_BLOCK_POTATOES isn't an solid block. Villagers were floating above them.STRWarrior2014-01-271-0/+1
|
* Multiple enhancements and fixes to minecartsTiger Wang2014-01-121-0/+1
| | | | | | + They are destroyed instantly by creative mode * Physics is much improved + Basic implementation of powered rails
* Merge pull request #529 from mc-server/derpstonerefactorAlexander Harkness2014-01-121-63/+63
|\ | | | | Major refactoring of redstone
| * Renamed g_TorchPlaceable...Tiger Wang2014-01-111-63/+63
| | | | | | | | ...to g_FullyOccupiesVoxel, as recommended by @bearbin
* | Move biome definition to separate filesBill Derouin2014-01-091-100/+0
|/
* Fixed repeaters delay, maybeTiger Wang2013-12-201-0/+3
| | | | | Also added basic daylight sensors, though because GetBlockSkylight always is 15, it doesn't work.
* Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT).madmaxoft2013-12-201-6/+6
|
* Fixed loads more of them.Alexander Harkness2013-11-261-1/+1
|
* Attempt to fix compilationTiger Wang2013-11-241-1/+1
|
* Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-241-24/+28
| | | | | Conflicts: GNUmakefile
* Moved source to srcAlexander Harkness2013-11-241-0/+954