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

13 years agoFix use of && instead of &
Giuseppe Bilotta [Fri, 12 Aug 2011 21:34:12 +0000 (23:34 +0200)]
Fix use of && instead of &

13 years agoRemoved assert if creating texture atlas image fails; cancel creating image instead.
Perttu Ahola [Fri, 12 Aug 2011 14:17:47 +0000 (17:17 +0300)]
Removed assert if creating texture atlas image fails; cancel creating image instead.

13 years agofixed not finding data dir if installed
Constantin Wenger [Wed, 10 Aug 2011 21:43:21 +0000 (23:43 +0200)]
fixed not finding data dir if installed

13 years agoFixed/extended/modified ban stuff to be good for inclusion
Perttu Ahola [Fri, 12 Aug 2011 10:11:27 +0000 (13:11 +0300)]
Fixed/extended/modified ban stuff to be good for inclusion

13 years agoMerge remote-tracking branch 'speedprog/banByIp'
Perttu Ahola [Fri, 12 Aug 2011 08:55:51 +0000 (11:55 +0300)]
Merge remote-tracking branch 'speedprog/banByIp'

13 years agoadded ipban support
Constantin Wenger [Thu, 11 Aug 2011 23:13:42 +0000 (01:13 +0200)]
added ipban support
commands:
/#ipban <nick>
/#ipunban <ip>

13 years agoUpdated .gitignore to ignore vim swap files
Perttu Ahola [Thu, 11 Aug 2011 21:33:24 +0000 (00:33 +0300)]
Updated .gitignore to ignore vim swap files

13 years agoTypo fix
Giuseppe Bilotta [Thu, 11 Aug 2011 17:45:44 +0000 (19:45 +0200)]
Typo fix

13 years ago.gitattributes
Giuseppe Bilotta [Thu, 11 Aug 2011 15:57:04 +0000 (17:57 +0200)]
.gitattributes

Marking *.cpp files as C++ files makes for nicer diffs when using
--color-words or similar options.

13 years agoNotify other players of wielded item change
Giuseppe Bilotta [Thu, 11 Aug 2011 05:02:57 +0000 (07:02 +0200)]
Notify other players of wielded item change

13 years agoconstify inventory item serialization
Giuseppe Bilotta [Wed, 10 Aug 2011 21:22:44 +0000 (23:22 +0200)]
constify inventory item serialization

13 years agoClients inform server on wielded item
Giuseppe Bilotta [Wed, 10 Aug 2011 19:43:40 +0000 (21:43 +0200)]
Clients inform server on wielded item

This is done with the new TOSERVER_PLAYERITEM message, that informs the
server on the index of the wielded item.

13 years agoKeep track of player item
Giuseppe Bilotta [Wed, 10 Aug 2011 16:31:44 +0000 (18:31 +0200)]
Keep track of player item

13 years agoSome inventory const-ification
Giuseppe Bilotta [Wed, 10 Aug 2011 09:38:49 +0000 (11:38 +0200)]
Some inventory const-ification

13 years agoServer should use the same eye position as the client
Giuseppe Bilotta [Wed, 10 Aug 2011 06:07:30 +0000 (08:07 +0200)]
Server should use the same eye position as the client

13 years agoRefactor player's eye position coding
Giuseppe Bilotta [Wed, 10 Aug 2011 06:06:30 +0000 (08:06 +0200)]
Refactor player's eye position coding

Collect the player's eye position coding in a Player method, and
use it in client to pass the eye position information to the game.

13 years agoIntroduce Player::getLightPosition
Giuseppe Bilotta [Wed, 10 Aug 2011 05:38:51 +0000 (07:38 +0200)]
Introduce Player::getLightPosition

This is currently only used in the lighting update for remote
players in client.

13 years agoMerged some FreeBSD fixes
Perttu Ahola [Thu, 11 Aug 2011 09:32:36 +0000 (12:32 +0300)]
Merged some FreeBSD fixes

13 years agoProper placement of binary files.
q66 [Thu, 11 Aug 2011 09:07:35 +0000 (11:07 +0200)]
Proper placement of binary files.

