Commit Graph

969 Commits

Author SHA1 Message Date
Perttu Ahola 501034a792 merged jungle and bluish shadows 2011-07-23 20:01:06 +03:00
Perttu Ahola 96fedb5cb0 removed -delta namings 2011-07-23 19:33:49 +03:00
Perttu Ahola f13fc82abe converted main.cpp dos linefeeds to unix linefeeds. 2011-07-23 19:17:39 +03:00
Perttu Ahola bc14898bf9 updated main.cpp comments a bit 2011-07-23 19:16:49 +03:00
Perttu Ahola a42d324142 changed rat texture to mine 2011-07-23 19:05:06 +03:00
Perttu Ahola 2587bb361c merged the content type extension and delta 2011-07-23 19:04:37 +03:00
Perttu Ahola 90d793f8f3 extended content-type range 2011-07-23 16:55:26 +03:00
Perttu Ahola 976ec31c1f switched to old transformLiquids, new one is not ready 2011-07-23 16:46:34 +03:00
Perttu Ahola 98be778766 switched my textures back 2011-07-23 16:08:07 +03:00
Perttu Ahola f17cfb35d1 uh, i guess this now merges the new delta stuff? 2011-07-23 15:50:05 +03:00
Perttu Ahola 3882536d40 merged some stuff from upstream while merging delta 2011-07-23 15:46:00 +03:00
Perttu Ahola d67cef0eb7 Made dark places tint slightly in blue 2011-07-23 04:10:17 +03:00
Perttu Ahola 8993d9dd83 Jungle biome/whatever thing 2011-07-23 02:04:24 +03:00
Perttu Ahola fdf14471c6 Merge branch 'master' of git://github.com/erlehmann/minetest-delta 2011-07-22 22:59:15 +03:00
Nils Dagsson Moskopp a7daf8e652 * README updated 2011-07-22 21:56:00 +02:00
Nils Dagsson Moskopp 7da02e05a6 * README updated 2011-07-22 21:56:00 +02:00
Perttu Ahola 6c2d95f868 * key change menu now saving immediately 2011-07-22 21:54:26 +02:00
Perttu Ahola 58f612eca1 Changing key settings now doesn't require a game restart 2011-07-22 22:35:20 +03:00
Nils Dagsson Moskopp 2452ce67f4 Merge pull request #33 from SpeedProg/master
gettext fix of laguagefile names
2011-07-22 12:10:19 -07:00
Constantin Wenger 4771b4951d change in readme of a lib 2011-07-22 20:55:00 +02:00
Constantin Wenger 84c370b1db change in readme of a lib 2011-07-22 20:55:00 +02:00
Constantin Wenger 383698186f Merge remote-tracking branch 'upstream/master' 2011-07-22 20:53:29 +02:00
Constantin Wenger 2abe6ed75c Merge remote-tracking branch 'upstream/master' 2011-07-22 20:53:29 +02:00
Constantin Wenger fb4c3ab4fb fixed some problems with filenames of the translations 2011-07-22 20:40:47 +02:00
Constantin Wenger a12229f271 fixed some problems with filenames of the translations 2011-07-22 20:40:47 +02:00
Constantin Wenger 96ad0c8638 updated some parts which don't really make a problem but are better this way 2011-07-22 20:40:46 +02:00
Constantin Wenger b278988924 updated some parts which don't really make a problem but are better this way 2011-07-22 20:40:46 +02:00
Nils Dagsson Moskopp 805ccd449f Merge branch 'upstream/master' 2011-07-22 20:16:58 +02:00
Nils Dagsson Moskopp 7985d746f9 Merge branch 'upstream/master' 2011-07-22 20:16:58 +02:00
Nils Dagsson Moskopp a45f287ae1 Merge pull request #32 from Oblomov/master
Gettext + misc fixes
2011-07-22 10:30:55 -07:00
Nils Dagsson Moskopp 0fbb0bcaab Merge pull request #32 from Oblomov/master
Gettext + misc fixes
2011-07-22 10:30:55 -07:00
Perttu Ahola f706644a50 Fixed the problem of <=r548 clients fucking up maps on >=r549 servers. Also, already fucked up maps are now loaded correctly. 2011-07-22 18:51:49 +03:00
Giuseppe Bilotta 7d9dd352cf Declare USE_GETTEXT option 2011-07-22 14:42:04 +02:00
Giuseppe Bilotta 9653522873 Declare USE_GETTEXT option 2011-07-22 14:42:04 +02:00
Constantin Wenger a09660dc85 fixed problem with displaying special chars 2011-07-22 13:27:30 +02:00
Constantin Wenger bf3dfec7d6 fixed problem with displaying special chars 2011-07-22 13:27:30 +02:00
Giuseppe Bilotta d78e5e7329 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.
2011-07-22 12:40:29 +02:00
Giuseppe Bilotta aaa165f985 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.
2011-07-22 12:40:29 +02:00
Perttu Ahola 2b39be44e4 added an unit test for the Settings thingy (the python ConfigParser -like thing) 2011-07-22 13:10:58 +03:00
Giuseppe Bilotta e61b2f99c1 Static naming of po file
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
2011-07-22 09:58:02 +02:00
Giuseppe Bilotta 8f2409a1b4 Static naming of po file
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
2011-07-22 09:58:02 +02:00
Giuseppe Bilotta d386f02893 Refactor mo creation/installation 2011-07-22 09:36:17 +02:00
Giuseppe Bilotta 0ec749317c Refactor mo creation/installation 2011-07-22 09:36:17 +02:00
Giuseppe Bilotta 5a3218e535 Use project name for mo files 2011-07-22 08:33:08 +02:00
Giuseppe Bilotta bc05bd8b59 Use project name for mo files 2011-07-22 08:33:08 +02:00
Giuseppe Bilotta 02653573d2 Merge remote-tracking branch 'erlehmann/master'
Conflicts (from the introduction of fr translations):
	src/CMakeLists.txt
2011-07-22 07:48:22 +02:00
Giuseppe Bilotta 7c1ea34baf Merge remote-tracking branch 'erlehmann/master'
Conflicts (from the introduction of fr translations):
	src/CMakeLists.txt
2011-07-22 07:48:22 +02:00
Constantin Wenger 5c66664aef changed some lines to fit the 80chars limit 2011-07-22 07:25:40 +02:00
Constantin Wenger 3d53cc2c11 changed some lines to fit the 80chars limit 2011-07-22 07:25:40 +02:00
Perttu Ahola 329158f7d1 Fixed small error in mapnode.cpp (didn't cause any harm though) 2011-07-22 01:37:21 +03:00