Perttu Ahola
3882536d40
merged some stuff from upstream while merging delta
2011-07-23 15:46:00 +03: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
Perttu Ahola
2b39be44e4
added an unit test for the Settings thingy (the python ConfigParser -like thing)
2011-07-22 13:10:58 +03:00
Perttu Ahola
329158f7d1
Fixed small error in mapnode.cpp (didn't cause any harm though)
2011-07-22 01:37:21 +03:00
Perttu Ahola
fe855e004f
Fixed new map generator causing a crash when generating at map limit
2011-07-22 01:37:05 +03:00
Perttu Ahola
2b3bc33708
added some TODOs to main.cpp
2011-07-21 23:28:30 +03:00
Perttu Ahola
308d861327
Merged minetest-delta a624fe549bc75855a170
2011-07-21 20:55:08 +03:00
Nils Dagsson Moskopp
6505bae414
Merge pull request #29 from cisoun/master
...
Add french translation.
2011-07-21 07:33:34 -07:00
Cyriaque Skrapits
9303283d6e
Added missing .po fil.e
2011-07-21 16:14:18 +02:00
Cyriaque Skrapits
8048961cc5
Added french translation.
2011-07-21 16:09:57 +02:00
Nils Dagsson Moskopp
cbf2ac5e8f
* different collision box for fireflies so they now hover above the ground
2011-07-21 15:40:00 +02:00
Nils Dagsson Moskopp
bca3de3d08
Merge pull request #27 from Oblomov/master
...
* regression fix for windows build.
2011-07-20 14:29:01 -07:00
Giuseppe Bilotta
29aae3dcb5
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
8129d16dd3
+ fireflies
2011-07-20 22:05:57 +02:00
Nils Dagsson Moskopp
4cbdf136fc
* README updated
2011-07-20 19:14:40 +02:00
Nils Dagsson Moskopp
2732dac337
Merge branch 'master' of github.com:erlehmann/minetest-delta
2011-07-20 18:56:32 +02:00
Nils Dagsson Moskopp
0f10fc0cd9
Merge pull request #24 from SpeedProg/master
...
gettext paths problem
2011-07-20 09:56:23 -07:00
Constantin Wenger
c6d99fbe0c
fixed problem with wront paths in gettext
2011-07-20 18:49:18 +02:00
Nils Dagsson Moskopp
84b85964fa
Merge branch 'master' of github.com:erlehmann/minetest-delta
2011-07-20 18:29:48 +02:00
Nils Dagsson Moskopp
af4b532c9e
Merge pull request #23 from Oblomov/master
...
Some misc usability patches
2011-07-20 09:29:07 -07:00
Giuseppe Bilotta
52df1b598c
Set the window caption for the initial window too
2011-07-20 17:59:48 +02:00
Giuseppe Bilotta
8fa94c3547
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
3321edae77
Use system sqlite3/jthread libs if available
2011-07-20 17:59:48 +02:00
Nils Dagsson Moskopp
69937c342c
Merge branch 'master' of github.com:erlehmann/minetest-delta
2011-07-20 17:56:49 +02:00
Nils Dagsson Moskopp
489a7ef324
Merge pull request #22 from SpeedProg/master
...
added gettext support
2011-07-20 08:56:35 -07:00
Constantin Wenger
e787e16a83
updated german po file for minetest-delta (prior it was for minetest)
...
set +x on bashscript
2011-07-20 17:00:54 +02:00
Constantin Wenger
6a8328de79
added gettext support
...
german translation file
and bashscript to update translations
2011-07-20 16:51:19 +02:00
Nils Dagsson Moskopp
9bc701d194
Merge branch 'upstream/master'
2011-07-20 14:20:07 +02:00
Nils Dagsson Moskopp
2095b15816
* README updated (graphics licensing)
2011-07-20 02:45:15 +02:00
Nils Dagsson Moskopp
6791c856b2
* by popular request, fewer clouds
2011-07-20 02:44:51 +02:00
Nils Dagsson Moskopp
41919edb2f
* README updated
2011-07-19 23:35:12 +02:00
Nils Dagsson Moskopp
2470bce7c2
+ minetest application icon
2011-07-19 23:32:01 +02:00
Nils Dagsson Moskopp
57fcfb2b0d
* initialize liquid_kind properly so compiler does not bitch about it
2011-07-19 02:02:50 +02:00
Nils Dagsson Moskopp
a99b7e6e05
+ fake shading for the volumetric clouds
2011-07-19 01:43:30 +02:00
Nils Dagsson Moskopp
890d3468e7
+ volumetric clouds (thanks teddydestodes)
2011-07-18 22:50:14 +02:00
Felix Krause
466f9d87b6
final fixes to liquid flow, works now as intended
2011-07-18 02:38:57 +02:00
Felix Krause
b7862805c8
fixes to liquid transformation
2011-07-18 02:38:48 +02:00
Felix Krause
c4b86adee8
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
f1e8ff2245
* 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
2586a186bd
* Омская птица
2011-07-18 02:09:55 +02:00
Nils Dagsson Moskopp
13b2bad54b
* 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
1f243e54b4
* README updated
2011-07-16 17:14:58 +02:00
Nils Dagsson Moskopp
014a3aea32
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
5086bd5664
* fix automerge regression
2011-07-15 20:16:02 +02:00
Nils Dagsson Moskopp
2c5617709d
* regression fix, clay occurs again now
2011-07-15 06:37:47 +02:00
Nils Dagsson Moskopp
287b735224
* possibly nicer trees
2011-07-15 02:23:41 +02:00
Nils Dagsson Moskopp
3560f0de08
Merge branch 'upstream/master'
...
Conflicts:
data/oerkki1.png
src/client.cpp
2011-07-14 22:43:28 +02:00
