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