oweals/minetest.git
13 years agostrict_protocol_version_checking setting; PROTOCOL_VERSION in clientserver.h; clean...
Perttu Ahola [Sat, 15 Oct 2011 12:02:28 +0000 (15:02 +0300)]
strict_protocol_version_checking setting; PROTOCOL_VERSION in clientserver.h; clean up defaultsettings.cpp and minetest.conf.example

13 years agoHandle death and respawn better
Perttu Ahola [Sat, 15 Oct 2011 11:46:59 +0000 (14:46 +0300)]
Handle death and respawn better

13 years agoSet a better version number
Perttu Ahola [Sat, 15 Oct 2011 09:51:30 +0000 (12:51 +0300)]
Set a better version number

13 years agoImprove mobv2
Perttu Ahola [Sat, 15 Oct 2011 09:17:21 +0000 (12:17 +0300)]
Improve mobv2

13 years agomobv2
Perttu Ahola [Fri, 14 Oct 2011 23:28:57 +0000 (02:28 +0300)]
mobv2

13 years agoLock mutex when accessing m_env in Server::~Server
Perttu Ahola [Fri, 14 Oct 2011 09:39:25 +0000 (12:39 +0300)]
Lock mutex when accessing m_env in Server::~Server

13 years agoIn CMake scripts: New version number, fix MSVC stuff
Perttu Ahola [Fri, 14 Oct 2011 06:55:39 +0000 (09:55 +0300)]
In CMake scripts: New version number, fix MSVC stuff

13 years agoHeader file tweaking; mainly for speed
Perttu Ahola [Wed, 12 Oct 2011 10:53:38 +0000 (13:53 +0300)]
Header file tweaking; mainly for speed

13 years agoSaner block modification flag operation for not saving everything always
Perttu Ahola [Wed, 12 Oct 2011 07:53:37 +0000 (10:53 +0300)]
Saner block modification flag operation for not saving everything always

13 years agominetestmapper: Fix the way ylist is computed, use cStringIO instead of rolling own...
Kahrl [Tue, 27 Sep 2011 00:38:19 +0000 (02:38 +0200)]
minetestmapper: Fix the way ylist is computed, use cStringIO instead of rolling own Bytestream, remove some artifacts when drawing underground blocks, introduce a --drawunderground switch (defaults to of), 'blocknum' renamed to 'content'.

13 years agoMerge remote-tracking branch 'marktraceur/master'
Perttu Ahola [Mon, 26 Sep 2011 19:41:06 +0000 (22:41 +0300)]
Merge remote-tracking branch 'marktraceur/master'

13 years agominetestmapper speed tweaks (kahrl & JacobF)
Perttu Ahola [Mon, 26 Sep 2011 19:31:34 +0000 (22:31 +0300)]
minetestmapper speed tweaks (kahrl & JacobF)

13 years agoAdd apple color to minetestmapper and fix cactus color
Perttu Ahola [Mon, 26 Sep 2011 17:55:00 +0000 (20:55 +0300)]
Add apple color to minetestmapper and fix cactus color

13 years agoFix minetestmapper.py
Perttu Ahola [Mon, 26 Sep 2011 17:54:42 +0000 (20:54 +0300)]
Fix minetestmapper.py

13 years agoMerge remote-tracking branch 'kahrl/sectors2sqlite-fix'
Perttu Ahola [Mon, 26 Sep 2011 17:01:46 +0000 (20:01 +0300)]
Merge remote-tracking branch 'kahrl/sectors2sqlite-fix'

13 years agoRotate wielded tool the right way and modify axe graphics accordingly
Perttu Ahola [Mon, 26 Sep 2011 13:10:54 +0000 (16:10 +0300)]
Rotate wielded tool the right way and modify axe graphics accordingly

13 years agoMerge branch 'view_bobbing_and_vielded_tool'
Perttu Ahola [Mon, 26 Sep 2011 12:10:02 +0000 (15:10 +0300)]
Merge branch 'view_bobbing_and_vielded_tool'

