oweals/minetest.git
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 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 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 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.

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.

13 years agoadded an unit test for the Settings thingy (the python ConfigParser -like thing)
Perttu Ahola [Fri, 22 Jul 2011 10:10:58 +0000 (13:10 +0300)]
added an unit test for the Settings thingy (the python ConfigParser -like thing)

13 years agoStatic naming of po file
Giuseppe Bilotta [Fri, 22 Jul 2011 07:58:02 +0000 (09:58 +0200)]
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

13 years agoStatic naming of po file
Giuseppe Bilotta [Fri, 22 Jul 2011 07:58:02 +0000 (09:58 +0200)]
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

13 years agoRefactor mo creation/installation
Giuseppe Bilotta [Fri, 22 Jul 2011 07:36:17 +0000 (09:36 +0200)]
Refactor mo creation/installation

13 years agoRefactor mo creation/installation
Giuseppe Bilotta [Fri, 22 Jul 2011 07:36:17 +0000 (09:36 +0200)]
Refactor mo creation/installation

13 years agoUse project name for mo files
Giuseppe Bilotta [Fri, 22 Jul 2011 06:33:08 +0000 (08:33 +0200)]
Use project name for mo files

13 years agoUse project name for mo files
Giuseppe Bilotta [Fri, 22 Jul 2011 06:33:08 +0000 (08:33 +0200)]
Use project name for mo files

13 years agoMerge remote-tracking branch 'erlehmann/master'
Giuseppe Bilotta [Fri, 22 Jul 2011 05:48:22 +0000 (07:48 +0200)]
Merge remote-tracking branch 'erlehmann/master'

Conflicts (from the introduction of fr translations):
src/CMakeLists.txt

13 years agoMerge remote-tracking branch 'erlehmann/master'
Giuseppe Bilotta [Fri, 22 Jul 2011 05:48:22 +0000 (07:48 +0200)]
Merge remote-tracking branch 'erlehmann/master'

Conflicts (from the introduction of fr translations):
src/CMakeLists.txt

13 years agochanged some lines to fit the 80chars limit
Constantin Wenger [Thu, 21 Jul 2011 14:44:43 +0000 (16:44 +0200)]
changed some lines to fit the 80chars limit

13 years agochanged some lines to fit the 80chars limit
Constantin Wenger [Thu, 21 Jul 2011 14:44:43 +0000 (16:44 +0200)]
changed some lines to fit the 80chars limit

