oweals/minetest.git
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 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 agoBetter apple tree generation
Perttu Ahola [Wed, 21 Sep 2011 20:31:55 +0000 (23:31 +0300)]
Better apple tree generation

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 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 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 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'

13 years agoMerged 2 branches because they relied on each other.
JacobF [Thu, 25 Aug 2011 23:27:50 +0000 (19:27 -0400)]
Merged 2 branches because they relied on each other.
This one contains these changes from main c55:
* Adds a function to check if there is room for a specific item
* Using that, you can now pick up rats if you have a full inventory and a not full rat stack
* Furnace would cook only 1 item if that item used the last available result slot, now it will continue
* Furnace will say it's overloaded
* Furnace won't wait until the next step to start on the next item
 - This caused small fuels to cook slower than meant to
 - Also caused furnaces to say they were out of fuel after finishing the last fuel item

13 years agodissector branch: fix for doc/protocol.txt: CONTROLTYPE_DISCO is 3
Kahrl [Thu, 25 Aug 2011 19:32:48 +0000 (21:32 +0200)]
dissector branch: fix for doc/protocol.txt: CONTROLTYPE_DISCO is 3

13 years agodissector branch: fix description of TOCLIENT_PLAYERITEM in clientserver.h
Kahrl [Thu, 25 Aug 2011 19:31:28 +0000 (21:31 +0200)]
dissector branch: fix description of TOCLIENT_PLAYERITEM in clientserver.h

13 years agodissector branch: added wireshark dissector minetest.lua
Kahrl [Thu, 25 Aug 2011 19:29:41 +0000 (21:29 +0200)]
dissector branch: added wireshark dissector minetest.lua

13 years agoMiddle mouse click will move 10 items around at a time.
JacobF [Thu, 25 Aug 2011 16:43:19 +0000 (12:43 -0400)]
Middle mouse click will move 10 items around at a time.

13 years agoDon't remove furnace if something is inside it.
JacobF [Wed, 24 Aug 2011 22:53:06 +0000 (18:53 -0400)]
Don't remove furnace if something is inside it.

13 years agoIf a user doesn't have build rights, don't allow them to move items to and from their...
JacobF [Wed, 24 Aug 2011 02:08:09 +0000 (22:08 -0400)]
If a user doesn't have build rights, don't allow them to move items to and from their inventory

13 years agoThe password box in the mainmenu is focused if there is already a name and address...
JacobF [Wed, 24 Aug 2011 02:06:35 +0000 (22:06 -0400)]
The password box in the mainmenu is focused if there is already a name and address filled in

13 years agoLava is now better visible inside water. (a crappy hack)
Perttu Ahola [Tue, 23 Aug 2011 00:01:01 +0000 (03:01 +0300)]
Lava is now better visible inside water. (a crappy hack)

13 years agoInventory transparency; very loosely based on sapier's commits.
Perttu Ahola [Mon, 22 Aug 2011 21:31:18 +0000 (00:31 +0300)]
Inventory transparency; very loosely based on sapier's commits.

Also contains some commented-out code for testing out different looks
in the future.

13 years agoif creative mode and player has no build privileges, cannot drop items.
Perttu Ahola [Mon, 22 Aug 2011 19:55:17 +0000 (22:55 +0300)]
if creative mode and player has no build privileges, cannot drop items.

13 years agoFixed water mesh generation acting weird next to sand
Perttu Ahola [Mon, 22 Aug 2011 19:44:43 +0000 (22:44 +0300)]
Fixed water mesh generation acting weird next to sand

13 years agoFix byte count in serialization of "F1000"
Perttu Ahola [Mon, 22 Aug 2011 19:17:26 +0000 (22:17 +0300)]
Fix byte count in serialization of "F1000"

Some access violations and segfaults and strange behaviour might have
been caused by this.

13 years agoFixed some protocol comment errors in clientserver.h and elsewhere
Perttu Ahola [Mon, 22 Aug 2011 19:04:46 +0000 (22:04 +0300)]
Fixed some protocol comment errors in clientserver.h and elsewhere

-- TOCLIENT_OBJECTDATA: peer ID field is missing
-- TOCLIENT_ACTIVE_OBJECT_REMOVE_ADD: added: init length should be u32, not u16

13 years agoHopefully fix 'dangling water'
Giuseppe Bilotta [Sat, 20 Aug 2011 05:54:01 +0000 (07:54 +0200)]
Hopefully fix 'dangling water'

If a block has (at least visible) liquids, the block below should also
be flowed in.