13 years agoFix single-frame lag in camera yaw/pitch, tune view bobbing and add wielded tool...
Perttu Ahola [Mon, 26 Sep 2011 12:09:04 +0000 (15:09 +0300)]
Fix single-frame lag in camera yaw/pitch, tune view bobbing and add wielded tool movement when walking and tweak stuff a bit

13 years agoSupport Python 2 and 3 in sectors2sqlite.py.
Kahrl [Mon, 26 Sep 2011 11:24:21 +0000 (13:24 +0200)]
Support Python 2 and 3 in sectors2sqlite.py.

13 years agoFix processing of blocks below y=0 in sectors2sqlite.py.
Kahrl [Mon, 26 Sep 2011 11:10:22 +0000 (13:10 +0200)]
Fix processing of blocks below y=0 in sectors2sqlite.py.

13 years agoServer user limit configuration option
Perttu Ahola [Mon, 26 Sep 2011 08:57:51 +0000 (11:57 +0300)]
Server user limit configuration option

13 years agoMerge remote-tracking branch 'darkrose/master'
Perttu Ahola [Mon, 26 Sep 2011 08:57:28 +0000 (11:57 +0300)]
Merge remote-tracking branch 'darkrose/master'

13 years agoMerge pull request #10 from joshbeck/master
celeron55 [Sat, 24 Sep 2011 07:55:05 +0000 (00:55 -0700)]
Merge pull request #10 from joshbeck/master

Fixed null pointer dereference errors found by cppcheck

13 years agoFixed null pointer dereference errors found by cppcheck 10/head
Joshua Beck [Sat, 24 Sep 2011 07:11:43 +0000 (02:11 -0500)]
Fixed null pointer dereference errors found by cppcheck

13 years agoFixed merge issues with saplings, ready to pull now! 9/head
Mark Holmquist [Sat, 24 Sep 2011 01:19:47 +0000 (18:19 -0700)]
Fixed merge issues with saplings, ready to pull now!

13 years agoFixed saplings growing into trees (thanks so much, Kahrl!)
Mark Holmquist [Fri, 23 Sep 2011 14:27:57 +0000 (07:27 -0700)]
Fixed saplings growing into trees (thanks so much, Kahrl!)
Put the random interval back to 1 in 50 chance. It's not as rare as rats, but rarer than grass.

13 years agoAdding sapling texture
Mark Holmquist [Fri, 16 Sep 2011 08:07:50 +0000 (01:07 -0700)]
Adding sapling texture

13 years agoAdding (most) of the sapling functionality. It has yet to work, since MEET_OTHER...
Mark Holmquist [Tue, 16 Aug 2011 09:14:49 +0000 (02:14 -0700)]
Adding (most) of the sapling functionality. It has yet to work, since MEET_OTHER was not implemented at the time of this commit. Hopefully it will work when merged with celeron's latest.

13 years agoremove content_* things from map.cpp
darkrose [Fri, 23 Sep 2011 08:04:48 +0000 (18:04 +1000)]
remove content_* things from map.cpp

13 years agoMove PLATFORM_LIBS around to make sqlite3 link with libdl on some distros
Perttu Ahola [Fri, 23 Sep 2011 05:48:58 +0000 (08:48 +0300)]
Move PLATFORM_LIBS around to make sqlite3 link with libdl on some distros

13 years agoMake client report a newer version number to the server than 2011-07-31 does and... 0.2.20110922_1
Perttu Ahola [Thu, 22 Sep 2011 17:47:47 +0000 (20:47 +0300)]
Make client report a newer version number to the server than 2011-07-31 does and make the server enforce it

13 years agoOh well, let's call it just 0.2.20110922 0.2.20110922
Perttu Ahola [Thu, 22 Sep 2011 15:22:04 +0000 (18:22 +0300)]
Oh well, let's call it just 0.2.20110922

