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

13 years agoadded gettext support
Constantin Wenger [Wed, 20 Jul 2011 14:51:19 +0000 (16:51 +0200)]
added gettext support
german translation file
and bashscript to update translations

13 years agoMerge branch 'upstream/master'
Nils Dagsson Moskopp [Wed, 20 Jul 2011 12:20:07 +0000 (14:20 +0200)]
Merge branch 'upstream/master'

13 years ago* README updated (graphics licensing)
Nils Dagsson Moskopp [Wed, 20 Jul 2011 00:45:15 +0000 (02:45 +0200)]
* README updated (graphics licensing)

13 years ago* by popular request, fewer clouds
Nils Dagsson Moskopp [Wed, 20 Jul 2011 00:44:51 +0000 (02:44 +0200)]
* by popular request, fewer clouds

13 years ago* README updated
Nils Dagsson Moskopp [Tue, 19 Jul 2011 21:35:12 +0000 (23:35 +0200)]
* README updated

13 years ago+ minetest application icon
Nils Dagsson Moskopp [Tue, 19 Jul 2011 21:32:01 +0000 (23:32 +0200)]
+ minetest application icon

13 years ago* initialize liquid_kind properly so compiler does not bitch about it
Nils Dagsson Moskopp [Tue, 19 Jul 2011 00:02:50 +0000 (02:02 +0200)]
* initialize liquid_kind properly so compiler does not bitch about it

13 years ago+ fake shading for the volumetric clouds
Nils Dagsson Moskopp [Mon, 18 Jul 2011 23:43:30 +0000 (01:43 +0200)]
+ fake shading for the volumetric clouds

13 years ago+ volumetric clouds (thanks teddydestodes)
Nils Dagsson Moskopp [Mon, 18 Jul 2011 20:50:14 +0000 (22:50 +0200)]
+ volumetric clouds (thanks teddydestodes)

13 years agofinal fixes to liquid flow, works now as intended
Felix Krause [Sun, 17 Jul 2011 11:55:59 +0000 (13:55 +0200)]
final fixes to liquid flow, works now as intended

13 years agofixes to liquid transformation
Felix Krause [Sun, 17 Jul 2011 11:15:33 +0000 (13:15 +0200)]
fixes to liquid transformation

13 years agofixed refactoring issues // slowed down water flow a bit
Felix Krause [Sun, 17 Jul 2011 02:01:31 +0000 (04:01 +0200)]
fixed refactoring issues // slowed down water flow a bit

* liquid flow no longer does random things when transformed
* if a flowi
ng liquid node doesn't have a solid block as neighbor, its spread distan
ce is shortened by 1

13 years ago* refactored liquid transformation code (has some flaws)
Felix Krause [Sat, 16 Jul 2011 14:01:37 +0000 (16:01 +0200)]
* refactored liquid transformation code (has some flaws)

Completely rewrote the liquid transformation. The algorithm now exclusively modifies the current node in one iteration. Another change is that MapNode.param2 now stores a bit that tells other nodes if a flowing liquid node flows downwards. This is accomplished by two masks on param2 for the "flow down" bit and the "liquid level" bits.

This will be the base of future improvements to the liquid flow. However, in the current state flowing liquid does not always disappear when cut off its source. Be aware that this branch is work in progress.

13 years ago* Омская птица
Nils Dagsson Moskopp [Mon, 18 Jul 2011 00:09:55 +0000 (02:09 +0200)]
* Омская птица

13 years ago* changed GUI to indicate Minetest Δ
Nils Dagsson Moskopp [Sun, 17 Jul 2011 20:33:18 +0000 (22:33 +0200)]
* changed GUI to indicate Minetest Δ

13 years agoHopefully fixed u64 to be the actual 64-bit type on 64-bit architectures. This should...
Perttu Ahola [Sun, 17 Jul 2011 16:32:06 +0000 (19:32 +0300)]
Hopefully fixed u64 to be the actual 64-bit type on 64-bit architectures. This should fix the compiler error caused by irrlicht on 64-bit fedora defining u64 to be different.

