summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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
| |
* | Merge pull request #32 from Oblomov/masterNils Dagsson Moskopp2011-07-22
|\ \ | | | | | | Gettext + misc fixes
| * | 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
* | | * nicer firefly textureNils Dagsson Moskopp2011-07-21
| | |
* | | + unknown block is sickNils Dagsson Moskopp2011-07-21
| | |
* | | Merge pull request #29 from cisoun/masterNils Dagsson Moskopp2011-07-21
|\ \ \ | | | | | | | | Add french translation.
| * | | Added missing .po fil.eCyriaque Skrapits2011-07-21
| | | |
| * | | 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
| | |
| * | fixed not finding dll for gettext in MSVCConstantin Wenger2011-07-21
| | |
| * | Reorganize cmake gettext message output to ease debuggingGiuseppe Bilotta2011-07-21
| | |
| * | Restore "Leave address blank" positionGiuseppe Bilotta2011-07-21
| | |
| * | Find correct library for MSVC vs MingW in WinowsGiuseppe Bilotta2011-07-21
| | |
| * | Only install locale files if using gettextGiuseppe Bilotta2011-07-21
| | |
| * | Uppercase DEFINED or cmake 2.8.4 complainsGiuseppe Bilotta2011-07-21
| | |
| * | updated some path because the dlls are mostly under bin not libConstantin Wenger2011-07-21
| | | | | | | | | added explanation why libintl must not belinked under some oses
| * | Refactor and clean up gettext managementGiuseppe Bilotta2011-07-21
| | |
| * | Make gettext optionalGiuseppe Bilotta2011-07-21
| | |
| * | Tweak makefiles to add -delta suffix.Weedy2011-07-21
| | |
| * | Fix win32 MSVC compile. (screw gettext)Weedy2011-07-21
|/ /
* | Merge pull request #27 from Oblomov/masterNils Dagsson Moskopp2011-07-20
|\ \ | | | | | | * regression fix for windows build.
| * | Move package search out of conditionalGiuseppe Bilotta2011-07-20
| | | | | | | | | | | | | | | This unbreaks the Windows build which would otherwise have problems at the jthread level.
* | | + firefliesNils Dagsson Moskopp2011-07-20
| | |
* | | * README updatedNils Dagsson Moskopp2011-07-20
| | |
* | | Merge branch 'master' of github.com:erlehmann/minetest-deltaNils Dagsson Moskopp2011-07-20
|\ \ \
| * \ \ Merge pull request #24 from SpeedProg/masterNils Dagsson Moskopp2011-07-20
| |\ \ \ | | |/ / | |/| | gettext paths problem
| | * | fixed problem with wront paths in gettextConstantin Wenger2011-07-20
| | | |
* | | | Merge branch 'master' of github.com:erlehmann/minetest-deltaNils Dagsson Moskopp2011-07-20
|\| | |
| * | | Merge pull request #23 from Oblomov/masterNils Dagsson Moskopp2011-07-20
| |\ \ \ | | | | | | | | | | Some misc usability patches
| | * | | Set the window caption for the initial window tooGiuseppe Bilotta2011-07-20
| | | | |
| | * | | Check the data path before usageGiuseppe Bilotta2011-07-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When not running in place, check if the assumed data path in ../share/APPNAME exists. If it doesn't exist, fall back to ../data instead. This allows the program to run successfully from the checkout directory even without the run-in-place flag active.
| | * | | Use system sqlite3/jthread libs if availableGiuseppe Bilotta2011-07-20
| |/ / /
* | | | Merge branch 'master' of github.com:erlehmann/minetest-deltaNils Dagsson Moskopp2011-07-20
|\| | |
| * | | Merge pull request #22 from SpeedProg/masterNils Dagsson Moskopp2011-07-20
| |\| | | | | | | | | | added gettext support
| | * | updated german po file for minetest-delta (prior it was for minetest)Constantin Wenger2011-07-20
| | | | | | | | | | | | set +x on bashscript
| | * | added gettext supportConstantin Wenger2011-07-20
| |/ / | | | | | | | | | german translation file and bashscript to update translations
* | | Merge branch 'upstream/master'Nils Dagsson Moskopp2011-07-20
|\ \ \ | |/ / |/| / | |/
| * Hopefully fixed u64 to be the actual 64-bit type on 64-bit architectures. ↵Perttu Ahola2011-07-17
| | | | | | | | This should fix the compiler error caused by irrlicht on 64-bit fedora defining u64 to be different.
| * A small fix to an unlikely situation where the map generator requires a ↵Perttu Ahola2011-07-17
| | | | | | | | block that hasn't been loaded from disk. Now it is actually loaded from disk in that case.