oweals/minetest.git
13 years agoMerge branch 'master' of github.com:erlehmann/minetest-delta
Nils Dagsson Moskopp [Sat, 30 Jul 2011 20:33:26 +0000 (22:33 +0200)]
Merge branch 'master' of github.com:erlehmann/minetest-delta

13 years agoMerge pull request #40 from SpeedProg/master
Nils Dagsson Moskopp [Sat, 30 Jul 2011 20:33:08 +0000 (13:33 -0700)]
Merge pull request #40 from SpeedProg/master

translated some word to german

13 years agogerman translation update, translated some of the new strings
Constantin Wenger [Sat, 30 Jul 2011 20:28:18 +0000 (22:28 +0200)]
german translation update, translated some of the new strings

13 years agoMerge pull request #39 from SpeedProg/master
Nils Dagsson Moskopp [Sat, 30 Jul 2011 20:28:14 +0000 (13:28 -0700)]
Merge pull request #39 from SpeedProg/master

fixes for gettext to workaround some bad behaviour of Irrlicht

13 years agothis fixes problem with msvc++ and should work on other systems and so on anyway.
Constantin Wenger [Sat, 30 Jul 2011 16:35:55 +0000 (18:35 +0200)]
this fixes problem with msvc++ and should work on other systems and so on anyway.

13 years agochanged one forgotten en_US.UTF-8 to C
Constantin Wenger [Sat, 30 Jul 2011 09:44:50 +0000 (11:44 +0200)]
changed one forgotten en_US.UTF-8 to C

13 years agofixed redefinitivon of gettext.h is included more than once
Constantin Wenger [Sat, 30 Jul 2011 09:44:45 +0000 (11:44 +0200)]
fixed redefinitivon of gettext.h is included more than once

13 years agoset some more text to gettext and updated po files
Constantin Wenger [Sat, 30 Jul 2011 09:43:20 +0000 (11:43 +0200)]
set some more text to gettext and updated po files

13 years agochanged some strings of the german translation to fit in the areas
Constantin Wenger [Sat, 30 Jul 2011 08:22:32 +0000 (10:22 +0200)]
changed some strings of the german translation to fit in the areas

13 years agoset locales to C because en_US not installed on some systems, only UTF-8 version...
Constantin Wenger [Sat, 30 Jul 2011 08:14:58 +0000 (10:14 +0200)]
set locales to C because en_US not installed on some systems, only UTF-8 version and en_US.UTF-8 does not work.

13 years agofixed displaying "umlauts" (deutsch umlaute) and hopefully other non ASCII chars...
Constantin Wenger [Fri, 29 Jul 2011 21:33:33 +0000 (23:33 +0200)]
fixed displaying "umlauts" (deutsch umlaute) and hopefully other non ASCII chars, too

13 years ago* honor environment variables, use utf-8
Nils Dagsson Moskopp [Sat, 30 Jul 2011 19:12:49 +0000 (21:12 +0200)]
* honor environment variables, use utf-8

13 years ago* PEP 8 compliance
Nils Dagsson Moskopp [Sat, 30 Jul 2011 19:05:33 +0000 (21:05 +0200)]
* PEP 8 compliance

13 years ago- removed old minetestmapper
Nils Dagsson Moskopp [Sat, 30 Jul 2011 18:37:53 +0000 (20:37 +0200)]
- removed old minetestmapper

13 years ago* support for content types extension in minetestmapper
Wolfgang Fellger [Sat, 30 Jul 2011 18:35:55 +0000 (20:35 +0200)]
* support for content types extension in minetestmapper

13 years agoMerge branch 'upstream/master'
Nils Dagsson Moskopp [Sat, 30 Jul 2011 17:46:55 +0000 (19:46 +0200)]
Merge branch 'upstream/master'

13 years ago* README updated
Nils Dagsson Moskopp [Sat, 30 Jul 2011 17:30:43 +0000 (19:30 +0200)]
* README updated

13 years ago- compiling with translations works again
Nils Dagsson Moskopp [Sat, 30 Jul 2011 17:28:44 +0000 (19:28 +0200)]
- compiling with translations works again

13 years agofix to the former
Perttu Ahola [Sat, 30 Jul 2011 17:10:16 +0000 (20:10 +0300)]
fix to the former

13 years agoeasier notice on old version
Perttu Ahola [Sat, 30 Jul 2011 17:06:30 +0000 (20:06 +0300)]
easier notice on old version