13 years agoUpdate changelog and version to 0.2.20110922_rc1
Perttu Ahola [Thu, 22 Sep 2011 15:15:05 +0000 (18:15 +0300)]
Update changelog and version to 0.2.20110922_rc1

13 years agoadded locking chest texture
darkrose [Thu, 22 Sep 2011 09:12:17 +0000 (19:12 +1000)]
added locking chest texture

13 years agoadded locking chests - clean patch
darkrose [Thu, 22 Sep 2011 09:11:48 +0000 (19:11 +1000)]
added locking chests - clean patch

13 years agoBetter apple tree generation
Perttu Ahola [Wed, 21 Sep 2011 20:31:55 +0000 (23:31 +0300)]
Better apple tree generation

13 years agoSimplistic wielded tool lighting, added setMeshVerticesColor to utility.h and refacto...
Kahrl [Wed, 21 Sep 2011 16:37:29 +0000 (18:37 +0200)]
Simplistic wielded tool lighting, added setMeshVerticesColor to utility.h and refactored some other code into calls of that

13 years agoreduce view bobbing slightly
Kahrl [Wed, 21 Sep 2011 13:54:06 +0000 (15:54 +0200)]
reduce view bobbing slightly

13 years agoCreate a separate scene manager for the wielded tool. This fixes the glitchyness...
Kahrl [Tue, 20 Sep 2011 23:42:52 +0000 (01:42 +0200)]
Create a separate scene manager for the wielded tool. This fixes the glitchyness in large map coordinates and some depth buffer problems. (The tool doesn't bob anymore when walking, this will be fixed later.) Fix MSVC build (thanks to dannydark).

13 years agofix a numerical problem, but tool is still jittery
Kahrl [Tue, 20 Sep 2011 16:25:29 +0000 (18:25 +0200)]
fix a numerical problem, but tool is still jittery

13 years agoFix jittery view bobbing at large map coordinates again. Wielded tool still has probl...
Kahrl [Tue, 20 Sep 2011 16:19:26 +0000 (18:19 +0200)]
Fix jittery view bobbing at large map coordinates again. Wielded tool still has problems there

13 years agoDigging animation
Kahrl [Tue, 20 Sep 2011 09:06:16 +0000 (11:06 +0200)]
Digging animation

13 years agofix some normals
Kahrl [Mon, 19 Sep 2011 15:11:53 +0000 (17:11 +0200)]
fix some normals

13 years agoWielded tool updates, leaves and glass work now
Kahrl [Mon, 19 Sep 2011 15:08:42 +0000 (17:08 +0200)]
Wielded tool updates, leaves and glass work now

13 years agoConvert any inventory item into a mesh, bring back InventoryItem::getImageRay(),...
Kahrl [Mon, 19 Sep 2011 04:37:24 +0000 (06:37 +0200)]
Convert any inventory item into a mesh, bring back InventoryItem::getImageRay(), some const-correctness fixes

13 years agoAdded sprite extruder
Kahrl [Mon, 19 Sep 2011 01:01:11 +0000 (03:01 +0200)]
Added sprite extruder

13 years agotrying some view bobbing changes
Kahrl [Sun, 18 Sep 2011 15:02:30 +0000 (17:02 +0200)]
trying some view bobbing changes

13 years agoOops, up vector is needed.
Kahrl [Sun, 18 Sep 2011 00:24:43 +0000 (02:24 +0200)]
Oops, up vector is needed.

13 years agoThis looks more like MC view bobbing, but still not even close
Kahrl [Sun, 18 Sep 2011 00:17:39 +0000 (02:17 +0200)]
This looks more like MC view bobbing, but still not even close

13 years agoMerge remote-tracking branch 'sfan5/apple-trees'
Perttu Ahola [Fri, 16 Sep 2011 16:09:13 +0000 (19:09 +0300)]
Merge remote-tracking branch 'sfan5/apple-trees'

13 years agoSQLite needs to be linked with -ldl on some Linux distros.
Kahrl [Wed, 14 Sep 2011 23:11:18 +0000 (01:11 +0200)]
SQLite needs to be linked with -ldl on some Linux distros.

13 years agoRevert some changes that could lead to slower map transfer and increaed network load.
Kahrl [Fri, 16 Sep 2011 16:03:58 +0000 (18:03 +0200)]
Revert some changes that could lead to slower map transfer and increaed network load.

13 years agoupdate minetestmapper so it can read the database also
JacobF [Tue, 6 Sep 2011 19:11:46 +0000 (15:11 -0400)]
update minetestmapper so it can read the database also

13 years agoUpdate changelog
Perttu Ahola [Fri, 16 Sep 2011 15:59:17 +0000 (18:59 +0300)]
Update changelog

13 years agoUpdated colors.txt (which is used by minetestmapper)
Kahrl [Thu, 15 Sep 2011 21:09:00 +0000 (23:09 +0200)]
Updated colors.txt (which is used by minetestmapper)

13 years agoMade wielded tool move slightly (and smoothly) during view bobbing. Making the tool...
Kahrl [Wed, 14 Sep 2011 22:32:11 +0000 (00:32 +0200)]
Made wielded tool move slightly (and smoothly) during view bobbing. Making the tool be a child node of an empty scene node instead of the camera scene node seemingly fixed the uncontrollable tool jitter, too.

13 years agoView bobbing is slower in the water.
Kahrl [Thu, 8 Sep 2011 21:31:48 +0000 (23:31 +0200)]
View bobbing is slower in the water.

13 years agoAdded Iron Apple which heals 4 Hearts
sfan5 [Mon, 12 Sep 2011 18:10:17 +0000 (20:10 +0200)]
Added Iron Apple which heals 4 Hearts

13 years agoChanged the Heal Amount of Apples from 6 to 2
sfan5 [Mon, 12 Sep 2011 17:44:26 +0000 (19:44 +0200)]
Changed the Heal Amount of Apples from 6 to 2

13 years agoFixed duplication bug
sfan5 [Sun, 11 Sep 2011 17:17:14 +0000 (19:17 +0200)]
Fixed duplication bug

13 years agoRemoved Spaces
sfan5 [Sun, 11 Sep 2011 16:16:07 +0000 (18:16 +0200)]
Removed Spaces

13 years agoAdded Apple Trees
sfan5 [Sun, 11 Sep 2011 15:50:44 +0000 (17:50 +0200)]
Added Apple Trees

13 years agoinventory displays tool breakage bar again
Kahrl [Thu, 8 Sep 2011 15:45:39 +0000 (17:45 +0200)]
inventory displays tool breakage bar again

13 years agotrying something else... also replaced M_PI by PI everywhere
Kahrl [Thu, 8 Sep 2011 14:10:44 +0000 (16:10 +0200)]
trying something else... also replaced M_PI by PI everywhere

13 years agoattempting to merge Queatz/the-wielded-tool and kahrl/viewbobbing, something doesn...
Kahrl [Thu, 8 Sep 2011 12:21:56 +0000 (14:21 +0200)]
attempting to merge Queatz/the-wielded-tool and kahrl/viewbobbing, something doesn't work right yet

13 years agominor view bobbing improvements
Kahrl [Thu, 8 Sep 2011 11:34:28 +0000 (13:34 +0200)]
minor view bobbing improvements

13 years agomake it slightly less annoying :o)
Kahrl [Thu, 8 Sep 2011 11:14:59 +0000 (13:14 +0200)]
make it slightly less annoying :o)

