aboutsummaryrefslogtreecommitdiff
path: root/data (follow)
Commit message (Collapse)AuthorAgeFilesLines
* merged delta and c55Perttu Ahola2011-08-051-0/+0
|\
| * * Welcome to OMSK.Nils Dagsson Moskopp2011-08-052-0/+0
| |
| * * papyrus texture now darker and edgierNils Dagsson Moskopp2011-08-011-0/+0
| |
| * * less clumsy ladder texture, based on railsNils Dagsson Moskopp2011-08-012-0/+0
| |
| * Added ladders--they don't have any use yet, thoughMark Holmquist2011-08-012-0/+0
| |
| * Merge remote-tracking branch 'origin/upstream'Nils Dagsson Moskopp2011-07-319-0/+0
| |\ | |/ |/|
| * Merge remote-tracking branch 'origin/upstream'Nils Dagsson Moskopp2011-07-303-0/+0
| |\
* | | added sword texturesPerttu Ahola2011-07-303-0/+0
| | |
* | | Fixed handling of inventory in creative mode (normal inventory is not ↵Perttu Ahola2011-07-306-0/+0
| |/ |/| | | | | trashed anymore), fixed mese pick speed, added some forgotten stuff
* | merged jungle and bluish shadowsPerttu Ahola2011-07-233-0/+0
|\ \
| * | Jungle biome/whatever thingPerttu Ahola2011-07-233-0/+0
| |/
* | changed rat texture to minePerttu Ahola2011-07-231-0/+0
| |
* | switched my textures backPerttu Ahola2011-07-233-0/+0
| |
* | uh, i guess this now merges the new delta stuff?Perttu Ahola2011-07-232-0/+0
|\|
| * * nicer firefly textureNils Dagsson Moskopp2011-07-211-0/+0
| |
| * + unknown block is sickNils Dagsson Moskopp2011-07-211-0/+0
| |
* | Merged minetest-delta a624fe549bc75855a170Perttu Ahola2011-07-215-0/+0
|\ \ | |/ |/|
* | + firefliesNils Dagsson Moskopp2011-07-201-0/+0
| |
* | * Омская птицаNils Dagsson Moskopp2011-07-182-0/+0
| |
* | Merge branch 'upstream/master'Nils Dagsson Moskopp2011-07-142-0/+0
|\| | | | | | | | | | | Conflicts: data/oerkki1.png src/client.cpp
| * better handling of unknown blocks on clientPerttu Ahola2011-06-271-0/+0
| |
| * reorganized a lot of stuff and modified mapgen and objects slightly while ↵Perttu Ahola2011-06-262-0/+0
| | | | | | | | doing it
* | backported cactus, papyrus and claySebastian Rühl2011-06-261-0/+0
| |
* | Merge branch 'master' of https://github.com/erlehmann/minetest-delta.git ↵Sebastian Rühl2011-06-2622-0/+0
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-074-0/+0
| |
| * + paper, book, bookshelfNils Dagsson Moskopp2011-06-033-0/+0
| |
| * + papyrusNils Dagsson Moskopp2011-06-031-0/+0
| |
| * + clay and associated itemsNils Dagsson Moskopp2011-06-013-0/+0
| |
| * + brickNils Dagsson Moskopp2011-05-311-0/+0
| |
| * * menulogo now shows minetest deltaNils Dagsson Moskopp2011-05-311-0/+0
| |
| * + fence inventory iconNils Dagsson Moskopp2011-05-311-0/+0
| |
| * + cactiiNils Dagsson Moskopp2011-05-302-0/+0
| |
| * * 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
| |
| * + sandstoneNils Dagsson Moskopp2011-05-291-0/+0
| |
* | added correct data to new images, added comments in main.cppPerttu Ahola2011-06-252-0/+0
| |
* | New map generator added (and SQLite, messed up the commits at that time...) ↵Perttu Ahola2011-06-252-0/+0
| | | | | | | | (import from temporary git repo)
* | uh oh, forgot to add treeprop.png to the repoPerttu Ahola2011-06-191-0/+0
| |
* | modified health bar a bitPerttu Ahola2011-06-181-0/+0
| |
* | A very poor (but better than nothing) inventory icon for fencesCiaran Gultnieks2011-05-241-0/+0
|/
* Added glass texture (poor artwork skills, apologies in advance)Ciaran Gultnieks2011-05-091-0/+0
|
* made proper skyboxes for dawn/evening and nightPerttu Ahola2011-04-296-0/+0
|
* added simple skyboxPerttu Ahola2011-04-293-0/+0
|
* didn't actually change everything, just re-saved the grass texture.Perttu Ahola2011-04-291-0/+0
|
* Made the main menu a bit more unique lookingPerttu Ahola2011-04-241-0/+0
|
* Some work-in-progress in hp and mobs and a frightening amount of random fixes.Perttu Ahola2011-04-2113-0/+0
|
* Furnace is now usable. Added more tools.Perttu Ahola2011-04-0513-0/+0
| | | | | | --HG-- rename : data/tool_stpick.png => data/tool_stonepick.png rename : data/tool_wpick.png => data/tool_woodpick.png