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

13 years agochanged one "if" to "else if" in content_mapblock.cpp
Perttu Ahola [Sun, 26 Jun 2011 16:23:05 +0000 (19:23 +0300)]
changed one "if" to "else if" in content_mapblock.cpp

13 years agoreorganized stuff
Perttu Ahola [Sun, 26 Jun 2011 15:51:57 +0000 (18:51 +0300)]
reorganized stuff

13 years agotuned mapgen
Perttu Ahola [Sun, 26 Jun 2011 15:51:35 +0000 (18:51 +0300)]
tuned mapgen

13 years agochanged water color in farmesh
Perttu Ahola [Sun, 26 Jun 2011 15:50:43 +0000 (18:50 +0300)]
changed water color in farmesh

13 years agoupdated noise stuff
Perttu Ahola [Sun, 26 Jun 2011 15:50:13 +0000 (18:50 +0300)]
updated noise stuff

13 years agoreorganized a lot of stuff and modified mapgen and objects slightly while doing it
Perttu Ahola [Sun, 26 Jun 2011 12:48:56 +0000 (15:48 +0300)]
reorganized a lot of stuff and modified mapgen and objects slightly while doing it

13 years agoimproved player fall damage detection
Perttu Ahola [Sun, 26 Jun 2011 12:45:13 +0000 (15:45 +0300)]
improved player fall damage detection

13 years agobackported cactus, papyrus and clay
Sebastian Rühl [Sun, 26 Jun 2011 11:47:21 +0000 (13:47 +0200)]
backported cactus, papyrus and clay

13 years agosmall fix
Sebastian Rühl [Sun, 26 Jun 2011 10:52:03 +0000 (12:52 +0200)]
small fix

13 years agoMerge branch 'master' of https://github.com/erlehmann/minetest-delta.git into upstrea...
Sebastian Rühl [Sun, 26 Jun 2011 10:24:32 +0000 (12:24 +0200)]
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>
13 years agoadded and commented out some debug output
Perttu Ahola [Sun, 26 Jun 2011 00:14:52 +0000 (03:14 +0300)]
added and commented out some debug output

13 years agoeven more code refactoring
Perttu Ahola [Sat, 25 Jun 2011 23:34:36 +0000 (02:34 +0300)]
even more code refactoring

13 years agomore reorganizing of map code
Perttu Ahola [Sat, 25 Jun 2011 22:31:43 +0000 (01:31 +0300)]
more reorganizing of map code

13 years agocleaned map stuff
Perttu Ahola [Sat, 25 Jun 2011 21:03:58 +0000 (00:03 +0300)]
cleaned map stuff

13 years agomoved mapgen stuff around abit
Perttu Ahola [Sat, 25 Jun 2011 15:35:32 +0000 (18:35 +0300)]
moved mapgen stuff around abit

13 years agomoved map generator to separate source files
Perttu Ahola [Sat, 25 Jun 2011 15:12:41 +0000 (18:12 +0300)]
moved map generator to separate source files

13 years agoadded minetestmapper in utils/
Perttu Ahola [Sat, 25 Jun 2011 14:46:08 +0000 (17:46 +0300)]
added minetestmapper in utils/

13 years agomapgen stuff
Perttu Ahola [Sat, 25 Jun 2011 13:32:09 +0000 (16:32 +0300)]
mapgen stuff

13 years agoadded correct data to new images, added comments in main.cpp
Perttu Ahola [Sat, 25 Jun 2011 01:41:38 +0000 (04:41 +0300)]
added correct data to new images, added comments in main.cpp

