Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge remote-tracking branch 'marktraceur/master' | Perttu Ahola | 2011-09-26 |
|\ | |||
| * | Adding (most) of the sapling functionality. It has yet to work, since ↵ | Mark Holmquist | 2011-09-23 |
| | | | | | | | | MEET_OTHER was not implemented at the time of this commit. Hopefully it will work when merged with celeron's latest. | ||
* | | added locking chests - clean patch | darkrose | 2011-09-22 |
|/ | |||
* | Removed Spaces | sfan5 | 2011-09-11 |
| | |||
* | Added Apple Trees | sfan5 | 2011-09-11 |
| | |||
* | lava! | Perttu Ahola | 2011-08-15 |
| | |||
* | Changing CONTENT_LADDER to be an extended block | Mark Holmquist | 2011-08-01 |
| | |||
* | Added ladders--they don't have any use yet, though | Mark Holmquist | 2011-08-01 |
| | |||
* | Added MaterialItem conversion from old content type namespace to new | Perttu Ahola | 2011-07-31 |
| | |||
* | 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 | ||
* | changed jungletree/junglegrass content ids to extended range | Perttu Ahola | 2011-07-24 |
| | |||
* | merged jungle and bluish shadows | Perttu Ahola | 2011-07-23 |
|\ | |||
| * | Jungle biome/whatever thing | Perttu Ahola | 2011-07-23 |
| | | |||
* | | merged the content type extension and delta | Perttu Ahola | 2011-07-23 |
|\| | |||
| * | 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> | ||
* | | extended content-type range | Perttu Ahola | 2011-07-23 |
|/ | |||
* | New map generator added (and SQLite, messed up the commits at that time...) ↵ | Perttu Ahola | 2011-06-25 |
| | | | | (import from temporary git repo) | ||
* | Moved some mapnode content stuff from mapnode.{h,cpp} and digging property ↵ | Perttu Ahola | 2011-06-17 |
stuff from material.cpp to content_mapnode.{h,cpp} |