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

13 years agoupdated mapformat.txt a bit
Perttu Ahola [Sat, 4 Jun 2011 13:58:20 +0000 (16:58 +0300)]
updated mapformat.txt a bit

13 years agodocumentation update (mapformat.txt mainly)
Perttu Ahola [Sat, 4 Jun 2011 13:54:26 +0000 (16:54 +0300)]
documentation update (mapformat.txt mainly)

13 years ago* README updated
Nils Dagsson Moskopp [Fri, 3 Jun 2011 11:39:07 +0000 (13:39 +0200)]
* README updated

13 years ago+ bookshelf in minetestmapper, same color as wood
Nils Dagsson Moskopp [Fri, 3 Jun 2011 11:31:42 +0000 (13:31 +0200)]
+ bookshelf in minetestmapper, same color as wood

13 years ago* point out setInventoryTextureCube() is broken with a FIXME
Nils Dagsson Moskopp [Fri, 3 Jun 2011 11:13:31 +0000 (13:13 +0200)]
* point out setInventoryTextureCube() is broken with a FIXME

13 years ago+ paper, book, bookshelf
Nils Dagsson Moskopp [Fri, 3 Jun 2011 11:12:56 +0000 (13:12 +0200)]
+ paper, book, bookshelf

13 years ago* README updated
Nils Dagsson Moskopp [Thu, 2 Jun 2011 22:57:39 +0000 (00:57 +0200)]
* README updated

13 years ago+ papyrus in minetestmapper
Nils Dagsson Moskopp [Thu, 2 Jun 2011 22:56:27 +0000 (00:56 +0200)]
+ papyrus in minetestmapper

13 years ago+ papyrus
Nils Dagsson Moskopp [Thu, 2 Jun 2011 22:55:28 +0000 (00:55 +0200)]
+ papyrus

13 years ago* made cactus color darker
Nils Dagsson Moskopp [Thu, 2 Jun 2011 22:52:36 +0000 (00:52 +0200)]
* made cactus color darker

13 years agoremoved a debug print that would flood a lot in some kind of a timeout
Perttu Ahola [Thu, 2 Jun 2011 17:09:30 +0000 (20:09 +0300)]
removed a debug print that would flood a lot in some kind of a timeout

13 years agoIn a globally installed build, debug.txt is now placed in userdata directory. Needs...
Perttu Ahola [Thu, 2 Jun 2011 16:30:03 +0000 (19:30 +0300)]
In a globally installed build, debug.txt is now placed in userdata directory. Needs testing still.

13 years ago+ check if sectors/sectors2 directories exist before attempting to read them
Nils Dagsson Moskopp [Thu, 2 Jun 2011 15:21:58 +0000 (17:21 +0200)]
+ check if sectors/sectors2 directories exist before attempting to read them

13 years ago* encoding fix
Nils Dagsson Moskopp [Thu, 2 Jun 2011 15:19:50 +0000 (17:19 +0200)]
* encoding fix

13 years ago* tabs to spaces
Nils Dagsson Moskopp [Thu, 2 Jun 2011 15:13:00 +0000 (17:13 +0200)]
* tabs to spaces

13 years ago* ignore minetestmapper output
Nils Dagsson Moskopp [Thu, 2 Jun 2011 14:54:05 +0000 (16:54 +0200)]
* ignore minetestmapper output

13 years ago+ sandstone color value now in minetestmapper
Nils Dagsson Moskopp [Thu, 2 Jun 2011 14:52:25 +0000 (16:52 +0200)]
+ sandstone color value now in minetestmapper

13 years ago+ minetestmapper2, colors modified for Minetest Δ
Nils Dagsson Moskopp [Thu, 2 Jun 2011 14:17:50 +0000 (16:17 +0200)]
+ minetestmapper2, colors modified for Minetest Δ

13 years ago* README updated
Nils Dagsson Moskopp [Thu, 2 Jun 2011 01:03:47 +0000 (03:03 +0200)]
* README updated

13 years agoMerge pull request #1 from TeddyDesTodes/master
Nils Dagsson Moskopp [Thu, 2 Jun 2011 00:20:37 +0000 (17:20 -0700)]
Merge pull request #1 from TeddyDesTodes/master

+ submenu for key assignment, fast_move and free_move can now be toggled

13 years agoadded -Wno-unused-but-set-variable to debug build
Perttu Ahola [Wed, 1 Jun 2011 23:59:30 +0000 (02:59 +0300)]
added -Wno-unused-but-set-variable to debug build

13 years agomore merging - hopefully all spare heads are now gone
Perttu Ahola [Wed, 1 Jun 2011 23:47:39 +0000 (02:47 +0300)]
more merging - hopefully all spare heads are now gone

