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
Constantin Wenger
5c66664aef
changed some lines to fit the 80chars limit
2011-07-22 07:25:40 +02:00
Cyriaque Skrapits
6875ead7cf
Added french translation.
2011-07-21 16:09:57 +02:00
Nils Dagsson Moskopp
5388e8b124
* different collision box for fireflies so they now hover above the ground
2011-07-21 15:40:00 +02:00
Giuseppe Bilotta
02b14090c2
Reorganize cmake gettext message output to ease debugging
2011-07-21 15:16:59 +02:00
Giuseppe Bilotta
56a744599f
Restore "Leave address blank" position
2011-07-21 15:12:58 +02:00
Giuseppe Bilotta
9fa4b72a47
Find correct library for MSVC vs MingW in Winows
2011-07-21 14:50:15 +02:00
Giuseppe Bilotta
3e78b29cae
Only install locale files if using gettext
2011-07-21 14:46:23 +02:00
Giuseppe Bilotta
d63c160bd6
Uppercase DEFINED or cmake 2.8.4 complains
2011-07-21 13:59:50 +02:00
Giuseppe Bilotta
1340da7b54
Refactor and clean up gettext management
2011-07-21 12:33:29 +02:00
Giuseppe Bilotta
89af509d10
Make gettext optional
2011-07-21 09:03:41 +02:00
Weedy
89b8b792c1
Tweak makefiles to add -delta suffix.
2011-07-21 09:03:20 +02:00
Weedy
a19491dbd2
Fix win32 MSVC compile. (screw gettext)
2011-07-21 09:03:17 +02:00
Nils Dagsson Moskopp
f5c6e3973c
Merge pull request #27 from Oblomov/master
...
* regression fix for windows build.
2011-07-20 14:29:01 -07:00
Giuseppe Bilotta
e7beaac6f5
Move package search out of conditional
...
This unbreaks the Windows build which would otherwise have problems at
the jthread level.
2011-07-20 23:09:28 +02:00
Nils Dagsson Moskopp
84684e53ed
+ fireflies
2011-07-20 22:05:57 +02:00
Nils Dagsson Moskopp
8ed83250d7
Merge branch 'master' of github.com:erlehmann/minetest-delta
2011-07-20 18:56:32 +02:00
Nils Dagsson Moskopp
360a8918dd
Merge pull request #24 from SpeedProg/master
...
gettext paths problem
2011-07-20 09:56:23 -07:00
Constantin Wenger
4d43a67419
fixed problem with wront paths in gettext
2011-07-20 18:49:18 +02:00
Nils Dagsson Moskopp
33e80dae7f
Merge branch 'master' of github.com:erlehmann/minetest-delta
2011-07-20 18:29:48 +02:00
Giuseppe Bilotta
3fb5b7a3bd
Set the window caption for the initial window too
2011-07-20 17:59:48 +02:00
Giuseppe Bilotta
bcd3e1af2f
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.
2011-07-20 17:59:48 +02:00
Giuseppe Bilotta
cd45ae3d0f
Use system sqlite3/jthread libs if available
2011-07-20 17:59:48 +02:00
Nils Dagsson Moskopp
e5dc58e710
Merge branch 'master' of github.com:erlehmann/minetest-delta
2011-07-20 17:56:49 +02:00
Constantin Wenger
052bb24c7f
added gettext support
...
german translation file
and bashscript to update translations
2011-07-20 16:51:19 +02:00
Nils Dagsson Moskopp
3c630c0d90
Merge branch 'upstream/master'
2011-07-20 14:20:07 +02:00
Nils Dagsson Moskopp
ffd3cdf519
* by popular request, fewer clouds
2011-07-20 02:44:51 +02:00
Nils Dagsson Moskopp
821ff68f54
* initialize liquid_kind properly so compiler does not bitch about it
2011-07-19 02:02:50 +02:00
Nils Dagsson Moskopp
e8eb4d233b
+ fake shading for the volumetric clouds
2011-07-19 01:43:30 +02:00
Nils Dagsson Moskopp
414d1ff9e2
+ volumetric clouds (thanks teddydestodes)
2011-07-18 22:50:14 +02:00
Felix Krause
7d92ce061d
final fixes to liquid flow, works now as intended
2011-07-18 02:38:57 +02:00
Felix Krause
a1e2a8bec6
fixes to liquid transformation
2011-07-18 02:38:48 +02:00
Felix Krause
f34a9b6a71
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
2011-07-18 02:38:32 +02:00
Felix Krause
def870953a
* 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.
2011-07-18 02:37:19 +02:00
Nils Dagsson Moskopp
077ffa5231
* changed GUI to indicate Minetest Δ
2011-07-17 22:33:51 +02:00
Perttu Ahola
74ef5b8a42
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.
2011-07-17 19:32:06 +03:00
Perttu Ahola
496e783988
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.
2011-07-17 13:40:47 +03:00
Nils Dagsson Moskopp
8bfa56648d
Merge remote-tracking branch 'origin/upstream'
2011-07-16 16:52:45 +02:00
Perttu Ahola
afa2b8714f
Attempt to fix a problem with the factory mappings of objects residing in different source files than the prototype objects that fill them in
2011-07-16 17:39:03 +03:00
Nils Dagsson Moskopp
4d20f1283f
* fix automerge regression
2011-07-15 20:16:02 +02:00
Nils Dagsson Moskopp
0a38e542c1
* regression fix, clay occurs again now
2011-07-15 06:37:47 +02:00
Nils Dagsson Moskopp
96f551a287
* possibly nicer trees
2011-07-15 02:23:41 +02:00
Nils Dagsson Moskopp
af05e4b2de
Merge branch 'upstream/master'
...
Conflicts:
data/oerkki1.png
src/client.cpp
2011-07-14 22:43:28 +02:00
Nils Dagsson Moskopp
4415d95c50
* 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.
2011-07-14 16:17:53 +02:00
Nils Dagsson Moskopp
1cdf210e4f
* possible fix for large cubic holes in map
2011-07-13 23:12:18 +02:00
Nils Dagsson Moskopp
b0ad5ce8e2
* slightly different values for 3d perlin noise
2011-07-13 23:10:41 +02:00
Nils Dagsson Moskopp
b2447393e4
* regression fix, papyrus should appear again now
2011-07-13 16:21:20 +02:00
Jiří Procházka
858b2d7439
+ farmesh config options
2011-07-11 15:01:43 +02:00
Perttu Ahola
8f742855a1
initial steps in doing content type extension
2011-07-02 01:07:54 +03:00
Perttu Ahola
7b290660ea
made screen go slightly blue when underwater
2011-07-01 21:25:31 +03:00