13 years agoA small fix to an unlikely situation where the map generator requires a block that...
Perttu Ahola [Sun, 17 Jul 2011 10:40:47 +0000 (13:40 +0300)]
A small fix to an unlikely situation where the map generator requires a block that hasn't been loaded from disk. Now it is actually loaded from disk in that case.

13 years ago* README updated
Nils Dagsson Moskopp [Sat, 16 Jul 2011 15:14:58 +0000 (17:14 +0200)]
* README updated

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

13 years agoAttempt to fix a problem with the factory mappings of objects residing in different...
Perttu Ahola [Sat, 16 Jul 2011 14:39:03 +0000 (17:39 +0300)]
Attempt to fix a problem with the factory mappings of objects residing in different source files than the prototype objects that fill them in

13 years ago* fix automerge regression
Nils Dagsson Moskopp [Fri, 15 Jul 2011 18:16:02 +0000 (20:16 +0200)]
* fix automerge regression

13 years ago* regression fix, clay occurs again now
Nils Dagsson Moskopp [Fri, 15 Jul 2011 04:37:47 +0000 (06:37 +0200)]
* regression fix, clay occurs again now

13 years ago* possibly nicer trees
Nils Dagsson Moskopp [Fri, 15 Jul 2011 00:23:41 +0000 (02:23 +0200)]
* possibly nicer trees

13 years agoMerge branch 'upstream/master'
Nils Dagsson Moskopp [Thu, 14 Jul 2011 20:43:22 +0000 (22:43 +0200)]
Merge branch 'upstream/master'

Conflicts:
data/oerkki1.png
src/client.cpp

13 years ago* possibly improved water flow, by flyx86
Nils Dagsson Moskopp [Thu, 14 Jul 2011 14:17:50 +0000 (16:17 +0200)]
* possibly improved water flow, by flyx86

- When flowing liquid starts to flow down, it stops contributing to its neighboring nodes' liquid level (possibly transforming it back to air)
- Flowing liquid turns into a source if there are at least 2 adjacent liquid source nodes
- If a new liquid flow reaches existing flowing liquid, the existing liquid is now updated properly.

13 years ago* possible fix for large cubic holes in map
Nils Dagsson Moskopp [Wed, 13 Jul 2011 21:12:18 +0000 (23:12 +0200)]
* possible fix for large cubic holes in map

13 years ago* slightly different values for 3d perlin noise
Nils Dagsson Moskopp [Wed, 13 Jul 2011 21:10:41 +0000 (23:10 +0200)]
* slightly different values for 3d perlin noise

13 years ago* regression fix, papyrus should appear again now
Nils Dagsson Moskopp [Wed, 13 Jul 2011 14:21:20 +0000 (16:21 +0200)]
* regression fix, papyrus should appear again now

13 years ago* README updated
Nils Dagsson Moskopp [Mon, 11 Jul 2011 14:22:14 +0000 (16:22 +0200)]
* README updated

13 years ago+ farmesh config options
Jiří Procházka [Mon, 11 Jul 2011 12:29:59 +0000 (14:29 +0200)]
+ farmesh config options

13 years ago* amended upstream branch notes
Nils Dagsson Moskopp [Sat, 9 Jul 2011 16:22:39 +0000 (18:22 +0200)]
* amended upstream branch notes

13 years ago+ notes regarding upstream conversion from mercurial using hg-fast-export
Nils Dagsson Moskopp [Sat, 9 Jul 2011 16:14:05 +0000 (18:14 +0200)]
+ notes regarding upstream conversion from mercurial using hg-fast-export

13 years agoAdded tag 0.2.20110704_0 for changeset 65263ec55caf
Perttu Ahola [Mon, 4 Jul 2011 19:15:22 +0000 (22:15 +0300)]
Added tag 0.2.20110704_0 for changeset 65263ec55caf