13 years agoFixed small error in mapnode.cpp (didn't cause any harm though)
Perttu Ahola [Thu, 21 Jul 2011 22:37:21 +0000 (01:37 +0300)]
Fixed small error in mapnode.cpp (didn't cause any harm though)

13 years agoFixed new map generator causing a crash when generating at map limit
Perttu Ahola [Thu, 21 Jul 2011 22:37:05 +0000 (01:37 +0300)]
Fixed new map generator causing a crash when generating at map limit

13 years ago* nicer firefly texture
Nils Dagsson Moskopp [Thu, 21 Jul 2011 18:13:31 +0000 (20:13 +0200)]
* nicer firefly texture

13 years ago* nicer firefly texture
Nils Dagsson Moskopp [Thu, 21 Jul 2011 18:13:31 +0000 (20:13 +0200)]
* nicer firefly texture

13 years ago+ unknown block is sick
Nils Dagsson Moskopp [Thu, 21 Jul 2011 15:36:23 +0000 (17:36 +0200)]
+ unknown block is sick

13 years ago+ unknown block is sick
Nils Dagsson Moskopp [Thu, 21 Jul 2011 15:36:23 +0000 (17:36 +0200)]
+ unknown block is sick

13 years agoMerge pull request #29 from cisoun/master
Nils Dagsson Moskopp [Thu, 21 Jul 2011 14:33:34 +0000 (07:33 -0700)]
Merge pull request #29 from cisoun/master

Add french translation.

13 years agoMerge pull request #29 from cisoun/master
Nils Dagsson Moskopp [Thu, 21 Jul 2011 14:33:34 +0000 (07:33 -0700)]
Merge pull request #29 from cisoun/master

Add french translation.

13 years agofixed not finding dll for gettext in MSVC
Constantin Wenger [Thu, 21 Jul 2011 14:21:01 +0000 (16:21 +0200)]
fixed not finding dll for gettext in MSVC

13 years agofixed not finding dll for gettext in MSVC
Constantin Wenger [Thu, 21 Jul 2011 14:21:01 +0000 (16:21 +0200)]
fixed not finding dll for gettext in MSVC

13 years agoAdded missing .po fil.e
Cyriaque Skrapits [Thu, 21 Jul 2011 14:14:18 +0000 (16:14 +0200)]
Added missing .po fil.e

13 years agoAdded missing .po fil.e
Cyriaque Skrapits [Thu, 21 Jul 2011 14:14:18 +0000 (16:14 +0200)]
Added missing .po fil.e

13 years agoAdded french translation.
Cyriaque Skrapits [Thu, 21 Jul 2011 14:09:57 +0000 (16:09 +0200)]
Added french translation.

13 years agoAdded french translation.
Cyriaque Skrapits [Thu, 21 Jul 2011 14:09:57 +0000 (16:09 +0200)]
Added french translation.

13 years ago* different collision box for fireflies so they now hover above the ground
Nils Dagsson Moskopp [Thu, 21 Jul 2011 13:40:00 +0000 (15:40 +0200)]
* different collision box for fireflies so they now hover above the ground

13 years ago* different collision box for fireflies so they now hover above the ground
Nils Dagsson Moskopp [Thu, 21 Jul 2011 13:40:00 +0000 (15:40 +0200)]
* different collision box for fireflies so they now hover above the ground

13 years agoReorganize cmake gettext message output to ease debugging
Giuseppe Bilotta [Thu, 21 Jul 2011 13:16:59 +0000 (15:16 +0200)]
Reorganize cmake gettext message output to ease debugging

13 years agoReorganize cmake gettext message output to ease debugging
Giuseppe Bilotta [Thu, 21 Jul 2011 13:16:59 +0000 (15:16 +0200)]
Reorganize cmake gettext message output to ease debugging

13 years agoRestore "Leave address blank" position
Giuseppe Bilotta [Thu, 21 Jul 2011 13:12:58 +0000 (15:12 +0200)]
Restore "Leave address blank" position

13 years agoRestore "Leave address blank" position
Giuseppe Bilotta [Thu, 21 Jul 2011 13:12:58 +0000 (15:12 +0200)]
Restore "Leave address blank" position

13 years agoFind correct library for MSVC vs MingW in Winows
Giuseppe Bilotta [Thu, 21 Jul 2011 12:50:15 +0000 (14:50 +0200)]
Find correct library for MSVC vs MingW in Winows

13 years agoFind correct library for MSVC vs MingW in Winows
Giuseppe Bilotta [Thu, 21 Jul 2011 12:50:15 +0000 (14:50 +0200)]
Find correct library for MSVC vs MingW in Winows

13 years agoOnly install locale files if using gettext
Giuseppe Bilotta [Thu, 21 Jul 2011 12:46:14 +0000 (14:46 +0200)]
Only install locale files if using gettext

13 years agoOnly install locale files if using gettext
Giuseppe Bilotta [Thu, 21 Jul 2011 12:46:14 +0000 (14:46 +0200)]
Only install locale files if using gettext

13 years agoUppercase DEFINED or cmake 2.8.4 complains
Giuseppe Bilotta [Thu, 21 Jul 2011 11:59:50 +0000 (13:59 +0200)]
Uppercase DEFINED or cmake 2.8.4 complains

13 years agoUppercase DEFINED or cmake 2.8.4 complains
Giuseppe Bilotta [Thu, 21 Jul 2011 11:59:50 +0000 (13:59 +0200)]
Uppercase DEFINED or cmake 2.8.4 complains

13 years agoupdated some path because the dlls are mostly under bin not lib
Constantin Wenger [Thu, 21 Jul 2011 11:24:37 +0000 (13:24 +0200)]
updated some path because the dlls are mostly under bin not lib
added explanation why libintl must not belinked under some oses

13 years agoupdated some path because the dlls are mostly under bin not lib
Constantin Wenger [Thu, 21 Jul 2011 11:24:37 +0000 (13:24 +0200)]
updated some path because the dlls are mostly under bin not lib
added explanation why libintl must not belinked under some oses

13 years agoRefactor and clean up gettext management
Giuseppe Bilotta [Thu, 21 Jul 2011 10:33:29 +0000 (12:33 +0200)]
Refactor and clean up gettext management

13 years agoRefactor and clean up gettext management
Giuseppe Bilotta [Thu, 21 Jul 2011 10:33:29 +0000 (12:33 +0200)]
Refactor and clean up gettext management

13 years agoMake gettext optional
Giuseppe Bilotta [Thu, 21 Jul 2011 05:53:13 +0000 (07:53 +0200)]
Make gettext optional

13 years agoMake gettext optional
Giuseppe Bilotta [Thu, 21 Jul 2011 05:53:13 +0000 (07:53 +0200)]
Make gettext optional

13 years agoTweak makefiles to add -delta suffix.
Weedy [Thu, 21 Jul 2011 06:36:30 +0000 (02:36 -0400)]
Tweak makefiles to add -delta suffix.

13 years agoTweak makefiles to add -delta suffix.
Weedy [Thu, 21 Jul 2011 06:36:30 +0000 (02:36 -0400)]
Tweak makefiles to add -delta suffix.

13 years agoFix win32 MSVC compile. (screw gettext)
Weedy [Thu, 21 Jul 2011 06:30:21 +0000 (02:30 -0400)]
Fix win32 MSVC compile. (screw gettext)

13 years agoFix win32 MSVC compile. (screw gettext)
Weedy [Thu, 21 Jul 2011 06:30:21 +0000 (02:30 -0400)]
Fix win32 MSVC compile. (screw gettext)

13 years agoMerge pull request #27 from Oblomov/master
Nils Dagsson Moskopp [Wed, 20 Jul 2011 21:29:01 +0000 (14:29 -0700)]
Merge pull request #27 from Oblomov/master

* regression fix for windows build.

13 years agoMerge pull request #27 from Oblomov/master
Nils Dagsson Moskopp [Wed, 20 Jul 2011 21:29:01 +0000 (14:29 -0700)]
Merge pull request #27 from Oblomov/master

* regression fix for windows build.

13 years agoMove package search out of conditional
Giuseppe Bilotta [Wed, 20 Jul 2011 20:49:48 +0000 (22:49 +0200)]
Move package search out of conditional

This unbreaks the Windows build which would otherwise have problems at
the jthread level.

13 years agoMove package search out of conditional
Giuseppe Bilotta [Wed, 20 Jul 2011 20:49:48 +0000 (22:49 +0200)]
Move package search out of conditional

This unbreaks the Windows build which would otherwise have problems at
the jthread level.

13 years ago+ fireflies
Nils Dagsson Moskopp [Wed, 20 Jul 2011 20:04:24 +0000 (22:04 +0200)]
+ fireflies

13 years ago+ fireflies
Nils Dagsson Moskopp [Wed, 20 Jul 2011 20:04:24 +0000 (22:04 +0200)]
+ fireflies

13 years ago* README updated
Nils Dagsson Moskopp [Wed, 20 Jul 2011 17:14:40 +0000 (19:14 +0200)]
* README updated

13 years ago* README updated
Nils Dagsson Moskopp [Wed, 20 Jul 2011 17:14:40 +0000 (19:14 +0200)]
* README updated

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

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

13 years agoMerge pull request #24 from SpeedProg/master
Nils Dagsson Moskopp [Wed, 20 Jul 2011 16:56:23 +0000 (09:56 -0700)]
Merge pull request #24 from SpeedProg/master

gettext paths problem

13 years agoMerge pull request #24 from SpeedProg/master
Nils Dagsson Moskopp [Wed, 20 Jul 2011 16:56:23 +0000 (09:56 -0700)]
Merge pull request #24 from SpeedProg/master

gettext paths problem

13 years agofixed problem with wront paths in gettext
Constantin Wenger [Wed, 20 Jul 2011 16:49:18 +0000 (18:49 +0200)]
fixed problem with wront paths in gettext

13 years agofixed problem with wront paths in gettext
Constantin Wenger [Wed, 20 Jul 2011 16:49:18 +0000 (18:49 +0200)]
fixed problem with wront paths in gettext

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

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

13 years agoMerge pull request #23 from Oblomov/master
Nils Dagsson Moskopp [Wed, 20 Jul 2011 16:29:07 +0000 (09:29 -0700)]
Merge pull request #23 from Oblomov/master

Some misc usability patches

13 years agoMerge pull request #23 from Oblomov/master
Nils Dagsson Moskopp [Wed, 20 Jul 2011 16:29:07 +0000 (09:29 -0700)]
Merge pull request #23 from Oblomov/master

Some misc usability patches

13 years agoSet the window caption for the initial window too
Giuseppe Bilotta [Thu, 9 Jun 2011 20:31:40 +0000 (22:31 +0200)]
Set the window caption for the initial window too

13 years agoSet the window caption for the initial window too
Giuseppe Bilotta [Thu, 9 Jun 2011 20:31:40 +0000 (22:31 +0200)]
Set the window caption for the initial window too

13 years agoCheck the data path before usage
Giuseppe Bilotta [Wed, 8 Jun 2011 15:27:30 +0000 (17:27 +0200)]
Check the data path before usage

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.

13 years agoCheck the data path before usage
Giuseppe Bilotta [Wed, 8 Jun 2011 15:27:30 +0000 (17:27 +0200)]
Check the data path before usage

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.

13 years agoUse system sqlite3/jthread libs if available
Giuseppe Bilotta [Tue, 19 Jul 2011 18:02:31 +0000 (20:02 +0200)]
Use system sqlite3/jthread libs if available

13 years agoUse system sqlite3/jthread libs if available
Giuseppe Bilotta [Tue, 19 Jul 2011 18:02:31 +0000 (20:02 +0200)]
Use system sqlite3/jthread libs if available

13 years agoMerge branch 'master' of github.com:erlehmann/minetest-delta
Nils Dagsson Moskopp [Wed, 20 Jul 2011 15:56:49 +0000 (17:56 +0200)]
Merge branch 'master' of github.com:erlehmann/minetest-delta

13 years agoMerge branch 'master' of github.com:erlehmann/minetest-delta
Nils Dagsson Moskopp [Wed, 20 Jul 2011 15:56:49 +0000 (17:56 +0200)]
Merge branch 'master' of github.com:erlehmann/minetest-delta

13 years agoMerge pull request #22 from SpeedProg/master
Nils Dagsson Moskopp [Wed, 20 Jul 2011 15:56:35 +0000 (08:56 -0700)]
Merge pull request #22 from SpeedProg/master

added gettext support

13 years agoMerge pull request #22 from SpeedProg/master
Nils Dagsson Moskopp [Wed, 20 Jul 2011 15:56:35 +0000 (08:56 -0700)]
Merge pull request #22 from SpeedProg/master

added gettext support

13 years agoupdated german po file for minetest-delta (prior it was for minetest)
Constantin Wenger [Wed, 20 Jul 2011 15:00:54 +0000 (17:00 +0200)]
updated german po file for minetest-delta (prior it was for minetest)
set +x on bashscript