Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'kahrl/dissector' | Perttu Ahola | 2011-08-30 | 1 | -2/+6 |
|\ | |||||
| * | dissector branch: fix description of TOCLIENT_PLAYERITEM in clientserver.h | Kahrl | 2011-08-25 | 1 | -2/+6 |
| | | |||||
* | | Merge remote-tracking branch 'queatz/mmb10' | Perttu Ahola | 2011-08-30 | 1 | -5/+12 |
|\ \ | |||||
| * | | Middle mouse click will move 10 items around at a time. | JacobF | 2011-08-25 | 1 | -5/+12 |
| |/ | |||||
* | | Merge remote-tracking branch 'queatz/furnace-is-not-blackhole' | Perttu Ahola | 2011-08-30 | 2 | -0/+19 |
|\ \ | |||||
| * | | Don't remove furnace if something is inside it. | JacobF | 2011-08-24 | 2 | -0/+19 |
| |/ | |||||
* | | Merge remote-tracking branch 'queatz/furnace-is-not-out-nor-can-rat-escape' | Perttu Ahola | 2011-08-30 | 4 | -13/+55 |
|\ \ | |||||
| * | | Merged 2 branches because they relied on each other. | JacobF | 2011-08-25 | 4 | -13/+55 |
| |/ | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | Merge remote-tracking branch 'queatz/privs' | Perttu Ahola | 2011-08-30 | 1 | -0/+3 |
|\ \ | |||||
| * | | If a user doesn't have build rights, don't allow them to move items to and ↵ | JacobF | 2011-08-23 | 1 | -0/+3 |
| |/ | | | | | | | from their inventory | ||||
* / | The password box in the mainmenu is focused if there is already a name and ↵ | JacobF | 2011-08-23 | 1 | -1/+3 |
|/ | | | | address filled in | ||||
* | Lava is now better visible inside water. (a crappy hack) | Perttu Ahola | 2011-08-23 | 3 | -12/+20 |
| | |||||
* | Inventory transparency; very loosely based on sapier's commits. | Perttu Ahola | 2011-08-23 | 2 | -17/+70 |
| | | | | | Also contains some commented-out code for testing out different looks in the future. | ||||
* | if creative mode and player has no build privileges, cannot drop items. | Perttu Ahola | 2011-08-22 | 1 | -0/+12 |
| | |||||
* | Fixed water mesh generation acting weird next to sand | Perttu Ahola | 2011-08-22 | 1 | -2/+2 |
| | |||||
* | Fix byte count in serialization of "F1000" | Perttu Ahola | 2011-08-22 | 1 | -7/+4 |
| | | | | | Some access violations and segfaults and strange behaviour might have been caused by this. | ||||
* | Fixed some protocol comment errors in clientserver.h and elsewhere | Perttu Ahola | 2011-08-22 | 3 | -2/+4 |
| | | | | | -- TOCLIENT_OBJECTDATA: peer ID field is missing -- TOCLIENT_ACTIVE_OBJECT_REMOVE_ADD: added: init length should be u32, not u16 | ||||
* | Hopefully fix 'dangling water' | Giuseppe Bilotta | 2011-08-22 | 1 | -1/+2 |
| | | | | | If a block has (at least visible) liquids, the block below should also be flowed in. | ||||
* | Possibly fixed the extremely rare PeerNotFound loop bug. | Perttu Ahola | 2011-08-22 | 1 | -14/+14 |
| | | | | See explanation in http://2pktfkt.de/irc/minetest-delta/2011-08-22.html | ||||
* | Merge remote-tracking branch 'oblomov/me_cmd' | Perttu Ahola | 2011-08-22 | 9 | -23/+86 |
|\ | |||||
| * | Change way commands are displayed in chat window | Giuseppe Bilotta | 2011-08-22 | 1 | -0/+6 |
| | | |||||
| * | Introduce hotkey for calling up a command window | Giuseppe Bilotta | 2011-08-22 | 4 | -0/+42 |
| | | | | | | | | This is just a chat window with the / text pre-loaded. | ||||
| * | Send KEY_END when (re)creating a text input | Giuseppe Bilotta | 2011-08-22 | 1 | -0/+6 |
| | | | | | | | | | | This ensures that on creation and when resizing the cursor is at the end of the text rather than at the beginnig. | ||||
| * | /me command | Giuseppe Bilotta | 2011-08-22 | 1 | -0/+12 |
| | | |||||
| * | Server now supports replies without prefix | Giuseppe Bilotta | 2011-08-22 | 2 | -4/+9 |
| | | |||||
| * | Defines for server command context flags | Giuseppe Bilotta | 2011-08-22 | 3 | -5/+7 |
| | | |||||
| * | Remove distinction between /# and / commands | Giuseppe Bilotta | 2011-08-22 | 2 | -15/+5 |
| | | | | | | | | | | | | | | 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. | ||||
* | | Merge remote-tracking branch 'oblomov/new_input' | Perttu Ahola | 2011-08-22 | 8 | -176/+329 |
|\| | |||||
| * | Overhaul the input system | Giuseppe Bilotta | 2011-08-22 | 8 | -176/+329 |
| | | | | | | | | | | This allows us to map the keys which are not considered in irrlicht's EKEY_CODE system, such as \, [, /, ] etc. | ||||
| * | Fix typos in key names | Giuseppe Bilotta | 2011-08-22 | 1 | -2/+2 |
| | | |||||
* | | Flowing lava updates lighting | Perttu Ahola | 2011-08-22 | 1 | -1/+9 |
| | | |||||
* | | Merge remote-tracking branch 'oblomov/liquid_fixes' | Perttu Ahola | 2011-08-22 | 3 | -57/+70 |
|\ \ | |||||
| * | | Optimize for viscosity 1 | Giuseppe Bilotta | 2011-08-16 | 1 | -2/+2 |
| | | | |||||
| * | | Viscous fluids | Giuseppe Bilotta | 2011-08-16 | 3 | -6/+41 |
| | | | |||||
| * | | Make sure all neighbors of changed fluids are activated | Giuseppe Bilotta | 2011-08-16 | 1 | -13/+1 |
| | | | | | | | | | | | | | | | This should fix the remaining cases of fluid not advancing or not retreating. | ||||
| * | | Let the liquids flow in the open | Giuseppe Bilotta | 2011-08-16 | 1 | -13/+0 |
| | | | | | | | | | | | | No need to curb their spread artificially. | ||||
| * | | Ensure air neighbors to liquids that can flow are enqueued for transformation | Giuseppe Bilotta | 2011-08-16 | 1 | -1/+7 |
| | | | |||||
| * | | Ensure param2 is set correctly in transformLiquids | Giuseppe Bilotta | 2011-08-16 | 1 | -4/+4 |
| | | | |||||
| * | | Use defines for liquid levels | Giuseppe Bilotta | 2011-08-16 | 2 | -4/+8 |
| | | | |||||
| * | | transformLiquid: small optimization and whitespace cleanup | Giuseppe Bilotta | 2011-08-16 | 1 | -18/+11 |
| | | | |||||
* | | | Merge branch 'lava' | Perttu Ahola | 2011-08-22 | 12 | -99/+296 |
|\| | | |/ |/| | |||||
| * | small fix to transformLiquids | Perttu Ahola | 2011-08-15 | 1 | -6/+5 |
| | | |||||
| * | Fixed liquid mesh generation | Perttu Ahola | 2011-08-15 | 1 | -9/+23 |
| | | |||||
| * | Add lava to creative inventory (hmm, we're shortly running out of creative ↵ | Perttu Ahola | 2011-08-15 | 1 | -0/+1 |
| | | | | | | | | inventory space) | ||||
| * | Hopefully fixed msvc "'sqrt' : ambiguous call to overloaded function" | Perttu Ahola | 2011-08-15 | 1 | -1/+1 |
| | | |||||
| * | Non-vertex-alpha texture material for lava | Perttu Ahola | 2011-08-15 | 1 | -2/+2 |
| | | |||||
| * | modified mapgen to generate less lava | Perttu Ahola | 2011-08-15 | 1 | -1/+1 |
| | | |||||
| * | Added #define WATER_ALPHA in content_mapnode.cpp | Perttu Ahola | 2011-08-15 | 1 | -3/+5 |
| | | |||||
| * | tuned lava/universal damage code | Perttu Ahola | 2011-08-15 | 3 | -7/+22 |
| | | |||||
| * | lava! | Perttu Ahola | 2011-08-15 | 10 | -89/+255 |
| | |