Commit message (Collapse) | Author | Age | ||
---|---|---|---|---|
... | ||||
* | Merge remote-tracking branch 'marktraceur/master' | Perttu Ahola | 2011-09-26 | |
|\ | ||||
| * | Adding sapling texture | Mark Holmquist | 2011-09-23 | |
| | | ||||
* | | Rotate wielded tool the right way and modify axe graphics accordingly | Perttu Ahola | 2011-09-26 | |
| | | ||||
* | | added locking chest texture | darkrose | 2011-09-22 | |
|/ | ||||
* | Added Iron Apple which heals 4 Hearts | sfan5 | 2011-09-12 | |
| | ||||
* | Added Apple Trees | sfan5 | 2011-09-11 | |
| | ||||
* | Fix some texture stuff: remove item_fence.png, use fence.png, remove ↵ | Perttu Ahola | 2011-09-06 | |
| | | | | inexisting cactus.png from texture atlas (replace with nothing because cactus is rare) | |||
* | lava! | Perttu Ahola | 2011-08-15 | |
| | ||||
* | merged delta and c55 | Perttu Ahola | 2011-08-05 | |
|\ | ||||
| * | * Welcome to OMSK. | Nils Dagsson Moskopp | 2011-08-05 | |
| | | ||||
| * | * papyrus texture now darker and edgier | Nils Dagsson Moskopp | 2011-08-01 | |
| | | ||||
| * | * less clumsy ladder texture, based on rails | Nils Dagsson Moskopp | 2011-08-01 | |
| | | ||||
| * | Added ladders--they don't have any use yet, though | Mark Holmquist | 2011-08-01 | |
| | | ||||
| * | Merge remote-tracking branch 'origin/upstream' | Nils Dagsson Moskopp | 2011-07-31 | |
| |\ | |/ |/| | ||||
| * | Merge remote-tracking branch 'origin/upstream' | Nils Dagsson Moskopp | 2011-07-30 | |
| |\ | ||||
* | | | added sword textures | Perttu Ahola | 2011-07-30 | |
| | | | ||||
* | | | Fixed handling of inventory in creative mode (normal inventory is not ↵ | Perttu Ahola | 2011-07-30 | |
| |/ |/| | | | | | trashed anymore), fixed mese pick speed, added some forgotten stuff | |||
* | | merged jungle and bluish shadows | Perttu Ahola | 2011-07-23 | |
|\ \ | ||||
| * | | Jungle biome/whatever thing | Perttu Ahola | 2011-07-23 | |
| |/ | ||||
* | | changed rat texture to mine | Perttu Ahola | 2011-07-23 | |
| | | ||||
* | | switched my textures back | Perttu Ahola | 2011-07-23 | |
| | | ||||
* | | uh, i guess this now merges the new delta stuff? | Perttu Ahola | 2011-07-23 | |
|\| | ||||
| * | * nicer firefly texture | Nils Dagsson Moskopp | 2011-07-21 | |
| | | ||||
| * | + unknown block is sick | Nils Dagsson Moskopp | 2011-07-21 | |
| | | ||||
* | | Merged minetest-delta a624fe549bc75855a170 | Perttu Ahola | 2011-07-21 | |
|\ \ | |/ |/| | ||||
* | | + fireflies | Nils Dagsson Moskopp | 2011-07-20 | |
| | | ||||
* | | * Омская птица | Nils Dagsson Moskopp | 2011-07-18 | |
| | | ||||
* | | Merge branch 'upstream/master' | Nils Dagsson Moskopp | 2011-07-14 | |
|\| | | | | | | | | | | | Conflicts: data/oerkki1.png src/client.cpp | |||
| * | better handling of unknown blocks on client | Perttu Ahola | 2011-06-27 | |
| | | ||||
| * | reorganized a lot of stuff and modified mapgen and objects slightly while ↵ | Perttu Ahola | 2011-06-26 | |
| | | | | | | | | doing it | |||
* | | backported cactus, papyrus and clay | Sebastian Rühl | 2011-06-26 | |
| | | ||||
* | | Merge branch 'master' of https://github.com/erlehmann/minetest-delta.git ↵ | Sebastian Rühl | 2011-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> | |||
| * | + rail | Nils Dagsson Moskopp | 2011-06-07 | |
| | | ||||
| * | + paper, book, bookshelf | Nils Dagsson Moskopp | 2011-06-03 | |
| | | ||||
| * | + papyrus | Nils Dagsson Moskopp | 2011-06-03 | |
| | | ||||
| * | + clay and associated items | Nils Dagsson Moskopp | 2011-06-01 | |
| | | ||||
| * | + brick | Nils Dagsson Moskopp | 2011-05-31 | |
| | | ||||
| * | * menulogo now shows minetest delta | Nils Dagsson Moskopp | 2011-05-31 | |
| | | ||||
| * | + fence inventory icon | Nils Dagsson Moskopp | 2011-05-31 | |
| | | ||||
| * | + cactii | Nils Dagsson Moskopp | 2011-05-30 | |
| | | ||||
| * | * better heart icon | Nils Dagsson Moskopp | 2011-05-29 | |
| | | ||||
| * | * better glass graphics | Nils Dagsson Moskopp | 2011-05-29 | |
| | | ||||
| * | * better rat graphics | Nils Dagsson Moskopp | 2011-05-29 | |
| | | ||||
| * | * enemies are now omsk birds | Nils Dagsson Moskopp | 2011-05-29 | |
| | | ||||
| * | * better player graphics | Nils Dagsson Moskopp | 2011-05-29 | |
| | | ||||
| * | + sandstone | Nils Dagsson Moskopp | 2011-05-29 | |
| | | ||||
* | | added correct data to new images, added comments in main.cpp | Perttu Ahola | 2011-06-25 | |
| | | ||||
* | | New map generator added (and SQLite, messed up the commits at that time...) ↵ | Perttu Ahola | 2011-06-25 | |
| | | | | | | | | (import from temporary git repo) | |||
* | | uh oh, forgot to add treeprop.png to the repo | Perttu Ahola | 2011-06-19 | |
| | | ||||
* | | modified health bar a bit | Perttu Ahola | 2011-06-18 | |
| | |