13 years agoNew map generator added (and SQLite, messed up the commits at that time...) (import...
Perttu Ahola [Sat, 25 Jun 2011 01:25:14 +0000 (04:25 +0300)]
New map generator added (and SQLite, messed up the commits at that time...) (import from temporary git repo)

13 years agoReorganizing stuff (import from temporary git repo)
Perttu Ahola [Sat, 25 Jun 2011 01:23:21 +0000 (04:23 +0300)]
Reorganizing stuff (import from temporary git repo)

13 years agodisabled farmesh in default settings
Perttu Ahola [Thu, 23 Jun 2011 11:10:46 +0000 (14:10 +0300)]
disabled farmesh in default settings

13 years agofixed servermain.cpp lacking filesys.h
Perttu Ahola [Wed, 22 Jun 2011 11:21:55 +0000 (14:21 +0300)]
fixed servermain.cpp lacking filesys.h

13 years agopath_userdata is now created before potentially creating debug.txt in there
Perttu Ahola [Mon, 20 Jun 2011 15:04:49 +0000 (18:04 +0300)]
path_userdata is now created before potentially creating debug.txt in there

13 years agomoved the mac include in porting.cpp out of namespace
Perttu Ahola [Mon, 20 Jun 2011 04:56:45 +0000 (07:56 +0300)]
moved the mac include in porting.cpp out of namespace

13 years agofixed a segfault in case of wrong input from network on the server (reported by spongie)
Perttu Ahola [Sun, 19 Jun 2011 16:40:41 +0000 (19:40 +0300)]
fixed a segfault in case of wrong input from network on the server (reported by spongie)

13 years agouh oh, forgot to add treeprop.png to the repo
Perttu Ahola [Sun, 19 Jun 2011 09:37:00 +0000 (12:37 +0300)]
uh oh, forgot to add treeprop.png to the repo

13 years agoModified the mesh update thread's sleep time to speed it up (it was way too high)
Perttu Ahola [Sat, 18 Jun 2011 19:31:24 +0000 (22:31 +0300)]
Modified the mesh update thread's sleep time to speed it up (it was way too high)

13 years agolol, i have apparently used python too much...
Perttu Ahola [Sat, 18 Jun 2011 18:37:08 +0000 (21:37 +0300)]
lol, i have apparently used python too much...

13 years agoadded a small php example
Perttu Ahola [Sat, 18 Jun 2011 18:36:31 +0000 (21:36 +0300)]
added a small php example

13 years agoAdded endianess to procotol.txt
Perttu Ahola [Sat, 18 Jun 2011 17:27:17 +0000 (20:27 +0300)]
Added endianess to procotol.txt

13 years agoFixed typo in protocol.txt
Perttu Ahola [Sat, 18 Jun 2011 17:21:25 +0000 (20:21 +0300)]
Fixed typo in protocol.txt

13 years agoupdated protocol.txt
Perttu Ahola [Sat, 18 Jun 2011 17:18:13 +0000 (20:18 +0300)]
updated protocol.txt

13 years agoDocumentation update
Perttu Ahola [Sat, 18 Jun 2011 17:16:11 +0000 (20:16 +0300)]
Documentation update

13 years agoHand-picked Mac OSX cursor and bundle path fixes from https://bitbucket.org/toabi...
Perttu Ahola [Sat, 18 Jun 2011 15:44:01 +0000 (18:44 +0300)]
Hand-picked Mac OSX cursor and bundle path fixes from https://bitbucket.org/toabi/minetest-mac

13 years agoAdded tag 0.2.20110618_0_dev for changeset dd08a9b5cb84
Perttu Ahola [Sat, 18 Jun 2011 12:32:35 +0000 (15:32 +0300)]
Added tag 0.2.20110618_0_dev for changeset dd08a9b5cb84

13 years agoChanged MapBlockObjects to be never written anymore. Incremented version number.
Perttu Ahola [Sat, 18 Jun 2011 12:16:35 +0000 (15:16 +0300)]
Changed MapBlockObjects to be never written anymore. Incremented version number.

13 years agocomment update
Perttu Ahola [Sat, 18 Jun 2011 10:52:49 +0000 (13:52 +0300)]
comment update

13 years agofarmesh render range is now dynamic
Perttu Ahola [Sat, 18 Jun 2011 10:43:49 +0000 (13:43 +0300)]
farmesh render range is now dynamic

13 years agofixed tree placement in farmesh
Perttu Ahola [Sat, 18 Jun 2011 10:11:11 +0000 (13:11 +0300)]
fixed tree placement in farmesh

13 years agofarmesh is now usable.
Perttu Ahola [Sat, 18 Jun 2011 09:42:17 +0000 (12:42 +0300)]
farmesh is now usable.

13 years agomodified health bar a bit
Perttu Ahola [Sat, 18 Jun 2011 06:04:31 +0000 (09:04 +0300)]
modified health bar a bit

13 years agoenabled word wrap in chat
Perttu Ahola [Sat, 18 Jun 2011 05:50:14 +0000 (08:50 +0300)]
enabled word wrap in chat

13 years agofixed wrong furnace menu layout
Perttu Ahola [Sat, 18 Jun 2011 05:50:05 +0000 (08:50 +0300)]
fixed wrong furnace menu layout

13 years agomerged Mac OSX build fix from minetest-delta
Perttu Ahola [Sat, 18 Jun 2011 00:14:13 +0000 (03:14 +0300)]
merged Mac OSX build fix from minetest-delta

13 years agoremoved furnace menu because it is not needed anymore
Perttu Ahola [Fri, 17 Jun 2011 23:32:34 +0000 (02:32 +0300)]
removed furnace menu because it is not needed anymore

13 years agoseparated inventory-related game content to content_inventory.{h,cpp}
Perttu Ahola [Fri, 17 Jun 2011 23:30:33 +0000 (02:30 +0300)]
separated inventory-related game content to content_inventory.{h,cpp}

13 years agoforgot to add mapblock_nodemod.h
Perttu Ahola [Fri, 17 Jun 2011 23:01:51 +0000 (02:01 +0300)]
forgot to add mapblock_nodemod.h

13 years agomoved inventory menu definition of chest and furnace to content_nodemeta.{h,cpp}
Perttu Ahola [Fri, 17 Jun 2011 23:00:01 +0000 (02:00 +0300)]
moved inventory menu definition of chest and furnace to content_nodemeta.{h,cpp}

13 years agoCreated and moved stuff to content_nodemeta.{h,cpp}
Perttu Ahola [Fri, 17 Jun 2011 21:46:50 +0000 (00:46 +0300)]
Created and moved stuff to content_nodemeta.{h,cpp}

13 years agoadded in-game key shortcuts for toggling free_move and fast_move (default K and J)
Perttu Ahola [Fri, 17 Jun 2011 20:55:21 +0000 (23:55 +0300)]
added in-game key shortcuts for toggling free_move and fast_move (default K and J)

13 years agomodified iron amount a bit
Perttu Ahola [Fri, 17 Jun 2011 20:43:28 +0000 (23:43 +0300)]
modified iron amount a bit

13 years agoUpdated comments
Perttu Ahola [Fri, 17 Jun 2011 20:28:25 +0000 (23:28 +0300)]
Updated comments

13 years agoMoved stuff from mapblock{h,cpp} to mapblock_mesh.{h,cpp} and content_mapblock.{h...
Perttu Ahola [Fri, 17 Jun 2011 20:20:31 +0000 (23:20 +0300)]
Moved stuff from mapblock{h,cpp} to mapblock_mesh.{h,cpp} and content_mapblock.{h,cpp}

13 years agoremoved licensecomment.txt
Perttu Ahola [Fri, 17 Jun 2011 19:58:38 +0000 (22:58 +0300)]
removed licensecomment.txt

13 years agoMoved some mapnode content stuff from mapnode.{h,cpp} and digging property stuff...
Perttu Ahola [Fri, 17 Jun 2011 19:20:15 +0000 (22:20 +0300)]
Moved some mapnode content stuff from mapnode.{h,cpp} and digging property stuff from material.cpp to content_mapnode.{h,cpp}

13 years agohopefully fixed old furnaces taking ridiculous amounts of cpu and halting the server
Perttu Ahola [Thu, 16 Jun 2011 16:43:28 +0000 (19:43 +0300)]
hopefully fixed old furnaces taking ridiculous amounts of cpu and halting the server

13 years agoProbably fixed the single-MapBlock generator using 1 block lower water height than...
Perttu Ahola [Thu, 16 Jun 2011 15:51:23 +0000 (18:51 +0300)]
Probably fixed the single-MapBlock generator using 1 block lower water height than it should

13 years ago+ rail block bounding box
Nils Dagsson Moskopp [Wed, 8 Jun 2011 03:27:51 +0000 (05:27 +0200)]
+ rail block bounding box

13 years agoAdded an experimental "far view" thing. Doesn't work exactly like it should and not...
Perttu Ahola [Tue, 7 Jun 2011 19:08:16 +0000 (22:08 +0300)]
Added an experimental "far view" thing. Doesn't work exactly like it should and not suitable for real use yet, and might never be.

13 years ago* README updated
Nils Dagsson Moskopp [Tue, 7 Jun 2011 17:41:03 +0000 (19:41 +0200)]
* README updated

13 years ago+ rail
Nils Dagsson Moskopp [Tue, 7 Jun 2011 17:24:30 +0000 (19:24 +0200)]
+ rail

13 years ago...and the map part of that
Perttu Ahola [Sun, 5 Jun 2011 18:07:54 +0000 (21:07 +0300)]
...and the map part of that

13 years agomade server to send map seed for testing
Perttu Ahola [Sun, 5 Jun 2011 18:06:54 +0000 (21:06 +0300)]
made server to send map seed for testing

13 years agoupdated comment in main.cpp
Perttu Ahola [Sun, 5 Jun 2011 15:59:36 +0000 (18:59 +0300)]
updated comment in main.cpp

13 years agotried to reduce unnecessary map saving disk i/o a bit
Perttu Ahola [Sun, 5 Jun 2011 15:57:36 +0000 (18:57 +0300)]
tried to reduce unnecessary map saving disk i/o a bit

13 years agoMessed around with genmap.py. Now supports format version 17.
Perttu Ahola [Sat, 4 Jun 2011 21:10:06 +0000 (00:10 +0300)]
Messed around with genmap.py. Now supports format version 17.