aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* switched to old transformLiquids, new one is not readyPerttu Ahola2011-07-231-207/+216
* switched my textures backPerttu Ahola2011-07-233-0/+0
* uh, i guess this now merges the new delta stuff?Perttu Ahola2011-07-2320-147/+402
|\
| * * README updatedNils Dagsson Moskopp2011-07-221-1/+1
| * * key change menu now saving immediatelyPerttu Ahola2011-07-222-3/+5
| * Merge pull request #33 from SpeedProg/masterNils Dagsson Moskopp2011-07-222-3/+3
| |\
| | * change in readme of a libConstantin Wenger2011-07-221-1/+1
| | * Merge remote-tracking branch 'upstream/master'Constantin Wenger2011-07-224-44/+101
| | |\ | | |/ | |/|
| * | Merge branch 'upstream/master'Nils Dagsson Moskopp2011-07-224-44/+101
| |\ \
| | | * fixed some problems with filenames of the translationsConstantin Wenger2011-07-222-3/+3
| | | * updated some parts which don't really make a problem but are better this wayConstantin Wenger2011-07-221-1/+1
| | |/ | |/|
| * | Merge pull request #32 from Oblomov/masterNils Dagsson Moskopp2011-07-2215-141/+394
| |\ \
| | * | Declare USE_GETTEXT optionGiuseppe Bilotta2011-07-221-0/+2
| | * | fixed problem with displaying special charsConstantin Wenger2011-07-221-1/+1
| | * | updatepo cmake ruleGiuseppe Bilotta2011-07-226-65/+210
| | * | Static naming of po fileGiuseppe Bilotta2011-07-224-5/+5
| | * | Refactor mo creation/installationGiuseppe Bilotta2011-07-222-26/+36
| | * | Use project name for mo filesGiuseppe Bilotta2011-07-221-6/+6
| | * | Merge remote-tracking branch 'erlehmann/master'Giuseppe Bilotta2011-07-226-1/+140
| | |\ \ | | |/ / | |/| |
| * | | * nicer firefly textureNils Dagsson Moskopp2011-07-211-0/+0
| * | | + unknown block is sickNils Dagsson Moskopp2011-07-211-0/+0
| | * | changed some lines to fit the 80chars limitConstantin Wenger2011-07-225-19/+38
| | * | fixed not finding dll for gettext in MSVCConstantin Wenger2011-07-211-2/+2
| | * | Reorganize cmake gettext message output to ease debuggingGiuseppe Bilotta2011-07-211-8/+8
| | * | Restore "Leave address blank" positionGiuseppe Bilotta2011-07-211-0/+1
| | * | Find correct library for MSVC vs MingW in WinowsGiuseppe Bilotta2011-07-212-5/+8
| | * | Only install locale files if using gettextGiuseppe Bilotta2011-07-211-2/+4
| | * | Uppercase DEFINED or cmake 2.8.4 complainsGiuseppe Bilotta2011-07-211-2/+2
| | * | updated some path because the dlls are mostly under bin not libConstantin Wenger2011-07-211-2/+3
| | * | Refactor and clean up gettext managementGiuseppe Bilotta2011-07-212-28/+74
| | * | Make gettext optionalGiuseppe Bilotta2011-07-212-27/+48
| | * | Tweak makefiles to add -delta suffix.Weedy2011-07-213-24/+28
| | * | Fix win32 MSVC compile. (screw gettext)Weedy2011-07-211-3/+3
* | | | merged some stuff from upstream while merging deltaPerttu Ahola2011-07-234-44/+101
|\ \ \ \ | | |_|/ | |/| |
| * | | Fixed the problem of <=r548 clients fucking up maps on >=r549 servers. Also, ...Perttu Ahola2011-07-221-15/+23
| * | | added an unit test for the Settings thingy (the python ConfigParser -like thing)Perttu Ahola2011-07-221-0/+33
| * | | Fixed small error in mapnode.cpp (didn't cause any harm though)Perttu Ahola2011-07-221-1/+3
| * | | Fixed new map generator causing a crash when generating at map limitPerttu Ahola2011-07-222-28/+42
* | | | added some TODOs to main.cppPerttu Ahola2011-07-211-0/+6
* | | | Merged minetest-delta a624fe549bc75855a170Perttu Ahola2011-07-218-3/+22
|\| | | | |/ / |/| |
* | | Merge pull request #29 from cisoun/masterNils Dagsson Moskopp2011-07-213-1/+141
|\ \ \
| * | | Added missing .po fil.eCyriaque Skrapits2011-07-211-0/+125
| * | | Added french translation.Cyriaque Skrapits2011-07-212-1/+16
|/ / /
* | / * different collision box for fireflies so they now hover above the groundNils Dagsson Moskopp2011-07-211-1/+1
| |/ |/|
* | Merge pull request #27 from Oblomov/masterNils Dagsson Moskopp2011-07-201-2/+3
|\ \
| * | Move package search out of conditionalGiuseppe Bilotta2011-07-201-2/+3
* | | + firefliesNils Dagsson Moskopp2011-07-208-2/+409
* | | * README updatedNils Dagsson Moskopp2011-07-201-0/+2
* | | Merge branch 'master' of github.com:erlehmann/minetest-deltaNils Dagsson Moskopp2011-07-201-4/+4
|\ \ \
| * \ \ Merge pull request #24 from SpeedProg/masterNils Dagsson Moskopp2011-07-201-4/+4
| |\ \ \ | | |/ / | |/| |