13 years agoPossibly fixed the extremely rare PeerNotFound loop bug.
Perttu Ahola [Mon, 22 Aug 2011 18:27:11 +0000 (21:27 +0300)]
Possibly fixed the extremely rare PeerNotFound loop bug.

See explanation in http://2pktfkt.de/irc/minetest-delta/2011-08-22.html

13 years agoUpdate README.txt
Perttu Ahola [Mon, 22 Aug 2011 12:00:55 +0000 (15:00 +0300)]
Update README.txt

13 years agoMerge remote-tracking branch 'oblomov/me_cmd'
Perttu Ahola [Mon, 22 Aug 2011 11:46:54 +0000 (14:46 +0300)]
Merge remote-tracking branch 'oblomov/me_cmd'

13 years agoMerge remote-tracking branch 'oblomov/new_input'
Perttu Ahola [Mon, 22 Aug 2011 11:46:52 +0000 (14:46 +0300)]
Merge remote-tracking branch 'oblomov/new_input'

13 years agoChange way commands are displayed in chat window
Giuseppe Bilotta [Mon, 22 Aug 2011 11:43:53 +0000 (13:43 +0200)]
Change way commands are displayed in chat window

13 years agoIntroduce hotkey for calling up a command window
Giuseppe Bilotta [Sat, 13 Aug 2011 16:16:49 +0000 (18:16 +0200)]
Introduce hotkey for calling up a command window

This is just a chat window with the / text pre-loaded.

13 years agoSend KEY_END when (re)creating a text input
Giuseppe Bilotta [Sat, 13 Aug 2011 16:56:15 +0000 (18:56 +0200)]
Send KEY_END when (re)creating a text input

This ensures that on creation and when resizing the cursor is at the end
of the text rather than at the beginnig.

13 years ago/me command
Giuseppe Bilotta [Sat, 13 Aug 2011 15:41:18 +0000 (17:41 +0200)]
/me command

13 years agoServer now supports replies without prefix
Giuseppe Bilotta [Sat, 13 Aug 2011 15:37:31 +0000 (17:37 +0200)]
Server now supports replies without prefix

13 years agoDefines for server command context flags
Giuseppe Bilotta [Sat, 13 Aug 2011 15:35:10 +0000 (17:35 +0200)]
Defines for server command context flags

13 years agoRemove distinction between /# and / commands
Giuseppe Bilotta [Sat, 13 Aug 2011 15:09:23 +0000 (17:09 +0200)]
Remove distinction between /# and / commands

No need to make the server command syntax more complicated than
necessary. If the need ever arise, we'll find some other way to
distinguish the client commands. Also, the /# syntax is deprecated and
will be made obsolete in time.

13 years agoOverhaul the input system
Giuseppe Bilotta [Sat, 13 Aug 2011 20:44:31 +0000 (22:44 +0200)]
Overhaul the input system

This allows us to map the keys which are not considered in
irrlicht's EKEY_CODE system, such as \, [, /, ] etc.

13 years agoFix typos in key names
Giuseppe Bilotta [Sat, 13 Aug 2011 15:59:54 +0000 (17:59 +0200)]
Fix typos in key names

13 years agoFlowing lava updates lighting
Perttu Ahola [Mon, 22 Aug 2011 10:19:07 +0000 (13:19 +0300)]
Flowing lava updates lighting

13 years agoMerge remote-tracking branch 'oblomov/liquid_fixes'
Perttu Ahola [Mon, 22 Aug 2011 09:53:18 +0000 (12:53 +0300)]
Merge remote-tracking branch 'oblomov/liquid_fixes'

13 years agoMerge branch 'lava'
Perttu Ahola [Mon, 22 Aug 2011 09:53:02 +0000 (12:53 +0300)]
Merge branch 'lava'

13 years agoOptimize for viscosity 1
Giuseppe Bilotta [Tue, 16 Aug 2011 18:38:44 +0000 (20:38 +0200)]
Optimize for viscosity 1

13 years agoViscous fluids
Giuseppe Bilotta [Tue, 16 Aug 2011 17:56:57 +0000 (19:56 +0200)]
Viscous fluids

13 years agoMake sure all neighbors of changed fluids are activated
Giuseppe Bilotta [Tue, 16 Aug 2011 16:05:28 +0000 (18:05 +0200)]
Make sure all neighbors of changed fluids are activated

This should fix the remaining cases of fluid not advancing or not
retreating.

13 years agoLet the liquids flow in the open
Giuseppe Bilotta [Tue, 16 Aug 2011 15:42:28 +0000 (17:42 +0200)]
Let the liquids flow in the open

No need to curb their spread artificially.

