aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAge
* 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>
| * + rail block bounding boxNils Dagsson Moskopp2011-06-08
| |
| * + railNils Dagsson Moskopp2011-06-07
| |
| * * point out setInventoryTextureCube() is broken with a FIXMENils Dagsson Moskopp2011-06-03
| |
| * + paper, book, bookshelfNils Dagsson Moskopp2011-06-03
| |
| * + papyrusNils Dagsson Moskopp2011-06-03
| |
| * added new submenu for key assignmentteddydestodes2011-06-01
| | | | | | | | configwriting/saving isn't complete and will break your config if you use fancy keys
| * Merge remote-tracking branch 'bucket-t/master'teddydestodes2011-06-01
| |\
| | * MacOSX build supportMrLoom2011-06-01
| | |
| * | Merge remote-tracking branch 'upstream/master'teddydestodes2011-06-01
| |\|
| | * * clay is rarer nowNils Dagsson Moskopp2011-06-01
| | |
| | * + clay and associated itemsNils Dagsson Moskopp2011-06-01
| | |
| | * + brickNils Dagsson Moskopp2011-05-31
| | |
| | * + fence inventory iconNils Dagsson Moskopp2011-05-31
| | |
| | * * improved fence dimensions (cuboid side lengths now multiples of 2, ↵Nils Dagsson Moskopp2011-05-31
| | | | | | | | | | | | textures should fit better)
| | * + cactiiNils Dagsson Moskopp2011-05-30
| | |
| * | * improved fence dimensions (cuboid side lengths now multiples of 2, ↵Nils Dagsson Moskopp2011-06-01
| | | | | | | | | | | | textures should fit better)
| * | fast_move and free_move can now be toggledteddydestodes2011-05-29
| |/
| * + sandstoneNils Dagsson Moskopp2011-05-29
| |
* | moved mapgen stuff around abitPerttu Ahola2011-06-25
| |
* | moved map generator to separate source filesPerttu Ahola2011-06-25
| |
* | mapgen stuffPerttu Ahola2011-06-25
| |
* | 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)
* | disabled farmesh in default settingsPerttu Ahola2011-06-23
| |
* | fixed servermain.cpp lacking filesys.hPerttu Ahola2011-06-22
| |
* | path_userdata is now created before potentially creating debug.txt in therePerttu Ahola2011-06-20
| |
* | moved the mac include in porting.cpp out of namespacePerttu Ahola2011-06-20
| |
* | fixed a segfault in case of wrong input from network on the server (reported ↵Perttu Ahola2011-06-19
| | | | | | | | by spongie)
* | Modified the mesh update thread's sleep time to speed it up (it was way too ↵Perttu Ahola2011-06-18
| | | | | | | | high)
* | Documentation updatePerttu Ahola2011-06-18
| |
* | Hand-picked Mac OSX cursor and bundle path fixes from ↵Perttu Ahola2011-06-18
| | | | | | | | https://bitbucket.org/toabi/minetest-mac
* | Changed MapBlockObjects to be never written anymore. Incremented version number.Perttu Ahola2011-06-18
| |
* | comment updatePerttu Ahola2011-06-18
| |
* | farmesh render range is now dynamicPerttu Ahola2011-06-18
| |
* | fixed tree placement in farmeshPerttu Ahola2011-06-18
| |
* | farmesh is now usable.Perttu Ahola2011-06-18
| |
* | modified health bar a bitPerttu Ahola2011-06-18
| |
* | enabled word wrap in chatPerttu Ahola2011-06-18
| |
* | fixed wrong furnace menu layoutPerttu Ahola2011-06-18
| |
* | merged Mac OSX build fix from minetest-deltaPerttu Ahola2011-06-18
| |
* | removed furnace menu because it is not needed anymorePerttu Ahola2011-06-18
| |
* | separated inventory-related game content to content_inventory.{h,cpp}Perttu Ahola2011-06-18
| |
* | forgot to add mapblock_nodemod.hPerttu Ahola2011-06-18
| |
* | moved inventory menu definition of chest and furnace to content_nodemeta.{h,cpp}Perttu Ahola2011-06-18
| |
* | Created and moved stuff to content_nodemeta.{h,cpp}Perttu Ahola2011-06-18
| |
* | added in-game key shortcuts for toggling free_move and fast_move (default K ↵Perttu Ahola2011-06-17
| | | | | | | | and J)
* | modified iron amount a bitPerttu Ahola2011-06-17
| |
* | Updated commentsPerttu Ahola2011-06-17
| |
* | Moved stuff from mapblock{h,cpp} to mapblock_mesh.{h,cpp} and ↵Perttu Ahola2011-06-17
| | | | | | | | content_mapblock.{h,cpp}