13 years agoGettext fix for *BSD - require special linkage as glibc is not used
q66 [Thu, 11 Aug 2011 09:04:22 +0000 (11:04 +0200)]
Gettext fix for *BSD - require special linkage as glibc is not used

13 years agoPrevent threadid_t from losing precision when casted on 64bit systems
q66 [Thu, 11 Aug 2011 08:52:00 +0000 (10:52 +0200)]
Prevent threadid_t from losing precision when casted on 64bit systems

13 years agoRespect base virtual functions' signatures
Giuseppe Bilotta [Mon, 8 Aug 2011 14:15:53 +0000 (16:15 +0200)]
Respect base virtual functions' signatures

13 years agoAlways return from non-void functions
Giuseppe Bilotta [Mon, 8 Aug 2011 14:13:48 +0000 (16:13 +0200)]
Always return from non-void functions

This quiets a warning in Clang.

13 years agoKeys should be s32, not u32
Giuseppe Bilotta [Mon, 8 Aug 2011 14:12:15 +0000 (16:12 +0200)]
Keys should be s32, not u32

At least two reasons for this:
* activeKey is treated as signed (check for sign, assign -1, etc)
* the ID retrieved from Irrlicht's events are signed

13 years agoRemove spurious assignment
Giuseppe Bilotta [Mon, 8 Aug 2011 14:11:37 +0000 (16:11 +0200)]
Remove spurious assignment

13 years agoInventoryAction is a struct, not a class
Giuseppe Bilotta [Mon, 8 Aug 2011 13:38:20 +0000 (15:38 +0200)]
InventoryAction is a struct, not a class

13 years agoClang doesn't like -Wno-unused-but-set-variable
Giuseppe Bilotta [Thu, 11 Aug 2011 08:08:58 +0000 (10:08 +0200)]
Clang doesn't like -Wno-unused-but-set-variable

The release versions of CMake don't yet properly support flag checking
in Clang, so we need to exclude it explicitly for the time being.

13 years agoProject uses C++, so use CHECK_CXX_COMPILER_FLAG
Giuseppe Bilotta [Thu, 11 Aug 2011 08:06:48 +0000 (10:06 +0200)]
Project uses C++, so use CHECK_CXX_COMPILER_FLAG

Although this doesn't change much for our specific case, it can make a
difference for some flags, so use the appropriate macro.

13 years agoFix data paths for FreeBSD
Dmitry Marakasov [Mon, 1 Aug 2011 22:50:16 +0000 (02:50 +0400)]
Fix data paths for FreeBSD

13 years agoFix "integer constant is too large for 'long' type" error
Dmitry Marakasov [Mon, 1 Aug 2011 22:49:15 +0000 (02:49 +0400)]
Fix "integer constant is too large for 'long' type" error

13 years agoCheck whether -Wno-unused-but-set-variable is supported before using
Dmitry Marakasov [Mon, 1 Aug 2011 18:17:32 +0000 (22:17 +0400)]
Check whether -Wno-unused-but-set-variable is supported before using
it. It seems to only be available on recent (>=4.6) versions of gcc.

13 years agothe zlib error print function now prints to dstream (debug.txt)
Perttu Ahola [Mon, 8 Aug 2011 09:11:41 +0000 (12:11 +0300)]
the zlib error print function now prints to dstream (debug.txt)

13 years agoremoved broken and old tags and re-added 0.2.20110731_3
Perttu Ahola [Fri, 5 Aug 2011 08:54:54 +0000 (11:54 +0300)]
removed broken and old tags and re-added 0.2.20110731_3

13 years agoAdded tag 0.2.20110731_3 for changeset a519d6832511
Perttu Ahola [Fri, 5 Aug 2011 08:52:58 +0000 (11:52 +0300)]
Added tag 0.2.20110731_3 for changeset a519d6832511

13 years agomerged delta and c55
Perttu Ahola [Fri, 5 Aug 2011 08:22:13 +0000 (11:22 +0300)]
merged delta and c55

13 years agominetestmapper can be run from any directory
Giuseppe Bilotta [Wed, 3 Aug 2011 06:37:56 +0000 (08:37 +0200)]
minetestmapper can be run from any directory

If it doesn't find colors.txt locally, it looks for the one in the
directory of the script itself.