13 years agoUpdated version and changelog
Perttu Ahola [Mon, 4 Jul 2011 19:15:15 +0000 (22:15 +0300)]
Updated version and changelog

13 years agoRemoved tag 0.2.20110704_0
Perttu Ahola [Mon, 4 Jul 2011 19:12:58 +0000 (22:12 +0300)]
Removed tag 0.2.20110704_0

13 years agoAdded tag 0.2.20110704_0 for changeset 25aa2021937f
Perttu Ahola [Mon, 4 Jul 2011 19:12:38 +0000 (22:12 +0300)]
Added tag 0.2.20110704_0 for changeset 25aa2021937f

13 years agoinitial steps in doing content type extension
Perttu Ahola [Fri, 1 Jul 2011 22:07:54 +0000 (01:07 +0300)]
initial steps in doing content type extension

13 years agomade screen go slightly blue when underwater
Perttu Ahola [Fri, 1 Jul 2011 18:25:31 +0000 (21:25 +0300)]
made screen go slightly blue when underwater

13 years agoFixed objects being sometimes not able to be stored statically in a block when block...
Perttu Ahola [Fri, 1 Jul 2011 18:04:40 +0000 (21:04 +0300)]
Fixed objects being sometimes not able to be stored statically in a block when block has been unloaded

13 years agoMerge pull request #13 from Bahamada/upstream_merge
Nils Dagsson Moskopp [Mon, 27 Jun 2011 13:56:26 +0000 (06:56 -0700)]
Merge pull request #13 from Bahamada/upstream_merge

Upstream merge

13 years agotried to fix block selection in map rendering a bit
Perttu Ahola [Mon, 27 Jun 2011 06:50:34 +0000 (09:50 +0300)]
tried to fix block selection in map rendering a bit

13 years agofixed bug in inventory textures caused from better handling of unknown blocks
Perttu Ahola [Mon, 27 Jun 2011 05:46:54 +0000 (08:46 +0300)]
fixed bug in inventory textures caused from better handling of unknown blocks

13 years agoupdated minetest.conf.example and changed client_unload_unused_data_timeout default...
Perttu Ahola [Mon, 27 Jun 2011 05:36:37 +0000 (08:36 +0300)]
updated minetest.conf.example and changed client_unload_unused_data_timeout default to 600

13 years agobetter handling of unknown blocks on client
Perttu Ahola [Mon, 27 Jun 2011 04:30:02 +0000 (07:30 +0300)]
better handling of unknown blocks on client

13 years agoupdated to-do list
Perttu Ahola [Mon, 27 Jun 2011 03:52:20 +0000 (06:52 +0300)]
updated to-do list

13 years agomade dtime jitter compare value and fps calculation a bit faster changing
Perttu Ahola [Sun, 26 Jun 2011 21:29:17 +0000 (00:29 +0300)]
made dtime jitter compare value and fps calculation a bit faster changing

13 years agomap unloading is now a whole lot better
Perttu Ahola [Sun, 26 Jun 2011 21:27:17 +0000 (00:27 +0300)]
map unloading is now a whole lot better

13 years agofixed block unloading from memory (a better fix coming next)
Perttu Ahola [Sun, 26 Jun 2011 18:53:11 +0000 (21:53 +0300)]
fixed block unloading from memory (a better fix coming next)

13 years agoMade the initial loading screen slightly more alive
Perttu Ahola [Sun, 26 Jun 2011 17:00:04 +0000 (20:00 +0300)]
Made the initial loading screen slightly more alive

13 years agoadded screenshot key F12 (from spongie)
Perttu Ahola [Sun, 26 Jun 2011 16:33:40 +0000 (19:33 +0300)]
added screenshot key F12 (from spongie)

13 years agoAdded CPT_FACEDIR_SIMPLE calculation, finally, as figured out by spongie
Perttu Ahola [Sun, 26 Jun 2011 16:23:44 +0000 (19:23 +0300)]
Added CPT_FACEDIR_SIMPLE calculation, finally, as figured out by spongie