summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAge
...
| * | | * changed GUI to indicate Minetest ΔNils Dagsson Moskopp2011-07-17
| | | |
| * | | Merge remote-tracking branch 'origin/upstream'Nils Dagsson Moskopp2011-07-16
| |\ \ \
| * | | | * fix automerge regressionNils Dagsson Moskopp2011-07-15
| | | | |
| * | | | * regression fix, clay occurs again nowNils Dagsson Moskopp2011-07-15
| | | | |
| * | | | * possibly nicer treesNils Dagsson Moskopp2011-07-15
| | | | |
| * | | | Merge branch 'upstream/master'Nils Dagsson Moskopp2011-07-14
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: data/oerkki1.png src/client.cpp
| * | | | | * possibly improved water flow, by flyx86Nils Dagsson Moskopp2011-07-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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-13
| | | | | |
| * | | | | * slightly different values for 3d perlin noiseNils Dagsson Moskopp2011-07-13
| | | | | |
| * | | | | * regression fix, papyrus should appear again nowNils Dagsson Moskopp2011-07-13
| | | | | |
| * | | | | + farmesh config optionsJiří Procházka2011-07-11
| | | | | |
| * | | | | backported cactus, papyrus and claySebastian Rühl2011-06-26
| | | | | |
| * | | | | small fixSebastian Rühl2011-06-26
| | | | | |
| * | | | | 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
| | | | | | |
* | | | | | | * key change menu now saving immediatelyPerttu Ahola2011-07-22
| | | | | | |
* | | | | | | Merge remote-tracking branch 'upstream/master'Constantin Wenger2011-07-22
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'upstream/master'Nils Dagsson Moskopp2011-07-22
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Fixed the problem of <=r548 clients fucking up maps on >=r549 servers. Also, ↵Perttu Ahola2011-07-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | already fucked up maps are now loaded correctly.
| | * | | | | | added an unit test for the Settings thingy (the python ConfigParser -like thing)Perttu Ahola2011-07-22
| | | | | | | |
| | * | | | | | Fixed small error in mapnode.cpp (didn't cause any harm though)Perttu Ahola2011-07-22
| | | | | | | |
| | * | | | | | Fixed new map generator causing a crash when generating at map limitPerttu Ahola2011-07-22
| | | |_|_|_|/ | | |/| | | |
* | / | | | | fixed some problems with filenames of the translationsConstantin Wenger2011-07-22
|/ / / / / /
* | | | | | Declare USE_GETTEXT optionGiuseppe Bilotta2011-07-22
| | | | | |
* | | | | | fixed problem with displaying special charsConstantin Wenger2011-07-22
| | | | | |
* | | | | | updatepo cmake ruleGiuseppe Bilotta2011-07-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Get rid of the system-specific updatelocales.sh and introduce an updatepo cmake rule. po files are also updated before creating the mo files, and we now keep the .pot file (in the po/en directory). To stabilize the po file creation, file contents are sorted by source filename. Update po files in the process.
* | | | | | Static naming of po fileGiuseppe Bilotta2011-07-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The po file should not be named c55 if we're in ∆. But since it is not exposed at installation time, we don't actually need its name to be based on the project name at all, so just call it minetest.po
* | | | | | Refactor mo creation/installationGiuseppe Bilotta2011-07-22
| | | | | |
* | | | | | Use project name for mo filesGiuseppe Bilotta2011-07-22
| | | | | |
* | | | | | Merge remote-tracking branch 'erlehmann/master'Giuseppe Bilotta2011-07-22
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts (from the introduction of fr translations): src/CMakeLists.txt
| * | | | | | Added french translation.Cyriaque Skrapits2011-07-21
| | | | | | |
| * | | | | | * different collision box for fireflies so they now hover above the groundNils Dagsson Moskopp2011-07-21
| | | | | | |
* | | | | | | changed some lines to fit the 80chars limitConstantin Wenger2011-07-22
| | | | | | |