13 years agomerged an old head into main branch
Perttu Ahola [Wed, 1 Jun 2011 23:46:38 +0000 (02:46 +0300)]
merged an old head into main branch

13 years agomerged fence graphic updates another time...
Perttu Ahola [Wed, 1 Jun 2011 23:41:26 +0000 (02:41 +0300)]
merged fence graphic updates another time...

13 years agoMerged CiaranG's fence graphic updates (ugh, well, it worked, i guess, kind of.)...
Perttu Ahola [Wed, 1 Jun 2011 23:37:49 +0000 (02:37 +0300)]
Merged CiaranG's fence graphic updates (ugh, well, it worked, i guess, kind of.) This commit should also get rid of multiple heads on the server.

13 years agoAdded tag 0.2.20110602_0 for changeset 6f17cd3f6c54
Perttu Ahola [Wed, 1 Jun 2011 21:49:27 +0000 (00:49 +0300)]
Added tag 0.2.20110602_0 for changeset 6f17cd3f6c54

13 years agoRemoved tag 0.2.20110602_0
Perttu Ahola [Wed, 1 Jun 2011 21:47:31 +0000 (00:47 +0300)]
Removed tag 0.2.20110602_0

13 years agoAdded tag 0.2.20110602_0 for changeset 96efc17b4cd9
Perttu Ahola [Wed, 1 Jun 2011 21:15:46 +0000 (00:15 +0300)]
Added tag 0.2.20110602_0 for changeset 96efc17b4cd9

13 years ago0.2.20110602_0
Perttu Ahola [Wed, 1 Jun 2011 21:15:42 +0000 (00:15 +0300)]
0.2.20110602_0

13 years agoFixed the password crash on Windows
Perttu Ahola [Wed, 1 Jun 2011 21:01:11 +0000 (00:01 +0300)]
Fixed the password crash on Windows

13 years agoMerge remote-tracking branch 'upstream/master'
teddydestodes [Wed, 1 Jun 2011 17:47:10 +0000 (19:47 +0200)]
Merge remote-tracking branch 'upstream/master'

13 years agoadded new submenu for key assignment
teddydestodes [Wed, 1 Jun 2011 17:44:07 +0000 (19:44 +0200)]
added new submenu for key assignment
configwriting/saving isn't complete and will break your config if you use fancy keys

13 years ago* README updated
Nils Dagsson Moskopp [Wed, 1 Jun 2011 15:19:28 +0000 (17:19 +0200)]
* README updated

13 years agoMerge pull request #5 from bucket-T/master
Nils Dagsson Moskopp [Wed, 1 Jun 2011 15:08:41 +0000 (08:08 -0700)]
Merge pull request #5 from bucket-T/master

MacOSX build support

13 years ago* README updated
Nils Dagsson Moskopp [Wed, 1 Jun 2011 14:46:49 +0000 (16:46 +0200)]
* README updated

13 years agoMerge remote-tracking branch 'bucket-t/master'
teddydestodes [Wed, 1 Jun 2011 12:43:27 +0000 (14:43 +0200)]
Merge remote-tracking branch 'bucket-t/master'

13 years agoMacOSX build support
MrLoom [Wed, 1 Jun 2011 12:13:22 +0000 (14:13 +0200)]
MacOSX build support

13 years agoMerge remote-tracking branch 'upstream/master'
teddydestodes [Wed, 1 Jun 2011 12:11:52 +0000 (14:11 +0200)]
Merge remote-tracking branch 'upstream/master'

13 years ago* improved fence dimensions (cuboid side lengths now multiples of 2, textures should...
Nils Dagsson Moskopp [Tue, 31 May 2011 00:56:23 +0000 (08:56 +0800)]
* improved fence dimensions (cuboid side lengths now multiples of 2, textures should fit better)

13 years ago* clay is rarer now
Nils Dagsson Moskopp [Wed, 1 Jun 2011 06:09:28 +0000 (08:09 +0200)]
* clay is rarer now

13 years ago+ clay and associated items
Nils Dagsson Moskopp [Wed, 1 Jun 2011 02:57:46 +0000 (04:57 +0200)]
+ clay and associated items

13 years ago+ brick
Nils Dagsson Moskopp [Tue, 31 May 2011 20:04:09 +0000 (22:04 +0200)]
+ brick

13 years ago* menulogo now shows minetest delta
Nils Dagsson Moskopp [Tue, 31 May 2011 18:52:20 +0000 (20:52 +0200)]
* menulogo now shows minetest delta

13 years agoReduced server CPU usage on NodeMetadata step()s. Also furnace now cooks while no...
Perttu Ahola [Tue, 31 May 2011 17:02:55 +0000 (20:02 +0300)]
Reduced server CPU usage on NodeMetadata step()s. Also furnace now cooks while no players are near it.