Nils Dagsson Moskopp
4ef9c7675a
Merge remote-tracking branch 'origin/upstream'
2011-07-30 18:55:43 +02:00
Giuseppe Bilotta
cce210f676
Locale dir should be parallel to global data dir
2011-07-24 19:23:03 +02:00
Giuseppe Bilotta
a8e493122e
Read config from gettext.h
...
Otherwise the USE_GETTEXT define might not be visible.
2011-07-24 19:13:34 +02:00
Giuseppe Bilotta
3715e39e5d
Actually make USE_GETTEXT available in the source
2011-07-24 18:34:10 +02:00
Giuseppe Bilotta
423109e64c
Two more instances of unhardcoding the project name
2011-07-24 18:12:11 +02:00
Giuseppe Bilotta
e034f8a2a3
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.
2011-07-24 16:52:59 +02:00
Giuseppe Bilotta
47381bde3b
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.
2011-07-24 16:52:59 +02:00
Giuseppe Bilotta
c578efb32b
Refactor gettext init
...
Put the gettext init code in a macro and define it appropriately
depending on whether gettext is actually available or not.
2011-07-24 16:52:59 +02:00
Perttu Ahola
dbea511a6f
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.
2011-07-24 12:49:47 +03:00
Perttu Ahola
c9e615bde4
Updated the texture atlas a bit
2011-07-24 12:45:52 +03:00
Perttu Ahola
20fa7412c8
and now fixed a bug in removing that debug output
2011-07-24 12:13:51 +03:00
Perttu Ahola
d099165271
removed a remaining debug print
2011-07-24 12:12:55 +03:00
Perttu Ahola
29d905f98a
Added a mapblock analyzing function for debugging use and fixed remaining mapgen bugs
2011-07-24 12:09:33 +03:00
Perttu Ahola
ed8f5576a5
changed jungletree/junglegrass content ids to extended range
2011-07-24 11:40:14 +03:00
Perttu Ahola
112b85d0fb
merged fix to decapitated trees; other bugs now exists
2011-07-24 11:39:13 +03:00
Giuseppe Bilotta
5aa2679be7
Do not package en translation, since we don't build it
2011-07-24 09:19:25 +02:00
Giuseppe Bilotta
d4e7faca21
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.
2011-07-24 09:19:25 +02:00
Giuseppe Bilotta
4ffba76bb3
Place project name and gettext use in config
2011-07-24 09:18:29 +02:00
Perttu Ahola
8d84086f35
removed unnecessary verbosity from debug output of tile.cpp
2011-07-24 10:12:08 +03:00
Nils Dagsson Moskopp
f4a08f7fb3
Merge pull request #34 from SpeedProg/master
...
Changes to make gettext enabled if it is found
2011-07-23 19:01:51 -07:00
Perttu Ahola
73cf4b3016
made shadows less blue
2011-07-24 00:49:45 +03:00
Constantin Wenger
f6d9bcc9bb
updated cmakerules to autodetect if gettext can be used
...
fixed error if gettext is disabled
2011-07-23 22:36:11 +02:00
Perttu Ahola
68a9157b94
Fixed issue #15 : Glass blocks a lot of light
2011-07-23 20:28:05 +03:00
Perttu Ahola
26582e0e66
Fixed #21 Earth under torches oscillates between mud and grass
2011-07-23 20:22:22 +03:00
Perttu Ahola
0b4cdfa023
Made hotbar a bit smaller
2011-07-23 20:22:04 +03:00
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
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
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
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
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
Nils Dagsson Moskopp
7985d746f9
Merge branch 'upstream/master'
2011-07-22 20:16:58 +02:00
Nils Dagsson Moskopp
805ccd449f
Merge branch 'upstream/master'
2011-07-22 20:16:58 +02: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
