3c630c0d90
Merge branch 'upstream/master'
2011-07-20 14:20:07 +02:00
ffd3cdf519
* by popular request, fewer clouds
2011-07-20 02:44:51 +02:00
821ff68f54
* initialize liquid_kind properly so compiler does not bitch about it
2011-07-19 02:02:50 +02:00
e8eb4d233b
+ fake shading for the volumetric clouds
2011-07-19 01:43:30 +02:00
414d1ff9e2
+ volumetric clouds (thanks teddydestodes)
2011-07-18 22:50:14 +02:00
7d92ce061d
final fixes to liquid flow, works now as intended
2011-07-18 02:38:57 +02:00
a1e2a8bec6
fixes to liquid transformation
2011-07-18 02:38:48 +02:00
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
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
077ffa5231
* changed GUI to indicate Minetest Δ
2011-07-17 22:33:51 +02:00
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
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
8bfa56648d
Merge remote-tracking branch 'origin/upstream'
2011-07-16 16:52:45 +02:00
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
4d20f1283f
* fix automerge regression
2011-07-15 20:16:02 +02:00
0a38e542c1
* regression fix, clay occurs again now
2011-07-15 06:37:47 +02:00
96f551a287
* possibly nicer trees
2011-07-15 02:23:41 +02:00
af05e4b2de
Merge branch 'upstream/master'
...
Conflicts:
data/oerkki1.png
src/client.cpp
2011-07-14 22:43:28 +02:00
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
1cdf210e4f
* possible fix for large cubic holes in map
2011-07-13 23:12:18 +02:00
b0ad5ce8e2
* slightly different values for 3d perlin noise
2011-07-13 23:10:41 +02:00
b2447393e4
* regression fix, papyrus should appear again now
2011-07-13 16:21:20 +02:00
858b2d7439
+ farmesh config options
2011-07-11 15:01:43 +02:00
8f742855a1
initial steps in doing content type extension
2011-07-02 01:07:54 +03:00
7b290660ea
made screen go slightly blue when underwater
2011-07-01 21:25:31 +03:00
71f5d4b344
Fixed objects being sometimes not able to be stored statically in a block when block has been unloaded
2011-07-01 21:04:40 +03:00
282912caa0
tried to fix block selection in map rendering a bit
2011-06-27 09:50:34 +03:00
ccf5eae751
fixed bug in inventory textures caused from better handling of unknown blocks
2011-06-27 08:46:54 +03:00
3e40235ce2
updated minetest.conf.example and changed client_unload_unused_data_timeout default to 600
2011-06-27 08:36:37 +03:00
ab0cc1bb47
better handling of unknown blocks on client
2011-06-27 07:30:02 +03:00
cf9a1f0109
updated to-do list
2011-06-27 06:52:20 +03:00
d09f9c0d1d
made dtime jitter compare value and fps calculation a bit faster changing
2011-06-27 00:29:17 +03:00
dd22ea051a
map unloading is now a whole lot better
2011-06-27 00:27:17 +03:00
3fccc67eb7
fixed block unloading from memory (a better fix coming next)
2011-06-26 21:53:11 +03:00
d702a2c33b
Made the initial loading screen slightly more alive
2011-06-26 20:00:04 +03:00
7e59938c54
added screenshot key F12 (from spongie)
2011-06-26 19:33:40 +03:00
5e3deed672
Added CPT_FACEDIR_SIMPLE calculation, finally, as figured out by spongie
2011-06-26 19:23:44 +03:00
97840e93b5
changed one "if" to "else if" in content_mapblock.cpp
2011-06-26 19:23:05 +03:00
d3d369a63b
reorganized stuff
2011-06-26 18:51:57 +03:00
af6860f6f4
tuned mapgen
2011-06-26 18:51:35 +03:00
d3a5eac22c
changed water color in farmesh
2011-06-26 18:50:43 +03:00
2bd2bdff08
updated noise stuff
2011-06-26 18:50:13 +03:00
91cfbe2891
reorganized a lot of stuff and modified mapgen and objects slightly while doing it
2011-06-26 15:48:56 +03:00
3b098fd5dc
improved player fall damage detection
2011-06-26 15:45:13 +03:00
13cf5425db
backported cactus, papyrus and clay
2011-06-26 13:47:21 +02:00
fb6ac9a1a6
small fix
2011-06-26 12:52:03 +02:00
033ae0dcae
Merge branch 'master' of https://github.com/erlehmann/minetest-delta.git into upstream_merge
...
Conflicts:
.gitignore
CMakeLists.txt
data/heart.png
src/CMakeLists.txt
src/game.cpp
src/guiMainMenu.cpp
src/inventory.cpp
src/map.cpp
src/mapblock.cpp
src/mapnode.cpp
src/mapnode.h
src/materials.cpp
src/server.cpp
Signed-off-by: Sebastian Rühl <bahamada_basti@yahoo.de>
2011-06-26 12:24:32 +02:00
c1ceabef71
added and commented out some debug output
2011-06-26 03:14:52 +03:00
bb940a946d
even more code refactoring
2011-06-26 02:34:36 +03:00
2915bd5518
more reorganizing of map code
2011-06-26 01:31:43 +03:00
Nils Dagsson Moskopp
Felix Krause
Perttu Ahola
Jiří Procházka
Sebastian Rühl