aboutsummaryrefslogtreecommitdiff
path: root/src (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'origin/upstream'Nils Dagsson Moskopp2011-07-164-4/+4
|\|
| * Attempt to fix a problem with the factory mappings of objects residing in ↵Perttu Ahola2011-07-164-4/+4
| | | | | | | | different source files than the prototype objects that fill them in
* | * fix automerge regressionNils Dagsson Moskopp2011-07-151-73/+5
| |
* | * regression fix, clay occurs again nowNils Dagsson Moskopp2011-07-151-7/+9
| |
* | * possibly nicer treesNils Dagsson Moskopp2011-07-151-2/+2
| |
* | Merge branch 'upstream/master'Nils Dagsson Moskopp2011-07-1447-2762/+3247
|\| | | | | | | | | | | Conflicts: data/oerkki1.png src/client.cpp
| * initial steps in doing content type extensionPerttu Ahola2011-07-025-144/+151
| |
| * made screen go slightly blue when underwaterPerttu Ahola2011-07-014-0/+35
| |
| * Fixed objects being sometimes not able to be stored statically in a block ↵Perttu Ahola2011-07-015-51/+77
| | | | | | | | when block has been unloaded
| * tried to fix block selection in map rendering a bitPerttu Ahola2011-06-271-6/+6
| |
| * fixed bug in inventory textures caused from better handling of unknown blocksPerttu Ahola2011-06-272-1/+2
| |
| * updated minetest.conf.example and changed client_unload_unused_data_timeout ↵Perttu Ahola2011-06-271-1/+1
| | | | | | | | default to 600
| * better handling of unknown blocks on clientPerttu Ahola2011-06-271-0/+12
| |
| * updated to-do listPerttu Ahola2011-06-271-0/+8
| |
| * made dtime jitter compare value and fps calculation a bit faster changingPerttu Ahola2011-06-271-1/+1
| |
| * map unloading is now a whole lot betterPerttu Ahola2011-06-2710-208/+266
| |
| * fixed block unloading from memory (a better fix coming next)Perttu Ahola2011-06-268-74/+70
| |
| * Made the initial loading screen slightly more alivePerttu Ahola2011-06-261-25/+52
| |
| * added screenshot key F12 (from spongie)Perttu Ahola2011-06-262-0/+21
| |
| * Added CPT_FACEDIR_SIMPLE calculation, finally, as figured out by spongiePerttu Ahola2011-06-261-1/+23
| |
| * changed one "if" to "else if" in content_mapblock.cppPerttu Ahola2011-06-261-1/+1
| |
| * reorganized stuffPerttu Ahola2011-06-264-2/+21
| |
| * tuned mapgenPerttu Ahola2011-06-261-51/+31
| |
| * changed water color in farmeshPerttu Ahola2011-06-261-1/+2
| |
| * updated noise stuffPerttu Ahola2011-06-262-2/+7
| |
| * reorganized a lot of stuff and modified mapgen and objects slightly while ↵Perttu Ahola2011-06-2621-1626/+2054
| | | | | | | | doing it
| * improved player fall damage detectionPerttu Ahola2011-06-261-3/+35
| |
| * added and commented out some debug outputPerttu Ahola2011-06-264-74/+111
| |
| * even more code refactoringPerttu Ahola2011-06-2610-209/+221
| |
| * more reorganizing of map codePerttu Ahola2011-06-2610-40/+38
| |
| * cleaned map stuffPerttu Ahola2011-06-267-285/+67
| |
* | * possibly improved water flow, by flyx86Nils Dagsson Moskopp2011-07-143-8/+44
| | | | | | | | | | | | - When flowing liquid starts to flow down, it stops contributing to its neighboring nodes' liquid level (possibly transforming it back to air) - Flowing liquid turns into a source if there are at least 2 adjacent liquid source nodes - If a new liquid flow reaches existing flowing liquid, the existing liquid is now updated properly.
* | * possible fix for large cubic holes in mapNils Dagsson Moskopp2011-07-131-1/+3
| |
* | * slightly different values for 3d perlin noiseNils Dagsson Moskopp2011-07-131-3/+3
| |
* | * regression fix, papyrus should appear again nowNils Dagsson Moskopp2011-07-131-10/+7
| |
* | + farmesh config optionsJiří Procházka2011-07-114-15/+12
| |
* | backported cactus, papyrus and claySebastian Rühl2011-06-261-10/+67
| |
* | small fixSebastian Rühl2011-06-262-0/+731
| |
* | Merge branch 'master' of https://github.com/erlehmann/minetest-delta.git ↵Sebastian Rühl2011-06-2613-41/+603
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-081-0/+37
| |
| * + railNils Dagsson Moskopp2011-06-075-0/+138
| |
| * * point out setInventoryTextureCube() is broken with a FIXMENils Dagsson Moskopp2011-06-031-1/+1
| |
| * + paper, book, bookshelfNils Dagsson Moskopp2011-06-036-0/+67
| |
| * + papyrusNils Dagsson Moskopp2011-06-037-2/+97
| |
| * added new submenu for key assignmentteddydestodes2011-06-018-103/+913
| | | | | | | | configwriting/saving isn't complete and will break your config if you use fancy keys
| * Merge remote-tracking branch 'bucket-t/master'teddydestodes2011-06-011-3/+20
| |\
| | * MacOSX build supportMrLoom2011-06-011-3/+20
| | |
| * | Merge remote-tracking branch 'upstream/master'teddydestodes2011-06-017-9/+115
| |\|
| | * * clay is rarer nowNils Dagsson Moskopp2011-06-011-2/+2
| | |
| | * + clay and associated itemsNils Dagsson Moskopp2011-06-017-3/+61
| | |