13 years agoImplemented view bobbing (testing simple lemniscate shape)
Kahrl [Thu, 8 Sep 2011 11:03:55 +0000 (13:03 +0200)]
Implemented view bobbing (testing simple lemniscate shape)

13 years agoCommented out debug statements again
Kahrl [Wed, 7 Sep 2011 23:24:47 +0000 (01:24 +0200)]
Commented out debug statements again

13 years agoCollected and moved existing camera infrastructure from game.cpp to camera.cpp and...
Kahrl [Wed, 7 Sep 2011 23:08:47 +0000 (01:08 +0200)]
Collected and moved existing camera infrastructure from game.cpp to camera.cpp and camera.h. Introduced configuration settings 'fov' which chooses the camera's (vertical) field of view and 'view_bobbing' which currently does nothing. Other code refactored to not expect the FOV to be a build time constant.

13 years agoRemoved unused camera_position and camera_direction fields from Client. Moved ClientE...
Kahrl [Wed, 7 Sep 2011 17:21:28 +0000 (19:21 +0200)]
Removed unused camera_position and camera_direction fields from Client. Moved ClientEnvironment::drawPostFx to ClientMap::renderPostFx -- this will make the camera management classes easier to write, as ClientMap already knows the camera position but ClientEnvironment doesn't and has to be told about it. This also eliminates the need for Client::getEnv(). Made the post effect color a content feature defined in content_mapnode.h.

