Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | * possible fix for large cubic holes in map | Nils Dagsson Moskopp | 2011-07-13 | 1 | -1/+3 |
| | |||||
* | * slightly different values for 3d perlin noise | Nils Dagsson Moskopp | 2011-07-13 | 1 | -3/+3 |
| | |||||
* | * regression fix, papyrus should appear again now | Nils Dagsson Moskopp | 2011-07-13 | 1 | -10/+7 |
| | |||||
* | * README updated | Nils Dagsson Moskopp | 2011-07-11 | 1 | -0/+2 |
| | |||||
* | + farmesh config options | Jiří Procházka | 2011-07-11 | 4 | -15/+12 |
| | |||||
* | * amended upstream branch notes | Nils Dagsson Moskopp | 2011-07-09 | 1 | -0/+1 |
| | |||||
* | + notes regarding upstream conversion from mercurial using hg-fast-export | Nils Dagsson Moskopp | 2011-07-09 | 1 | -0/+3 |
| | |||||
* | Merge pull request #13 from Bahamada/upstream_merge | Nils Dagsson Moskopp | 2011-06-27 | 97 | -7480/+143393 |
|\ | | | | | Upstream merge | ||||
| * | backported cactus, papyrus and clay | Sebastian Rühl | 2011-06-26 | 3 | -10/+67 |
| | | |||||
| * | small fix | Sebastian Rühl | 2011-06-26 | 4 | -0/+1032 |
| | | |||||
| * | Merge branch 'master' of https://github.com/erlehmann/minetest-delta.git ↵ | Sebastian Rühl | 2011-06-26 | 43 | -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 box | Nils Dagsson Moskopp | 2011-06-08 | 1 | -0/+37 |
| | | |||||
* | | * README updated | Nils Dagsson Moskopp | 2011-06-07 | 1 | -0/+1 |
| | | |||||
* | | + rail | Nils Dagsson Moskopp | 2011-06-07 | 9 | -0/+138 |
| | | |||||
* | | * README updated | Nils Dagsson Moskopp | 2011-06-03 | 1 | -1/+4 |
| | | |||||
* | | + bookshelf in minetestmapper, same color as wood | Nils Dagsson Moskopp | 2011-06-03 | 1 | -0/+1 |
| | | |||||
* | | * point out setInventoryTextureCube() is broken with a FIXME | Nils Dagsson Moskopp | 2011-06-03 | 1 | -1/+1 |
| | | |||||
* | | + paper, book, bookshelf | Nils Dagsson Moskopp | 2011-06-03 | 9 | -0/+67 |
| | | |||||
* | | * README updated | Nils Dagsson Moskopp | 2011-06-03 | 1 | -0/+1 |
| | | |||||
* | | + papyrus in minetestmapper | Nils Dagsson Moskopp | 2011-06-03 | 1 | -0/+1 |
| | | |||||
* | | + papyrus | Nils Dagsson Moskopp | 2011-06-03 | 8 | -2/+97 |
| | | |||||
* | | * made cactus color darker | Nils Dagsson Moskopp | 2011-06-03 | 1 | -1/+1 |
| | | |||||
* | | + check if sectors/sectors2 directories exist before attempting to read them | Nils Dagsson Moskopp | 2011-06-02 | 1 | -13/+16 |
| | | |||||
* | | * encoding fix | Nils Dagsson Moskopp | 2011-06-02 | 1 | -1/+1 |
| | | |||||
* | | * tabs to spaces | Nils Dagsson Moskopp | 2011-06-02 | 1 | -192/+192 |
| | | |||||
* | | * ignore minetestmapper output | Nils Dagsson Moskopp | 2011-06-02 | 1 | -0/+1 |
| | | |||||
* | | + sandstone color value now in minetestmapper | Nils Dagsson Moskopp | 2011-06-02 | 1 | -0/+1 |
| | | |||||
* | | + minetestmapper2, colors modified for Minetest Δ | Nils Dagsson Moskopp | 2011-06-02 | 2 | -0/+294 |
| | | |||||
* | | * README updated | Nils Dagsson Moskopp | 2011-06-02 | 1 | -0/+3 |
| | | |||||
* | | Merge pull request #1 from TeddyDesTodes/master | Nils Dagsson Moskopp | 2011-06-01 | 10 | -103/+937 |
|\ \ | | | | | | | + submenu for key assignment, fast_move and free_move can now be toggled | ||||
| * \ | Merge remote-tracking branch 'upstream/master' | teddydestodes | 2011-06-01 | 1 | -2/+9 |
| |\ \ | |/ / |/| | | |||||
* | | | * README updated | Nils Dagsson Moskopp | 2011-06-01 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #5 from bucket-T/master | Nils Dagsson Moskopp | 2011-06-01 | 2 | -4/+21 |
|\ \ \ | | | | | | | | | MacOSX build support | ||||
* | | | | * README updated | Nils Dagsson Moskopp | 2011-06-01 | 1 | -1/+8 |
| | | | | |||||
| | * | | added new submenu for key assignment | teddydestodes | 2011-06-01 | 8 | -103/+913 |
| | | | | | | | | | | | | | | | | configwriting/saving isn't complete and will break your config if you use fancy keys | ||||
| | * | | Merge remote-tracking branch 'bucket-t/master' | teddydestodes | 2011-06-01 | 2 | -4/+21 |
| | |\ \ | | |/ / | |/| | | |||||
| * | | | MacOSX build support | MrLoom | 2011-06-01 | 2 | -4/+21 |
|/ / / | |||||
| * | | Merge remote-tracking branch 'upstream/master' | teddydestodes | 2011-06-01 | 15 | -9/+115 |
| |\ \ | |/ / |/| | | |||||
* | | | * clay is rarer now | Nils Dagsson Moskopp | 2011-06-01 | 1 | -2/+2 |
| | | | |||||
* | | | + clay and associated items | Nils Dagsson Moskopp | 2011-06-01 | 10 | -3/+61 |
| | | | |||||
* | | | + brick | Nils Dagsson Moskopp | 2011-05-31 | 6 | -0/+12 |
| | | | |||||
* | | | * menulogo now shows minetest delta | Nils Dagsson Moskopp | 2011-05-31 | 1 | -0/+0 |
| | | | |||||
* | | | + fence inventory icon | Nils Dagsson Moskopp | 2011-05-31 | 2 | -0/+1 |
| | | | |||||
* | | | * improved fence dimensions (cuboid side lengths now multiples of 2, ↵ | Nils Dagsson Moskopp | 2011-05-31 | 1 | -6/+6 |
| | | | | | | | | | | | | textures should fit better) | ||||
* | | | + cactii | Nils Dagsson Moskopp | 2011-05-30 | 8 | -7/+42 |
| | | | |||||
* | | | + .gitignore | Nils Dagsson Moskopp | 2011-05-29 | 1 | -0/+19 |
| | | | |||||
| * | | * improved fence dimensions (cuboid side lengths now multiples of 2, ↵ | Nils Dagsson Moskopp | 2011-06-01 | 1 | -6/+6 |
| | | | | | | | | | | | | textures should fit better) | ||||
| * | | + .gitignore | Nils Dagsson Moskopp | 2011-05-30 | 1 | -0/+19 |
| | | | |||||
| * | | fast_move and free_move can now be toggled | teddydestodes | 2011-05-29 | 2 | -0/+24 |
|/ / | |||||
* | | + README in main directory | Nils Dagsson Moskopp | 2011-05-29 | 1 | -0/+14 |
| | |