Nils Dagsson Moskopp
13b2bad54b
* changed GUI to indicate Minetest Δ
2011-07-17 22:33:51 +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
Nils Dagsson Moskopp
5146c826be
* 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
5383aa847f
* possible fix for large cubic holes in map
2011-07-13 23:12:18 +02:00
Nils Dagsson Moskopp
b96450b586
* slightly different values for 3d perlin noise
2011-07-13 23:10:41 +02:00
Nils Dagsson Moskopp
a676493f46
* regression fix, papyrus should appear again now
2011-07-13 16:21:20 +02:00
Jiří Procházka
692bd66011
+ 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
Perttu Ahola
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
Perttu Ahola
282912caa0
tried to fix block selection in map rendering a bit
2011-06-27 09:50:34 +03:00
Perttu Ahola
ccf5eae751
fixed bug in inventory textures caused from better handling of unknown blocks
2011-06-27 08:46:54 +03:00
Perttu Ahola
3e40235ce2
updated minetest.conf.example and changed client_unload_unused_data_timeout default to 600
2011-06-27 08:36:37 +03:00
Perttu Ahola
ab0cc1bb47
better handling of unknown blocks on client
2011-06-27 07:30:02 +03:00
Perttu Ahola
cf9a1f0109
updated to-do list
2011-06-27 06:52:20 +03:00
Perttu Ahola
d09f9c0d1d
made dtime jitter compare value and fps calculation a bit faster changing
2011-06-27 00:29:17 +03:00
Perttu Ahola
dd22ea051a
map unloading is now a whole lot better
2011-06-27 00:27:17 +03:00
Perttu Ahola
3fccc67eb7
fixed block unloading from memory (a better fix coming next)
2011-06-26 21:53:11 +03:00
Perttu Ahola
d702a2c33b
Made the initial loading screen slightly more alive
2011-06-26 20:00:04 +03:00
Perttu Ahola
7e59938c54
added screenshot key F12 (from spongie)
2011-06-26 19:33:40 +03:00
Perttu Ahola
5e3deed672
Added CPT_FACEDIR_SIMPLE calculation, finally, as figured out by spongie
2011-06-26 19:23:44 +03:00
Perttu Ahola
97840e93b5
changed one "if" to "else if" in content_mapblock.cpp
2011-06-26 19:23:05 +03:00
Perttu Ahola
d3d369a63b
reorganized stuff
2011-06-26 18:51:57 +03:00
Perttu Ahola
af6860f6f4
tuned mapgen
2011-06-26 18:51:35 +03:00
Perttu Ahola
d3a5eac22c
changed water color in farmesh
2011-06-26 18:50:43 +03:00
Perttu Ahola
2bd2bdff08
updated noise stuff
2011-06-26 18:50:13 +03:00
Perttu Ahola
91cfbe2891
reorganized a lot of stuff and modified mapgen and objects slightly while doing it
2011-06-26 15:48:56 +03:00
Perttu Ahola
3b098fd5dc
improved player fall damage detection
2011-06-26 15:45:13 +03:00
Sebastian Rühl
7efe89ff58
backported cactus, papyrus and clay
2011-06-26 13:47:21 +02:00
Sebastian Rühl
4f44cabe1c
small fix
2011-06-26 12:52:03 +02:00
Sebastian Rühl
9d09103e48
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
Perttu Ahola
c1ceabef71
added and commented out some debug output
2011-06-26 03:14:52 +03:00
Perttu Ahola
bb940a946d
even more code refactoring
2011-06-26 02:34:36 +03:00
Perttu Ahola
2915bd5518
more reorganizing of map code
2011-06-26 01:31:43 +03:00
Perttu Ahola
cb130d9158
cleaned map stuff
2011-06-26 00:03:58 +03:00
Perttu Ahola
a80025c352
moved mapgen stuff around abit
2011-06-25 18:35:32 +03:00
Perttu Ahola
f2c26e2014
moved map generator to separate source files
2011-06-25 18:12:41 +03:00
Perttu Ahola
aed9e809a1
mapgen stuff
2011-06-25 16:32:09 +03:00
Perttu Ahola
e8a731adc5
added correct data to new images, added comments in main.cpp
2011-06-25 04:41:38 +03:00
Perttu Ahola
7538b4c620
New map generator added (and SQLite, messed up the commits at that time...) (import from temporary git repo)
2011-06-25 04:25:14 +03:00
Perttu Ahola
30c34cc23e
disabled farmesh in default settings
2011-06-23 14:10:46 +03:00
Perttu Ahola
c1844a921d
fixed servermain.cpp lacking filesys.h
2011-06-22 14:21:55 +03:00
Perttu Ahola
051c0048d8
path_userdata is now created before potentially creating debug.txt in there
2011-06-20 18:04:49 +03:00
Perttu Ahola
bdd1375011
moved the mac include in porting.cpp out of namespace
2011-06-20 07:56:45 +03:00
Perttu Ahola
748340fad5
fixed a segfault in case of wrong input from network on the server (reported by spongie)
2011-06-19 19:40:41 +03:00