13 years agoDisplay which tool the player is holding
JacobF [Wed, 7 Sep 2011 14:56:04 +0000 (10:56 -0400)]
Display which tool the player is holding
And some simple animation when trying to dig...

13 years agoNote about texture atlas
Perttu Ahola [Tue, 6 Sep 2011 22:27:04 +0000 (01:27 +0300)]
Note about texture atlas

13 years agoAdd note about trans_table_19.
Perttu Ahola [Tue, 6 Sep 2011 22:19:48 +0000 (01:19 +0300)]
Add note about trans_table_19.

13 years agoRemove block file from disk when saved to database
Perttu Ahola [Tue, 6 Sep 2011 17:28:45 +0000 (20:28 +0300)]
Remove block file from disk when saved to database

13 years agoPause in unloaded territory instead of collide
JacobF [Wed, 24 Aug 2011 02:10:19 +0000 (22:10 -0400)]
Pause in unloaded territory instead of collide

13 years agoMake Connection::Send cancel silently if peer doesn't exist.
Perttu Ahola [Tue, 6 Sep 2011 16:39:23 +0000 (19:39 +0300)]
Make Connection::Send cancel silently if peer doesn't exist.

13 years agoUpdate version number to something more proper for this stage of development (0.2...
Perttu Ahola [Tue, 6 Sep 2011 16:22:00 +0000 (19:22 +0300)]
Update version number to something more proper for this stage of development (0.2.201109xx_dev)

13 years agoSpeed up periodical map unloading by moving beginSave() and endSave() to outer loop...
Perttu Ahola [Tue, 6 Sep 2011 16:16:36 +0000 (19:16 +0300)]
Speed up periodical map unloading by moving beginSave() and endSave() to outer loop in Map::timerUpdate()

13 years agoMerge remote-tracking branch 'queatz/sqlite-map'
Perttu Ahola [Tue, 6 Sep 2011 15:04:02 +0000 (18:04 +0300)]
Merge remote-tracking branch 'queatz/sqlite-map'

13 years agoFix bug in posix file/directory removal wrapper, as pointed out by kahrl
Perttu Ahola [Tue, 6 Sep 2011 14:52:03 +0000 (17:52 +0300)]
Fix bug in posix file/directory removal wrapper, as pointed out by kahrl

13 years agoFix some texture stuff: remove item_fence.png, use fence.png, remove inexisting cactu...
Perttu Ahola [Tue, 6 Sep 2011 14:13:24 +0000 (17:13 +0300)]
Fix some texture stuff: remove item_fence.png, use fence.png, remove inexisting cactus.png from texture atlas (replace with nothing because cactus is rare)

13 years agoallow specifying a fixed seed in the config file for generating the map (fixed_map_seed)
Kahrl [Wed, 31 Aug 2011 09:24:50 +0000 (11:24 +0200)]
allow specifying a fixed seed in the config file for generating the map (fixed_map_seed)

13 years agoNow SAOs will reflect changes to their temporary inventory object
JacobF [Thu, 1 Sep 2011 21:16:55 +0000 (17:16 -0400)]
Now SAOs will reflect changes to their temporary inventory object
Also, the temp item wasn't being deleted, might have been a memory leak.
Now you will only eat 1 item off a stack

13 years agoCull empty lines...
JacobF [Sun, 4 Sep 2011 21:06:23 +0000 (17:06 -0400)]
Cull empty lines...

13 years agoFiles to database converter
JacobF [Sun, 4 Sep 2011 21:02:50 +0000 (17:02 -0400)]
Files to database converter

13 years agoThese numbers were well exceeding 2^32...
JacobF [Sun, 4 Sep 2011 21:01:28 +0000 (17:01 -0400)]
These numbers were well exceeding 2^32...

13 years agoInitial sqlite3 maps.
JacobF [Fri, 2 Sep 2011 23:07:14 +0000 (19:07 -0400)]
Initial sqlite3 maps.
* The map will reside in world/map.sqlite
* It will load from the sectors folder but will not save there

13 years agoFurnace was crashing stuff again
JacobF [Fri, 2 Sep 2011 21:33:06 +0000 (17:33 -0400)]
Furnace was crashing stuff again

13 years agoMerge branch 'master' of /media/Field/Software/minetest-queatz/minetest-sqlite/....
JacobF [Fri, 2 Sep 2011 20:59:17 +0000 (16:59 -0400)]
Merge branch 'master' of /media/Field/Software/minetest-queatz/minetest-sqlite/.. into sqlite-map

13 years agoUpdate to SQLite 3.7.7.1
JacobF [Thu, 1 Sep 2011 22:27:30 +0000 (18:27 -0400)]
Update to SQLite 3.7.7.1

13 years ago* Furnace would say it was overloaded when it had a non-cookable source
JacobF [Thu, 1 Sep 2011 19:39:15 +0000 (15:39 -0400)]
* Furnace would say it was overloaded when it had a non-cookable source
* I didn't understand that expression last fix and now the furnace would burn fuel
even when it had no source item.

13 years agoMerge remote-tracking branch 'queatz/furnace-fix'
Perttu Ahola [Wed, 31 Aug 2011 14:04:12 +0000 (17:04 +0300)]
Merge remote-tracking branch 'queatz/furnace-fix'

13 years agoUpdated changelog
Perttu Ahola [Tue, 30 Aug 2011 21:43:34 +0000 (00:43 +0300)]
Updated changelog

13 years agoIf there was no source item in a furnace it would cause a segmentation fault.
JacobF [Tue, 30 Aug 2011 15:38:53 +0000 (11:38 -0400)]
If there was no source item in a furnace it would cause a segmentation fault.

13 years agoMerge remote-tracking branch 'kahrl/dissector'
Perttu Ahola [Tue, 30 Aug 2011 11:24:33 +0000 (14:24 +0300)]
Merge remote-tracking branch 'kahrl/dissector'

13 years agoMerge remote-tracking branch 'queatz/mmb10'
Perttu Ahola [Tue, 30 Aug 2011 11:24:23 +0000 (14:24 +0300)]
Merge remote-tracking branch 'queatz/mmb10'

13 years agoMerge remote-tracking branch 'queatz/furnace-is-not-blackhole'
Perttu Ahola [Tue, 30 Aug 2011 11:24:12 +0000 (14:24 +0300)]
Merge remote-tracking branch 'queatz/furnace-is-not-blackhole'

13 years agoMerge remote-tracking branch 'queatz/furnace-is-not-out-nor-can-rat-escape'
Perttu Ahola [Tue, 30 Aug 2011 11:24:07 +0000 (14:24 +0300)]
Merge remote-tracking branch 'queatz/furnace-is-not-out-nor-can-rat-escape'

13 years agoMerge remote-tracking branch 'queatz/privs'
Perttu Ahola [Tue, 30 Aug 2011 11:23:44 +0000 (14:23 +0300)]
Merge remote-tracking branch 'queatz/privs'