310fa10035
Merge remote-tracking branch 'queatz/sqlite-map'
2011-09-06 18:04:02 +03:00
bc847e8cc2
Fix bug in posix file/directory removal wrapper, as pointed out by kahrl
2011-09-06 17:52:03 +03:00
b82952bdba
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)
2011-09-06 17:13:24 +03:00
570a8dbf22
allow specifying a fixed seed in the config file for generating the map (fixed_map_seed)
2011-09-06 17:05:17 +03:00
c68ea19e8d
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
2011-09-06 16:36:11 +03:00
d670c831c2
These numbers were well exceeding 2^32...
2011-09-04 17:01:28 -04:00
d1a16f24cf
Initial sqlite3 maps.
...
* The map will reside in world/map.sqlite
* It will load from the sectors folder but will not save there
2011-09-02 19:07:14 -04:00
2d872ce3fa
Furnace was crashing stuff again
2011-09-02 17:33:06 -04:00
e3c58eff1c
Merge branch 'master' of /media/Field/Software/minetest-queatz/minetest-sqlite/.. into sqlite-map
2011-09-02 16:59:17 -04:00
99de37ff94
Update to SQLite 3.7.7.1
2011-09-01 18:27:30 -04:00
5e3b9e3578
* 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.
2011-09-01 15:39:15 -04:00
6415528f96
If there was no source item in a furnace it would cause a segmentation fault.
2011-08-30 11:38:53 -04:00
4af1f2963c
Merge remote-tracking branch 'kahrl/dissector'
2011-08-30 14:24:33 +03:00
ba0322f353
Merge remote-tracking branch 'queatz/mmb10'
2011-08-30 14:24:23 +03:00
1a705523c0
Merge remote-tracking branch 'queatz/furnace-is-not-blackhole'
2011-08-30 14:24:12 +03:00
87b9e5467d
Merge remote-tracking branch 'queatz/furnace-is-not-out-nor-can-rat-escape'
2011-08-30 14:24:07 +03:00
625dac8d8c
Merge remote-tracking branch 'queatz/privs'
2011-08-30 14:23:44 +03:00
134e49cc8e
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
2011-08-25 19:27:50 -04:00
3edf2bb417
dissector branch: fix description of TOCLIENT_PLAYERITEM in clientserver.h
2011-08-25 21:31:28 +02:00
e278742c5e
Middle mouse click will move 10 items around at a time.
2011-08-25 12:43:19 -04:00
ef08163c38
Don't remove furnace if something is inside it.
2011-08-24 18:53:06 -04:00
2e82268a67
If a user doesn't have build rights, don't allow them to move items to and from their inventory
2011-08-23 22:08:09 -04:00
00bdfad5f6
The password box in the mainmenu is focused if there is already a name and address filled in
2011-08-23 22:06:35 -04:00
efd8dabd91
Lava is now better visible inside water. (a crappy hack)
2011-08-23 03:01:01 +03:00
e4f443a57a
Inventory transparency; very loosely based on sapier's commits.
...
Also contains some commented-out code for testing out different looks
in the future.
2011-08-23 00:33:38 +03:00
d4df20a913
if creative mode and player has no build privileges, cannot drop items.
2011-08-22 22:55:17 +03:00
db495668ae
Fixed water mesh generation acting weird next to sand
2011-08-22 22:44:43 +03:00
996c653490
Fix byte count in serialization of "F1000"
...
Some access violations and segfaults and strange behaviour might have
been caused by this.
2011-08-22 22:17:26 +03:00
4acad897cf
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
2011-08-22 22:04:46 +03:00
b37fffc2c5
Hopefully fix 'dangling water'
...
If a block has (at least visible) liquids, the block below should also
be flowed in.
2011-08-22 21:45:13 +03:00
a99450ab72
Possibly fixed the extremely rare PeerNotFound loop bug.
...
See explanation in http://2pktfkt.de/irc/minetest-delta/2011-08-22.html
2011-08-22 21:27:11 +03:00
5415256a52
Merge remote-tracking branch 'oblomov/me_cmd'
2011-08-22 14:46:54 +03:00
836e43db60
Merge remote-tracking branch 'oblomov/new_input'
2011-08-22 14:46:52 +03:00
9c94538fb7
Change way commands are displayed in chat window
2011-08-22 13:43:53 +02:00
53eedd3ba4
Introduce hotkey for calling up a command window
...
This is just a chat window with the / text pre-loaded.
2011-08-22 13:02:08 +02:00
42134bb49e
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.
2011-08-22 13:02:08 +02:00
0488bf54d3
/me command
2011-08-22 13:02:08 +02:00
da19aee307
Server now supports replies without prefix
2011-08-22 13:02:08 +02:00
d2c0b4905a
Defines for server command context flags
2011-08-22 13:02:08 +02:00
153f07fdfb
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.
2011-08-22 13:02:08 +02:00
7e610aece5
Overhaul the input system
...
This allows us to map the keys which are not considered in
irrlicht's EKEY_CODE system, such as \, [, /, ] etc.
2011-08-22 13:01:11 +02:00
16aedc0ef6
Fix typos in key names
2011-08-22 12:52:15 +02:00
6596e585fe
Flowing lava updates lighting
2011-08-22 13:19:07 +03:00
f98eda4d52
Merge remote-tracking branch 'oblomov/liquid_fixes'
2011-08-22 12:53:18 +03:00
23717510c2
Merge branch 'lava'
2011-08-22 12:53:02 +03:00
c51564ab5b
Optimize for viscosity 1
2011-08-16 20:38:44 +02:00
1eb14c7743
Viscous fluids
2011-08-16 20:37:46 +02:00
56e9f97294
Make sure all neighbors of changed fluids are activated
...
This should fix the remaining cases of fluid not advancing or not
retreating.
2011-08-16 18:05:28 +02:00
774faf4e85
Let the liquids flow in the open
...
No need to curb their spread artificially.
2011-08-16 17:42:28 +02:00
d0711821f3
Ensure air neighbors to liquids that can flow are enqueued for transformation
2011-08-16 17:42:14 +02:00
7024b45197
Ensure param2 is set correctly in transformLiquids
2011-08-16 16:50:38 +02:00
5fce673a56
Use defines for liquid levels
2011-08-16 16:50:38 +02:00
29c9d3d5f4
Implemented MEET_OTHER
2011-08-16 12:23:19 +03:00
708f1c336e
transformLiquid: small optimization and whitespace cleanup
2011-08-16 06:42:11 +02:00
dc4ac0b96f
small fix to transformLiquids
2011-08-15 18:49:44 +03:00
296748d32e
Fixed liquid mesh generation
2011-08-15 17:45:35 +03:00
ad408f269c
Add lava to creative inventory (hmm, we're shortly running out of creative inventory space)
2011-08-15 16:57:57 +03:00
e57754868f
Hopefully fixed msvc "'sqrt' : ambiguous call to overloaded function"
2011-08-15 15:11:00 +03:00
0c7e7f4998
Non-vertex-alpha texture material for lava
2011-08-15 12:08:41 +03:00
4b85608e30
modified mapgen to generate less lava
2011-08-15 11:56:16 +03:00
8ab77f4153
Added #define WATER_ALPHA in content_mapnode.cpp
2011-08-15 11:51:33 +03:00
472585a7e8
tuned lava/universal damage code
2011-08-15 11:49:39 +03:00
8f42a8be0c
lava!
2011-08-15 02:04:56 +03:00
c4b707bca2
Windows.h -> windows.h for cross-mingw build
2011-08-14 21:26:07 +03:00
9e35fe8c37
Merge remote-tracking branch 'speedprog/fixedNotFindingData'
2011-08-13 14:05:01 +03:00
385904d75a
Let Settings accept a const char* directly
2011-08-13 07:33:43 +02:00
b1e0b7728b
Fix keycode_to_keyname return value
2011-08-13 07:31:46 +02:00
eb255e6870
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.
2011-08-12 23:42:00 +02:00
72e4c8f523
Fix use of && instead of &
2011-08-12 23:34:12 +02:00
835d2e4b5f
Removed assert if creating texture atlas image fails; cancel creating image instead.
2011-08-12 17:17:47 +03:00
94b42a79d7
fixed not finding data dir if installed
2011-08-12 14:26:37 +02:00
e40da2341c
Fixed/extended/modified ban stuff to be good for inclusion
2011-08-12 13:11:27 +03:00
7aa72c56b6
Merge remote-tracking branch 'speedprog/banByIp'
2011-08-12 11:55:51 +03:00
5784c14ab7
added ipban support
...
commands:
/#ipban <nick>
/#ipunban <ip>
2011-08-12 03:37:18 +02:00
dfdc817db3
Typo fix
2011-08-11 19:45:44 +02:00
371af9c241
Notify other players of wielded item change
2011-08-11 15:22:36 +02:00
88a9bae160
constify inventory item serialization
2011-08-11 15:22:36 +02:00
ecd5c5f920
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.
2011-08-11 15:22:36 +02:00
91d1186cbb
Keep track of player item
2011-08-11 15:22:36 +02:00
467b3cf4c1
Some inventory const-ification
2011-08-11 15:22:35 +02:00
c007d8219e
Server should use the same eye position as the client
2011-08-11 15:22:35 +02:00
b318e82356
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.
2011-08-11 15:22:35 +02:00
98fa00db12
Introduce Player::getLightPosition
...
This is currently only used in the lighting update for remote
players in client.
2011-08-11 15:22:35 +02:00
69fca4f3cb
Merged some FreeBSD fixes
2011-08-11 12:32:36 +03:00
f6ed45fc20
Proper placement of binary files.
2011-08-11 11:19:33 +02:00
43b6ca0d14
Prevent threadid_t from losing precision when casted on 64bit systems
2011-08-11 10:52:27 +02:00
34492ce480
Respect base virtual functions' signatures
2011-08-08 16:15:53 +02:00
163c38e175
Always return from non-void functions
...
This quiets a warning in Clang.
2011-08-08 16:13:48 +02:00
11be390110
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
2011-08-08 16:12:15 +02:00
ea26a9f543
Remove spurious assignment
2011-08-08 16:11:37 +02:00
f9e1b0cd97
InventoryAction is a struct, not a class
2011-08-08 15:38:20 +02:00
805564dcf2
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.
2011-08-11 10:08:58 +02:00
76fb792544
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.
2011-08-11 10:06:48 +02:00
ff35014eff
Fix data paths for FreeBSD
2011-08-02 02:50:16 +04:00
de868d24c1
Fix "integer constant is too large for 'long' type" error
2011-08-02 02:49:15 +04:00
318a730c45
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.
2011-08-01 22:17:32 +04:00
9017c51e7f
the zlib error print function now prints to dstream (debug.txt)
2011-08-08 12:11:41 +03:00
64a6da3e45
merged delta and c55
2011-08-05 11:22:13 +03:00
59c58f230e
Some obvious errors in the new fluid flow management
2011-08-05 08:45:15 +02:00
f79069f5b3
MapNode is a struct, not a class
2011-08-05 08:45:15 +02:00
Perttu Ahola
Kahrl
JacobF
Giuseppe Bilotta
Constantin Wenger
q66
Dmitry Marakasov