aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update to SQLite 3.7.7.1JacobF2011-09-012-2600/+5315
|
* Merge remote-tracking branch 'kahrl/dissector'Perttu Ahola2011-08-303-4/+1293
|\
| * dissector branch: fix for doc/protocol.txt: CONTROLTYPE_DISCO is 3Kahrl2011-08-251-2/+2
| |
| * dissector branch: fix description of TOCLIENT_PLAYERITEM in clientserver.hKahrl2011-08-251-2/+6
| |
| * dissector branch: added wireshark dissector minetest.luaKahrl2011-08-251-0/+1285
| |
* | Merge remote-tracking branch 'queatz/mmb10'Perttu Ahola2011-08-301-5/+12
|\ \
| * | Middle mouse click will move 10 items around at a time.JacobF2011-08-251-5/+12
| |/
* | Merge remote-tracking branch 'queatz/furnace-is-not-blackhole'Perttu Ahola2011-08-302-0/+19
|\ \
| * | Don't remove furnace if something is inside it.JacobF2011-08-242-0/+19
| |/
* | Merge remote-tracking branch 'queatz/furnace-is-not-out-nor-can-rat-escape'Perttu Ahola2011-08-304-13/+55
|\ \
| * | Merged 2 branches because they relied on each other.JacobF2011-08-254-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 Ahola2011-08-301-0/+3
|\ \
| * | If a user doesn't have build rights, don't allow them to move items to and ↵JacobF2011-08-231-0/+3
| |/ | | | | | | from their inventory
* / The password box in the mainmenu is focused if there is already a name and ↵JacobF2011-08-231-1/+3
|/ | | | address filled in
* Lava is now better visible inside water. (a crappy hack)Perttu Ahola2011-08-233-12/+20
|
* Inventory transparency; very loosely based on sapier's commits.Perttu Ahola2011-08-232-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 Ahola2011-08-221-0/+12
|
* Fixed water mesh generation acting weird next to sandPerttu Ahola2011-08-221-2/+2
|
* Fix byte count in serialization of "F1000"Perttu Ahola2011-08-221-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 elsewherePerttu Ahola2011-08-223-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 Bilotta2011-08-221-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 Ahola2011-08-221-14/+14
| | | | See explanation in http://2pktfkt.de/irc/minetest-delta/2011-08-22.html
* Update README.txtPerttu Ahola2011-08-221-4/+6
|
* Merge remote-tracking branch 'oblomov/me_cmd'Perttu Ahola2011-08-229-23/+86
|\
| * Change way commands are displayed in chat windowGiuseppe Bilotta2011-08-221-0/+6
| |
| * Introduce hotkey for calling up a command windowGiuseppe Bilotta2011-08-224-0/+42
| | | | | | | | This is just a chat window with the / text pre-loaded.
| * Send KEY_END when (re)creating a text inputGiuseppe Bilotta2011-08-221-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 commandGiuseppe Bilotta2011-08-221-0/+12
| |
| * Server now supports replies without prefixGiuseppe Bilotta2011-08-222-4/+9
| |
| * Defines for server command context flagsGiuseppe Bilotta2011-08-223-5/+7
| |
| * Remove distinction between /# and / commandsGiuseppe Bilotta2011-08-222-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 Ahola2011-08-228-176/+329
|\|
| * Overhaul the input systemGiuseppe Bilotta2011-08-228-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 namesGiuseppe Bilotta2011-08-221-2/+2
| |
* | Flowing lava updates lightingPerttu Ahola2011-08-221-1/+9
| |
* | Merge remote-tracking branch 'oblomov/liquid_fixes'Perttu Ahola2011-08-223-57/+70
|\ \
| * | Optimize for viscosity 1Giuseppe Bilotta2011-08-161-2/+2
| | |
| * | Viscous fluidsGiuseppe Bilotta2011-08-163-6/+41
| | |
| * | Make sure all neighbors of changed fluids are activatedGiuseppe Bilotta2011-08-161-13/+1
| | | | | | | | | | | | | | | This should fix the remaining cases of fluid not advancing or not retreating.
| * | Let the liquids flow in the openGiuseppe Bilotta2011-08-161-13/+0
| | | | | | | | | | | | No need to curb their spread artificially.
| * | Ensure air neighbors to liquids that can flow are enqueued for transformationGiuseppe Bilotta2011-08-161-1/+7
| | |
| * | Ensure param2 is set correctly in transformLiquidsGiuseppe Bilotta2011-08-161-4/+4
| | |
| * | Use defines for liquid levelsGiuseppe Bilotta2011-08-162-4/+8
| | |
| * | transformLiquid: small optimization and whitespace cleanupGiuseppe Bilotta2011-08-161-18/+11
| | |
* | | Merge branch 'lava'Perttu Ahola2011-08-2213-99/+296
|\| | | |/ |/|
| * small fix to transformLiquidsPerttu Ahola2011-08-151-6/+5
| |
| * Fixed liquid mesh generationPerttu Ahola2011-08-151-9/+23
| |
| * Add lava to creative inventory (hmm, we're shortly running out of creative ↵Perttu Ahola2011-08-151-0/+1
| | | | | | | | inventory space)
| * Hopefully fixed msvc "'sqrt' : ambiguous call to overloaded function"Perttu Ahola2011-08-151-1/+1
| |
| * Non-vertex-alpha texture material for lavaPerttu Ahola2011-08-151-2/+2
| |