aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | * amended upstream branch notesNils Dagsson Moskopp2011-07-091-0/+1
| | | | | | | | |
| * | | | | | | | + notes regarding upstream conversion from mercurial using hg-fast-exportNils Dagsson Moskopp2011-07-091-0/+3
| | | | | | | | |
| * | | | | | | | Merge pull request #13 from Bahamada/upstream_mergeNils Dagsson Moskopp2011-06-2797-7480/+143393
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Upstream merge
| | * | | | | | | | backported cactus, papyrus and claySebastian Rühl2011-06-263-10/+67
| | | | | | | | | |
| | * | | | | | | | small fixSebastian Rühl2011-06-264-0/+1032
| | | | | | | | | |
| | * | | | | | | | Merge branch 'master' of https://github.com/erlehmann/minetest-delta.git ↵Sebastian Rühl2011-06-2643-44/+1308
| | |\ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into upstream_merge Conflicts: .gitignore CMakeLists.txt data/heart.png src/CMakeLists.txt src/game.cpp src/guiMainMenu.cpp src/inventory.cpp src/map.cpp src/mapblock.cpp src/mapnode.cpp src/mapnode.h src/materials.cpp src/server.cpp Signed-off-by: Sebastian Rühl <bahamada_basti@yahoo.de>
| * | | | | | | | | + rail block bounding boxNils Dagsson Moskopp2011-06-081-0/+37
| | | | | | | | | |
| * | | | | | | | | * README updatedNils Dagsson Moskopp2011-06-071-0/+1
| | | | | | | | | |
| * | | | | | | | | + railNils Dagsson Moskopp2011-06-079-0/+138
| | | | | | | | | |
| * | | | | | | | | * README updatedNils Dagsson Moskopp2011-06-031-1/+4
| | | | | | | | | |
| * | | | | | | | | + bookshelf in minetestmapper, same color as woodNils Dagsson Moskopp2011-06-031-0/+1
| | | | | | | | | |
| * | | | | | | | | * point out setInventoryTextureCube() is broken with a FIXMENils Dagsson Moskopp2011-06-031-1/+1
| | | | | | | | | |
| * | | | | | | | | + paper, book, bookshelfNils Dagsson Moskopp2011-06-039-0/+67
| | | | | | | | | |
| * | | | | | | | | * README updatedNils Dagsson Moskopp2011-06-031-0/+1
| | | | | | | | | |
| * | | | | | | | | + papyrus in minetestmapperNils Dagsson Moskopp2011-06-031-0/+1
| | | | | | | | | |
| * | | | | | | | | + papyrusNils Dagsson Moskopp2011-06-038-2/+97
| | | | | | | | | |
| * | | | | | | | | * made cactus color darkerNils Dagsson Moskopp2011-06-031-1/+1
| | | | | | | | | |
| * | | | | | | | | + check if sectors/sectors2 directories exist before attempting to read themNils Dagsson Moskopp2011-06-021-13/+16
| | | | | | | | | |
| * | | | | | | | | * encoding fixNils Dagsson Moskopp2011-06-021-1/+1
| | | | | | | | | |
| * | | | | | | | | * tabs to spacesNils Dagsson Moskopp2011-06-021-192/+192
| | | | | | | | | |
| * | | | | | | | | * ignore minetestmapper outputNils Dagsson Moskopp2011-06-021-0/+1
| | | | | | | | | |
| * | | | | | | | | + sandstone color value now in minetestmapperNils Dagsson Moskopp2011-06-021-0/+1
| | | | | | | | | |
| * | | | | | | | | + minetestmapper2, colors modified for Minetest ΔNils Dagsson Moskopp2011-06-022-0/+294
| | | | | | | | | |
| * | | | | | | | | * README updatedNils Dagsson Moskopp2011-06-021-0/+3
| | | | | | | | | |
| * | | | | | | | | Merge pull request #1 from TeddyDesTodes/masterNils Dagsson Moskopp2011-06-0110-103/+937
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | + submenu for key assignment, fast_move and free_move can now be toggled
| | * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'teddydestodes2011-06-011-2/+9
| | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | * README updatedNils Dagsson Moskopp2011-06-011-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Merge pull request #5 from bucket-T/masterNils Dagsson Moskopp2011-06-012-4/+21
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | MacOSX build support
| * | | | | | | | | | | * README updatedNils Dagsson Moskopp2011-06-011-1/+8
| | | | | | | | | | | |
| | | * | | | | | | | | added new submenu for key assignmentteddydestodes2011-06-018-103/+913
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configwriting/saving isn't complete and will break your config if you use fancy keys
| | | * | | | | | | | | Merge remote-tracking branch 'bucket-t/master'teddydestodes2011-06-012-4/+21
| | | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | MacOSX build supportMrLoom2011-06-012-4/+21
| |/ / / / / / / / / /
| | * | | | | | | | | Merge remote-tracking branch 'upstream/master'teddydestodes2011-06-0115-9/+115
| | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | * clay is rarer nowNils Dagsson Moskopp2011-06-011-2/+2
| | | | | | | | | | |
| * | | | | | | | | | + clay and associated itemsNils Dagsson Moskopp2011-06-0110-3/+61
| | | | | | | | | | |
| * | | | | | | | | | + brickNils Dagsson Moskopp2011-05-316-0/+12
| | | | | | | | | | |
| * | | | | | | | | | * menulogo now shows minetest deltaNils Dagsson Moskopp2011-05-311-0/+0
| | | | | | | | | | |
| * | | | | | | | | | + fence inventory iconNils Dagsson Moskopp2011-05-312-0/+1
| | | | | | | | | | |
| * | | | | | | | | | * improved fence dimensions (cuboid side lengths now multiples of 2, ↵Nils Dagsson Moskopp2011-05-311-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | textures should fit better)
| * | | | | | | | | | + cactiiNils Dagsson Moskopp2011-05-308-7/+42
| | | | | | | | | | |
| * | | | | | | | | | + .gitignoreNils Dagsson Moskopp2011-05-291-0/+19
| | | | | | | | | | |
| | * | | | | | | | | * improved fence dimensions (cuboid side lengths now multiples of 2, ↵Nils Dagsson Moskopp2011-06-011-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | textures should fit better)
| | * | | | | | | | | + .gitignoreNils Dagsson Moskopp2011-05-301-0/+19
| | | | | | | | | | |
| | * | | | | | | | | fast_move and free_move can now be toggledteddydestodes2011-05-292-0/+24
| |/ / / / / / / / /
| * | | | | | | | | + README in main directoryNils Dagsson Moskopp2011-05-291-0/+14
| | | | | | | | | |
| * | | | | | | | | * better heart iconNils Dagsson Moskopp2011-05-291-0/+0
| | | | | | | | | |
| * | | | | | | | | * better glass graphicsNils Dagsson Moskopp2011-05-291-0/+0
| | | | | | | | | |
| * | | | | | | | | * better rat graphicsNils Dagsson Moskopp2011-05-291-0/+0
| | | | | | | | | |
| * | | | | | | | | * enemies are now omsk birdsNils Dagsson Moskopp2011-05-291-0/+0
| | | | | | | | | |
| * | | | | | | | | * better player graphicsNils Dagsson Moskopp2011-05-292-0/+0
| | | | | | | | | |