aboutsummaryrefslogtreecommitdiff
path: root/data
AgeCommit message (Collapse)Author
2011-09-26Merge remote-tracking branch 'marktraceur/master'Perttu Ahola
2011-09-26Rotate wielded tool the right way and modify axe graphics accordinglyPerttu Ahola
2011-09-23Adding sapling textureMark Holmquist
2011-09-22added locking chest texturedarkrose
2011-09-12Added Iron Apple which heals 4 Heartssfan5
2011-09-11Added Apple Treessfan5
2011-09-06Fix some texture stuff: remove item_fence.png, use fence.png, remove ↵Perttu Ahola
inexisting cactus.png from texture atlas (replace with nothing because cactus is rare)
2011-08-15lava!Perttu Ahola
2011-08-05merged delta and c55Perttu Ahola
2011-08-05* Welcome to OMSK.Nils Dagsson Moskopp
2011-08-01* papyrus texture now darker and edgierNils Dagsson Moskopp
2011-08-01* less clumsy ladder texture, based on railsNils Dagsson Moskopp
2011-08-01Added ladders--they don't have any use yet, thoughMark Holmquist
2011-07-31Merge remote-tracking branch 'origin/upstream'Nils Dagsson Moskopp
2011-07-30added sword texturesPerttu Ahola
2011-07-30Fixed handling of inventory in creative mode (normal inventory is not ↵Perttu Ahola
trashed anymore), fixed mese pick speed, added some forgotten stuff
2011-07-30Merge remote-tracking branch 'origin/upstream'Nils Dagsson Moskopp
2011-07-23merged jungle and bluish shadowsPerttu Ahola
2011-07-23changed rat texture to minePerttu Ahola
2011-07-23switched my textures backPerttu Ahola
2011-07-23uh, i guess this now merges the new delta stuff?Perttu Ahola
2011-07-23Jungle biome/whatever thingPerttu Ahola
2011-07-21* nicer firefly textureNils Dagsson Moskopp
2011-07-21Merged minetest-delta a624fe549bc75855a170Perttu Ahola
2011-07-21+ unknown block is sickNils Dagsson Moskopp
2011-07-20+ firefliesNils Dagsson Moskopp
2011-07-18* Омская птицаNils Dagsson Moskopp
2011-07-14Merge branch 'upstream/master'Nils Dagsson Moskopp
Conflicts: data/oerkki1.png src/client.cpp
2011-06-27better handling of unknown blocks on clientPerttu Ahola
2011-06-26reorganized a lot of stuff and modified mapgen and objects slightly while ↵Perttu Ahola
doing it
2011-06-26backported cactus, papyrus and claySebastian Rühl
2011-06-26Merge branch 'master' of https://github.com/erlehmann/minetest-delta.git ↵Sebastian Rühl
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>
2011-06-25added correct data to new images, added comments in main.cppPerttu Ahola
2011-06-25New map generator added (and SQLite, messed up the commits at that time...) ↵Perttu Ahola
(import from temporary git repo)
2011-06-19uh oh, forgot to add treeprop.png to the repoPerttu Ahola
2011-06-18modified health bar a bitPerttu Ahola
2011-06-07+ railNils Dagsson Moskopp
2011-06-03+ paper, book, bookshelfNils Dagsson Moskopp
2011-06-03+ papyrusNils Dagsson Moskopp
2011-06-01+ clay and associated itemsNils Dagsson Moskopp
2011-05-31+ brickNils Dagsson Moskopp
2011-05-31* menulogo now shows minetest deltaNils Dagsson Moskopp
2011-05-31+ fence inventory iconNils Dagsson Moskopp
2011-05-30+ cactiiNils Dagsson Moskopp
2011-05-29* better heart iconNils Dagsson Moskopp
2011-05-29* better glass graphicsNils Dagsson Moskopp
2011-05-29* better rat graphicsNils Dagsson Moskopp
2011-05-29* enemies are now omsk birdsNils Dagsson Moskopp
2011-05-29* better player graphicsNils Dagsson Moskopp
2011-05-29+ sandstoneNils Dagsson Moskopp