13 years agoAdded network protocol version number in protocol
Perttu Ahola [Sat, 30 Jul 2011 17:02:17 +0000 (20:02 +0300)]
Added network protocol version number in protocol

13 years agoMerge remote-tracking branch 'origin/upstream'
Nils Dagsson Moskopp [Sat, 30 Jul 2011 16:53:54 +0000 (18:53 +0200)]
Merge remote-tracking branch 'origin/upstream'

13 years agoServer configuration is now written when "/#setting whatever = whatever" is issued.
Perttu Ahola [Sat, 30 Jul 2011 16:49:42 +0000 (19:49 +0300)]
Server configuration is now written when "/#setting whatever = whatever" is issued.

13 years agoAdded message of the day and made it properly configurable using /#setting (not saved...
Perttu Ahola [Sat, 30 Jul 2011 16:31:33 +0000 (19:31 +0300)]
Added message of the day and made it properly configurable using /#setting (not saved to config file yet)

13 years agoMade picking items up in creative mode delete them (because they usually are in the...
Perttu Ahola [Sat, 30 Jul 2011 16:05:25 +0000 (19:05 +0300)]
Made picking items up in creative mode delete them (because they usually are in the inventory already anyway)

13 years agoupdated pause menu text a bit
Perttu Ahola [Sat, 30 Jul 2011 15:54:02 +0000 (18:54 +0300)]
updated pause menu text a bit

13 years agoRats are now eatable. Also made their selection box move smoothly.
Perttu Ahola [Sat, 30 Jul 2011 15:51:15 +0000 (18:51 +0300)]
Rats are now eatable. Also made their selection box move smoothly.

13 years agoMade rats cookable and made them spawn near trees
Perttu Ahola [Sat, 30 Jul 2011 14:51:21 +0000 (17:51 +0300)]
Made rats cookable and made them spawn near trees

13 years agomade more things burnable in furnace
Perttu Ahola [Sat, 30 Jul 2011 11:57:43 +0000 (14:57 +0300)]
made more things burnable in furnace

13 years agoquick fix to it not building with gettext on my visual studio environment
Perttu Ahola [Sat, 30 Jul 2011 11:38:41 +0000 (14:38 +0300)]
quick fix to it not building with gettext on my visual studio environment

13 years agoRemoved remaining -delta references
Perttu Ahola [Sat, 30 Jul 2011 11:02:11 +0000 (14:02 +0300)]
Removed remaining -delta references

13 years agoremoved delta README
Perttu Ahola [Fri, 29 Jul 2011 09:59:37 +0000 (12:59 +0300)]
removed delta README

13 years agofix server build
Perttu Ahola [Mon, 25 Jul 2011 20:31:02 +0000 (23:31 +0300)]
fix server build

13 years agoMerge branch 'master' of github.com:erlehmann/minetest-delta
Nils Dagsson Moskopp [Sun, 24 Jul 2011 18:04:20 +0000 (20:04 +0200)]
Merge branch 'master' of github.com:erlehmann/minetest-delta

13 years agoMerge pull request #36 from Oblomov/master
Nils Dagsson Moskopp [Sun, 24 Jul 2011 18:00:38 +0000 (11:00 -0700)]
Merge pull request #36 from Oblomov/master

Some more gettext stuff

13 years agoLocale dir should be parallel to global data dir
Giuseppe Bilotta [Sun, 24 Jul 2011 17:20:40 +0000 (19:20 +0200)]
Locale dir should be parallel to global data dir

13 years agoRead config from gettext.h
Giuseppe Bilotta [Sun, 24 Jul 2011 17:13:30 +0000 (19:13 +0200)]
Read config from gettext.h

Otherwise the USE_GETTEXT define might not be visible.

13 years agoItalian translations
Giuseppe Bilotta [Sun, 24 Jul 2011 17:06:17 +0000 (19:06 +0200)]
Italian translations

13 years ago+ 24x24 rendering of SVG minetest icon, polished manually to look crisp
Nils Dagsson Moskopp [Sun, 24 Jul 2011 16:51:44 +0000 (18:51 +0200)]
+ 24x24 rendering of SVG minetest icon, polished manually to look crisp

13 years agoActually make USE_GETTEXT available in the source
Giuseppe Bilotta [Sun, 24 Jul 2011 16:34:10 +0000 (18:34 +0200)]
Actually make USE_GETTEXT available in the source

13 years agoTwo more instances of unhardcoding the project name
Giuseppe Bilotta [Sun, 24 Jul 2011 16:12:11 +0000 (18:12 +0200)]
Two more instances of unhardcoding the project name

13 years agoMerge pull request #35 from Oblomov/master
Nils Dagsson Moskopp [Sun, 24 Jul 2011 16:01:10 +0000 (09:01 -0700)]
Merge pull request #35 from Oblomov/master

some more gettext fixes

13 years agoSanitize GETTEXT usage macros
Giuseppe Bilotta [Sun, 24 Jul 2011 11:58:51 +0000 (13:58 +0200)]
Sanitize GETTEXT usage macros

Now the user-level option is called ENABLE_GETTEXT, and USE_GETTEXT is
only set to true if gettext was enabled and found. This simplifies all
check to USE_GETTEXT only rather than the double checks for it being
enabled and found.

13 years agoBring po update out of cmake again
Giuseppe Bilotta [Sun, 24 Jul 2011 08:19:31 +0000 (10:19 +0200)]
Bring po update out of cmake again

This solves two issues at once:
* CMake would delete po files during ‘make clean’ because it thought
  they were autogenerated and not just managed
* the only gettext tools readily available in Windows are so old they
  don't support options like --package-name

The change also moves minetest.pot down one level, so we don't need to
special case ‘en’ anymore.

The downside is of course that you need some sane POSIX shell to update
the po files.

13 years agoRefactor gettext init
Giuseppe Bilotta [Sat, 23 Jul 2011 14:38:37 +0000 (16:38 +0200)]
Refactor gettext init

Put the gettext init code in a macro and define it appropriately
depending on whether gettext is actually available or not.

13 years agoLowered default viewing range minimum to such that it allows fairly good framerate...
Perttu Ahola [Sun, 24 Jul 2011 09:49:47 +0000 (12:49 +0300)]
Lowered default viewing range minimum to such that it allows fairly good framerate in jungles with sucky hardware.
Almost all computers stick to the minimum with the current farmesh range that someone has set up without asking from me, but farmesh is not used as default anyway so those that use it can raise the lower limit in their configuration as they wish.

13 years agoUpdated the texture atlas a bit
Perttu Ahola [Sun, 24 Jul 2011 09:45:52 +0000 (12:45 +0300)]
Updated the texture atlas a bit

13 years agoand now fixed a bug in removing that debug output
Perttu Ahola [Sun, 24 Jul 2011 09:13:51 +0000 (12:13 +0300)]
and now fixed a bug in removing that debug output

13 years agoremoved a remaining debug print
Perttu Ahola [Sun, 24 Jul 2011 09:12:55 +0000 (12:12 +0300)]
removed a remaining debug print

13 years agoAdded a mapblock analyzing function for debugging use and fixed remaining mapgen...
Perttu Ahola [Sun, 24 Jul 2011 09:09:33 +0000 (12:09 +0300)]
Added a mapblock analyzing function for debugging use and fixed remaining mapgen bugs

13 years agochanged jungletree/junglegrass content ids to extended range
Perttu Ahola [Sun, 24 Jul 2011 08:40:14 +0000 (11:40 +0300)]
changed jungletree/junglegrass content ids to extended range

13 years agomerged fix to decapitated trees; other bugs now exists
Perttu Ahola [Sun, 24 Jul 2011 08:39:13 +0000 (11:39 +0300)]
merged fix to decapitated trees; other bugs now exists

13 years agoDo not package en translation, since we don't build it
Giuseppe Bilotta [Sat, 23 Jul 2011 14:15:29 +0000 (16:15 +0200)]
Do not package en translation, since we don't build it

13 years agoGettext domain should match the project name
Giuseppe Bilotta [Sat, 23 Jul 2011 13:49:06 +0000 (15:49 +0200)]
Gettext domain should match the project name

This partially reverts 023cc0d37776976b4b192b7363f73a5d2debdef6, goes
back to using PROJECT_NAME for the filename and also uses PROJECT_NAME
as text domain in the source code.

13 years agoPlace project name and gettext use in config
Giuseppe Bilotta [Sat, 23 Jul 2011 13:47:09 +0000 (15:47 +0200)]
Place project name and gettext use in config

13 years agoremoved unnecessary verbosity from debug output of tile.cpp
Perttu Ahola [Sun, 24 Jul 2011 07:12:08 +0000 (10:12 +0300)]
removed unnecessary verbosity from debug output of tile.cpp

13 years agoMerge pull request #34 from SpeedProg/master
Nils Dagsson Moskopp [Sun, 24 Jul 2011 02:01:51 +0000 (19:01 -0700)]
Merge pull request #34 from SpeedProg/master

Changes to make gettext enabled if it is found

13 years agowho put pnoise.py in my /?
Perttu Ahola [Sat, 23 Jul 2011 22:51:27 +0000 (01:51 +0300)]
who put pnoise.py in my /?

13 years agomade shadows less blue
Perttu Ahola [Sat, 23 Jul 2011 21:49:45 +0000 (00:49 +0300)]
made shadows less blue

13 years agoupdated cmakerules to autodetect if gettext can be used
Constantin Wenger [Sat, 23 Jul 2011 20:36:11 +0000 (22:36 +0200)]
updated cmakerules to autodetect if gettext can be used
fixed error if gettext is disabled

13 years agoFixed issue #15: Glass blocks a lot of light
Perttu Ahola [Sat, 23 Jul 2011 17:28:05 +0000 (20:28 +0300)]
Fixed issue #15: Glass blocks a lot of light

13 years agoFixed #21 Earth under torches oscillates between mud and grass
Perttu Ahola [Sat, 23 Jul 2011 17:22:22 +0000 (20:22 +0300)]
Fixed #21 Earth under torches oscillates between mud and grass

13 years agoMade hotbar a bit smaller
Perttu Ahola [Sat, 23 Jul 2011 17:22:04 +0000 (20:22 +0300)]
Made hotbar a bit smaller

13 years agomerged jungle and bluish shadows
Perttu Ahola [Sat, 23 Jul 2011 17:01:06 +0000 (20:01 +0300)]
merged jungle and bluish shadows

13 years agoremoved -delta namings
Perttu Ahola [Sat, 23 Jul 2011 16:33:49 +0000 (19:33 +0300)]
removed -delta namings

13 years agoconverted main.cpp dos linefeeds to unix linefeeds.
Perttu Ahola [Sat, 23 Jul 2011 16:17:39 +0000 (19:17 +0300)]
converted main.cpp dos linefeeds to unix linefeeds.

13 years agoupdated main.cpp comments a bit
Perttu Ahola [Sat, 23 Jul 2011 16:16:49 +0000 (19:16 +0300)]
updated main.cpp comments a bit

13 years agochanged rat texture to mine
Perttu Ahola [Sat, 23 Jul 2011 16:05:06 +0000 (19:05 +0300)]
changed rat texture to mine

13 years agomerged the content type extension and delta
Perttu Ahola [Sat, 23 Jul 2011 16:04:37 +0000 (19:04 +0300)]
merged the content type extension and delta

13 years agoextended content-type range
Perttu Ahola [Sat, 23 Jul 2011 13:55:26 +0000 (16:55 +0300)]
extended content-type range

13 years agoswitched to old transformLiquids, new one is not ready
Perttu Ahola [Sat, 23 Jul 2011 13:46:34 +0000 (16:46 +0300)]
switched to old transformLiquids, new one is not ready

13 years agoswitched my textures back
Perttu Ahola [Sat, 23 Jul 2011 13:08:07 +0000 (16:08 +0300)]
switched my textures back

13 years agouh, i guess this now merges the new delta stuff?
Perttu Ahola [Sat, 23 Jul 2011 12:50:05 +0000 (15:50 +0300)]
uh, i guess this now merges the new delta stuff?

13 years agomerged some stuff from upstream while merging delta
Perttu Ahola [Sat, 23 Jul 2011 12:46:00 +0000 (15:46 +0300)]
merged some stuff from upstream while merging delta

13 years agoMade dark places tint slightly in blue
Perttu Ahola [Sat, 23 Jul 2011 01:10:17 +0000 (04:10 +0300)]
Made dark places tint slightly in blue

13 years agoJungle biome/whatever thing
Perttu Ahola [Fri, 22 Jul 2011 23:04:24 +0000 (02:04 +0300)]
Jungle biome/whatever thing

13 years agoMerge branch 'master' of git://github.com/erlehmann/minetest-delta
Perttu Ahola [Fri, 22 Jul 2011 19:59:15 +0000 (22:59 +0300)]
Merge branch 'master' of git://github.com/erlehmann/minetest-delta

13 years ago* README updated
Nils Dagsson Moskopp [Fri, 22 Jul 2011 19:56:00 +0000 (21:56 +0200)]
* README updated

13 years ago* README updated
Nils Dagsson Moskopp [Fri, 22 Jul 2011 19:56:00 +0000 (21:56 +0200)]
* README updated

13 years ago* key change menu now saving immediately
Perttu Ahola [Fri, 22 Jul 2011 19:53:50 +0000 (21:53 +0200)]
* key change menu now saving immediately

13 years agoChanging key settings now doesn't require a game restart
Perttu Ahola [Fri, 22 Jul 2011 19:35:20 +0000 (22:35 +0300)]
Changing key settings now doesn't require a game restart

13 years agoMerge pull request #33 from SpeedProg/master
Nils Dagsson Moskopp [Fri, 22 Jul 2011 19:10:19 +0000 (12:10 -0700)]
Merge pull request #33 from SpeedProg/master

gettext fix of laguagefile names

13 years agochange in readme of a lib
Constantin Wenger [Fri, 22 Jul 2011 18:55:00 +0000 (20:55 +0200)]
change in readme of a lib

13 years agochange in readme of a lib
Constantin Wenger [Fri, 22 Jul 2011 18:55:00 +0000 (20:55 +0200)]
change in readme of a lib

13 years agoMerge remote-tracking branch 'upstream/master'
Constantin Wenger [Fri, 22 Jul 2011 18:53:29 +0000 (20:53 +0200)]
Merge remote-tracking branch 'upstream/master'

13 years agoMerge remote-tracking branch 'upstream/master'
Constantin Wenger [Fri, 22 Jul 2011 18:53:29 +0000 (20:53 +0200)]
Merge remote-tracking branch 'upstream/master'

13 years agofixed some problems with filenames of the translations
Constantin Wenger [Fri, 22 Jul 2011 18:19:43 +0000 (20:19 +0200)]
fixed some problems with filenames of the translations

13 years agofixed some problems with filenames of the translations
Constantin Wenger [Fri, 22 Jul 2011 18:19:43 +0000 (20:19 +0200)]
fixed some problems with filenames of the translations

13 years agoupdated some parts which don't really make a problem but are better this way
Constantin Wenger [Wed, 20 Jul 2011 17:57:44 +0000 (19:57 +0200)]
updated some parts which don't really make a problem but are better this way

13 years agoupdated some parts which don't really make a problem but are better this way
Constantin Wenger [Wed, 20 Jul 2011 17:57:44 +0000 (19:57 +0200)]
updated some parts which don't really make a problem but are better this way

13 years agoMerge branch 'upstream/master'
Nils Dagsson Moskopp [Fri, 22 Jul 2011 18:16:58 +0000 (20:16 +0200)]
Merge branch 'upstream/master'

13 years agoMerge branch 'upstream/master'
Nils Dagsson Moskopp [Fri, 22 Jul 2011 18:16:58 +0000 (20:16 +0200)]
Merge branch 'upstream/master'

13 years agoMerge pull request #32 from Oblomov/master
Nils Dagsson Moskopp [Fri, 22 Jul 2011 17:30:55 +0000 (10:30 -0700)]
Merge pull request #32 from Oblomov/master

Gettext + misc fixes

13 years agoMerge pull request #32 from Oblomov/master
Nils Dagsson Moskopp [Fri, 22 Jul 2011 17:30:55 +0000 (10:30 -0700)]
Merge pull request #32 from Oblomov/master

Gettext + misc fixes

13 years agoFixed the problem of <=r548 clients fucking up maps on >=r549 servers. Also, already...
Perttu Ahola [Fri, 22 Jul 2011 15:51:49 +0000 (18:51 +0300)]
Fixed the problem of <=r548 clients fucking up maps on >=r549 servers. Also, already fucked up maps are now loaded correctly.

13 years agoDeclare USE_GETTEXT option
Giuseppe Bilotta [Fri, 22 Jul 2011 12:42:04 +0000 (14:42 +0200)]
Declare USE_GETTEXT option

13 years agoDeclare USE_GETTEXT option
Giuseppe Bilotta [Fri, 22 Jul 2011 12:42:04 +0000 (14:42 +0200)]
Declare USE_GETTEXT option

13 years agofixed problem with displaying special chars
Constantin Wenger [Fri, 22 Jul 2011 10:54:07 +0000 (12:54 +0200)]
fixed problem with displaying special chars

13 years agofixed problem with displaying special chars
Constantin Wenger [Fri, 22 Jul 2011 10:54:07 +0000 (12:54 +0200)]
fixed problem with displaying special chars

13 years agoupdatepo cmake rule
Giuseppe Bilotta [Fri, 22 Jul 2011 08:55:05 +0000 (10:55 +0200)]
updatepo cmake rule

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.