13 years agoEnsure air neighbors to liquids that can flow are enqueued for transformation
Giuseppe Bilotta [Tue, 16 Aug 2011 05:24:01 +0000 (07:24 +0200)]
Ensure air neighbors to liquids that can flow are enqueued for transformation

13 years agoEnsure param2 is set correctly in transformLiquids
Giuseppe Bilotta [Tue, 16 Aug 2011 14:46:55 +0000 (16:46 +0200)]
Ensure param2 is set correctly in transformLiquids

13 years agoUse defines for liquid levels
Giuseppe Bilotta [Tue, 16 Aug 2011 06:31:33 +0000 (08:31 +0200)]
Use defines for liquid levels

13 years agoImplemented MEET_OTHER
Perttu Ahola [Tue, 16 Aug 2011 09:23:19 +0000 (12:23 +0300)]
Implemented MEET_OTHER

13 years agotransformLiquid: small optimization and whitespace cleanup
Giuseppe Bilotta [Tue, 16 Aug 2011 04:00:40 +0000 (06:00 +0200)]
transformLiquid: small optimization and whitespace cleanup

13 years agosmall fix to transformLiquids
Perttu Ahola [Mon, 15 Aug 2011 15:49:44 +0000 (18:49 +0300)]
small fix to transformLiquids

13 years agoFixed liquid mesh generation
Perttu Ahola [Mon, 15 Aug 2011 14:45:35 +0000 (17:45 +0300)]
Fixed liquid mesh generation

13 years agoAdd lava to creative inventory (hmm, we're shortly running out of creative inventory...
Perttu Ahola [Mon, 15 Aug 2011 13:57:57 +0000 (16:57 +0300)]
Add lava to creative inventory (hmm, we're shortly running out of creative inventory space)

13 years agoHopefully fixed msvc "'sqrt' : ambiguous call to overloaded function"
Perttu Ahola [Mon, 15 Aug 2011 12:11:00 +0000 (15:11 +0300)]
Hopefully fixed msvc "'sqrt' : ambiguous call to overloaded function"

13 years agoNon-vertex-alpha texture material for lava
Perttu Ahola [Mon, 15 Aug 2011 09:08:41 +0000 (12:08 +0300)]
Non-vertex-alpha texture material for lava

13 years agoGet rid of makepackage_binary.sh
Giuseppe Bilotta [Mon, 15 Aug 2011 09:07:30 +0000 (11:07 +0200)]
Get rid of makepackage_binary.sh

It's outdated, and it would be better to use cmake's packaging
capabilities instead, for better cross-platformness.

13 years agoCleanup root
Giuseppe Bilotta [Mon, 15 Aug 2011 09:05:05 +0000 (11:05 +0200)]
Cleanup root

These scripts should not be in the root but in util/ and in fact
they are, so let's get rid of these.

13 years agomodified mapgen to generate less lava
Perttu Ahola [Mon, 15 Aug 2011 08:56:16 +0000 (11:56 +0300)]
modified mapgen to generate less lava

13 years agoAdded #define WATER_ALPHA in content_mapnode.cpp
Perttu Ahola [Mon, 15 Aug 2011 08:51:33 +0000 (11:51 +0300)]
Added #define WATER_ALPHA in content_mapnode.cpp

13 years agotuned lava/universal damage code
Perttu Ahola [Mon, 15 Aug 2011 08:49:39 +0000 (11:49 +0300)]
tuned lava/universal damage code

13 years agolava!
Perttu Ahola [Sun, 14 Aug 2011 23:04:56 +0000 (02:04 +0300)]
lava!

13 years agoWindows.h -> windows.h for cross-mingw build
Perttu Ahola [Sun, 14 Aug 2011 18:26:07 +0000 (21:26 +0300)]
Windows.h -> windows.h for cross-mingw build

13 years agoMerge remote-tracking branch 'speedprog/fixedNotFindingData'
Perttu Ahola [Sat, 13 Aug 2011 11:05:01 +0000 (14:05 +0300)]
Merge remote-tracking branch 'speedprog/fixedNotFindingData'

13 years agoLet Settings accept a const char* directly
Giuseppe Bilotta [Sat, 13 Aug 2011 05:33:43 +0000 (07:33 +0200)]
Let Settings accept a const char* directly

13 years agoFix keycode_to_keyname return value
Giuseppe Bilotta [Sat, 13 Aug 2011 05:31:46 +0000 (07:31 +0200)]
Fix keycode_to_keyname return value

13 years agoClean up key names handling
Giuseppe Bilotta [Fri, 12 Aug 2011 21:42:00 +0000 (23:42 +0200)]
Clean up key names handling

Constify keycode and move the static array of localizable names from the
guiKeyChangeMenu header to the implementation file, changing its name.