Perttu Ahola
74febd5c31
Handle death and respawn better
2011-10-15 14:46:59 +03:00
Perttu Ahola
5341bf59c2
Improve mobv2
2011-10-15 12:17:21 +03:00
Perttu Ahola
43a28f04fa
mobv2
2011-10-15 02:28:57 +03:00
Perttu Ahola
080002f8ed
Lock mutex when accessing m_env in Server::~Server
2011-10-14 12:39:25 +03:00
Perttu Ahola
853a78681e
In CMake scripts: New version number, fix MSVC stuff
2011-10-14 09:55:39 +03:00
Perttu Ahola
9e46cbf7ea
Header file tweaking; mainly for speed
2011-10-12 13:53:38 +03:00
Perttu Ahola
b60b58b627
Saner block modification flag operation for not saving everything always
2011-10-12 10:53:37 +03:00
Perttu Ahola
a7833cca22
Merge remote-tracking branch 'marktraceur/master'
2011-09-26 22:41:06 +03:00
Perttu Ahola
9a7471b740
Rotate wielded tool the right way and modify axe graphics accordingly
2011-09-26 16:10:54 +03:00
Perttu Ahola
061d4b4202
Merge branch 'view_bobbing_and_vielded_tool'
2011-09-26 15:10:02 +03:00
Perttu Ahola
2ecd53ce09
Fix single-frame lag in camera yaw/pitch, tune view bobbing and add wielded tool movement when walking and tweak stuff a bit
2011-09-26 15:09:04 +03:00
Perttu Ahola
b9e680d06c
Server user limit configuration option
2011-09-26 11:57:51 +03:00
Perttu Ahola
0ccc0ac927
Merge remote-tracking branch 'darkrose/master'
2011-09-26 11:57:28 +03:00
Joshua Beck
ae561d705f
Fixed null pointer dereference errors found by cppcheck
2011-09-24 02:11:43 -05:00
Mark Holmquist
bc01ae4cbd
Fixed merge issues with saplings, ready to pull now!
2011-09-23 18:19:47 -07:00
Mark Holmquist
319f43e6d2
Fixed saplings growing into trees (thanks so much, Kahrl!)
...
Put the random interval back to 1 in 50 chance. It's not as rare as rats, but rarer than grass.
2011-09-23 18:14:35 -07:00
Mark Holmquist
85f119e1e6
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.
2011-09-23 18:13:53 -07:00
darkrose
8b875d71d1
remove content_* things from map.cpp
2011-09-23 18:04:48 +10:00
Perttu Ahola
789c88509c
Move PLATFORM_LIBS around to make sqlite3 link with libdl on some distros
2011-09-23 08:48:58 +03:00
Perttu Ahola
bdf54908aa
Make client report a newer version number to the server than 2011-07-31 does and make the server enforce it
2011-09-22 20:47:47 +03:00
darkrose
582e450bad
added locking chests - clean patch
2011-09-22 19:11:48 +10:00
Perttu Ahola
ae6d83a41e
Better apple tree generation
2011-09-21 23:31:55 +03:00
Kahrl
3e012122d1
Simplistic wielded tool lighting, added setMeshVerticesColor to utility.h and refactored some other code into calls of that
2011-09-21 18:37:29 +02:00
Kahrl
a4a2c34831
reduce view bobbing slightly
2011-09-21 15:54:06 +02:00
Kahrl
36af9bb027
Create a separate scene manager for the wielded tool. This fixes the glitchyness in large map coordinates and some depth buffer problems. (The tool doesn't bob anymore when walking, this will be fixed later.) Fix MSVC build (thanks to dannydark).
2011-09-21 01:42:52 +02:00
Kahrl
6599002149
fix a numerical problem, but tool is still jittery
2011-09-20 18:25:29 +02:00
Kahrl
cbd2bcf102
Fix jittery view bobbing at large map coordinates again. Wielded tool still has problems there
2011-09-20 18:19:26 +02:00
Kahrl
01f3ae1c50
Digging animation
2011-09-20 11:06:16 +02:00
Kahrl
eaff4616ad
fix some normals
2011-09-19 17:11:53 +02:00
Kahrl
ab42549b1e
Wielded tool updates, leaves and glass work now
2011-09-19 17:08:42 +02:00
Kahrl
02726f0003
Convert any inventory item into a mesh, bring back InventoryItem::getImageRay(), some const-correctness fixes
2011-09-19 06:37:24 +02:00
Kahrl
36bcbca9ac
Added sprite extruder
2011-09-19 03:01:11 +02:00
Kahrl
4ed837bcfa
trying some view bobbing changes
2011-09-18 17:02:30 +02:00
Kahrl
54f3796f91
Oops, up vector is needed.
2011-09-18 02:24:43 +02:00
Kahrl
ae66d611f2
This looks more like MC view bobbing, but still not even close
2011-09-18 02:17:39 +02:00
Perttu Ahola
b22cb69a15
Merge remote-tracking branch 'sfan5/apple-trees'
2011-09-16 19:09:13 +03:00
Kahrl
40707e3c5b
SQLite needs to be linked with -ldl on some Linux distros.
2011-09-16 19:06:45 +03:00
Kahrl
acfb2bb8bc
Revert some changes that could lead to slower map transfer and increaed network load.
2011-09-16 18:03:58 +02:00
Kahrl
63266928a5
Made wielded tool move slightly (and smoothly) during view bobbing. Making the tool be a child node of an empty scene node instead of the camera scene node seemingly fixed the uncontrollable tool jitter, too.
2011-09-15 01:53:42 +02:00
Kahrl
fc92da4324
View bobbing is slower in the water.
2011-09-15 01:53:42 +02:00
sfan5
88dc8c694e
Added Iron Apple which heals 4 Hearts
2011-09-12 20:10:17 +02:00
sfan5
785a2fd23a
Changed the Heal Amount of Apples from 6 to 2
2011-09-12 19:44:26 +02:00
sfan5
4328a6442b
Fixed duplication bug
2011-09-11 19:17:14 +02:00
sfan5
6496b1cf1f
Removed Spaces
2011-09-11 18:16:07 +02:00
sfan5
c0caedc373
Added Apple Trees
2011-09-11 17:50:44 +02:00
Kahrl
524cf237b8
inventory displays tool breakage bar again
2011-09-08 17:45:39 +02:00
Kahrl
e4cb004460
trying something else... also replaced M_PI by PI everywhere
2011-09-08 16:10:44 +02:00
Kahrl
71418639d3
attempting to merge Queatz/the-wielded-tool and kahrl/viewbobbing, something doesn't work right yet
2011-09-08 14:21:56 +02:00
Kahrl
f2ec226521
minor view bobbing improvements
2011-09-08 13:34:28 +02:00
Kahrl
0931d4b7ff
make it slightly less annoying :o)
2011-09-08 13:14:59 +02:00
Kahrl
ccadebabba
Implemented view bobbing (testing simple lemniscate shape)
2011-09-08 13:03:55 +02:00
Kahrl
18771a39cf
Commented out debug statements again
2011-09-08 01:24:47 +02:00
Kahrl
baf7da9d4a
Collected and moved existing camera infrastructure from game.cpp to camera.cpp and camera.h. Introduced configuration settings 'fov' which chooses the camera's (vertical) field of view and 'view_bobbing' which currently does nothing. Other code refactored to not expect the FOV to be a build time constant.
2011-09-08 01:08:47 +02:00
Kahrl
c0b35fa429
Removed unused camera_position and camera_direction fields from Client. Moved ClientEnvironment::drawPostFx to ClientMap::renderPostFx -- this will make the camera management classes easier to write, as ClientMap already knows the camera position but ClientEnvironment doesn't and has to be told about it. This also eliminates the need for Client::getEnv(). Made the post effect color a content feature defined in content_mapnode.h.
2011-09-07 19:21:28 +02:00
JacobF
f31b0a3361
Display which tool the player is holding
...
And some simple animation when trying to dig...
2011-09-07 10:56:04 -04:00
Perttu Ahola
d28ea57083
Note about texture atlas
2011-09-07 01:27:04 +03:00
Perttu Ahola
8e26c5c066
Add note about trans_table_19.
2011-09-07 01:19:48 +03:00
Perttu Ahola
5c1074aa7d
Remove block file from disk when saved to database
2011-09-06 20:28:45 +03:00
JacobF
bd72091150
Pause in unloaded territory instead of collide
2011-09-06 20:07:43 +03:00
Perttu Ahola
faf3d7902a
Make Connection::Send cancel silently if peer doesn't exist.
2011-09-06 19:39:23 +03:00
Perttu Ahola
3c30ab2807
Speed up periodical map unloading by moving beginSave() and endSave() to outer loop in Map::timerUpdate()
2011-09-06 19:16:36 +03:00
Perttu Ahola
310fa10035
Merge remote-tracking branch 'queatz/sqlite-map'
2011-09-06 18:04:02 +03:00
Perttu Ahola
bc847e8cc2
Fix bug in posix file/directory removal wrapper, as pointed out by kahrl
2011-09-06 17:52:03 +03:00
Perttu Ahola
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
Kahrl
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
JacobF
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
JacobF
d670c831c2
These numbers were well exceeding 2^32...
2011-09-04 17:01:28 -04:00
JacobF
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
JacobF
2d872ce3fa
Furnace was crashing stuff again
2011-09-02 17:33:06 -04:00
JacobF
e3c58eff1c
Merge branch 'master' of /media/Field/Software/minetest-queatz/minetest-sqlite/.. into sqlite-map
2011-09-02 16:59:17 -04:00
JacobF
99de37ff94
Update to SQLite 3.7.7.1
2011-09-01 18:27:30 -04:00
JacobF
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
JacobF
6415528f96
If there was no source item in a furnace it would cause a segmentation fault.
2011-08-30 11:38:53 -04:00
Perttu Ahola
4af1f2963c
Merge remote-tracking branch 'kahrl/dissector'
2011-08-30 14:24:33 +03:00
Perttu Ahola
ba0322f353
Merge remote-tracking branch 'queatz/mmb10'
2011-08-30 14:24:23 +03:00
Perttu Ahola
1a705523c0
Merge remote-tracking branch 'queatz/furnace-is-not-blackhole'
2011-08-30 14:24:12 +03:00
Perttu Ahola
87b9e5467d
Merge remote-tracking branch 'queatz/furnace-is-not-out-nor-can-rat-escape'
2011-08-30 14:24:07 +03:00
Perttu Ahola
625dac8d8c
Merge remote-tracking branch 'queatz/privs'
2011-08-30 14:23:44 +03:00
JacobF
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
Kahrl
3edf2bb417
dissector branch: fix description of TOCLIENT_PLAYERITEM in clientserver.h
2011-08-25 21:31:28 +02:00
JacobF
e278742c5e
Middle mouse click will move 10 items around at a time.
2011-08-25 12:43:19 -04:00
JacobF
ef08163c38
Don't remove furnace if something is inside it.
2011-08-24 18:53:06 -04:00
JacobF
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
JacobF
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
Perttu Ahola
efd8dabd91
Lava is now better visible inside water. (a crappy hack)
2011-08-23 03:01:01 +03:00
Perttu Ahola
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
Perttu Ahola
d4df20a913
if creative mode and player has no build privileges, cannot drop items.
2011-08-22 22:55:17 +03:00
Perttu Ahola
db495668ae
Fixed water mesh generation acting weird next to sand
2011-08-22 22:44:43 +03:00
Perttu Ahola
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
Perttu Ahola
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
Giuseppe Bilotta
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
Perttu Ahola
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
Perttu Ahola
5415256a52
Merge remote-tracking branch 'oblomov/me_cmd'
2011-08-22 14:46:54 +03:00
Perttu Ahola
836e43db60
Merge remote-tracking branch 'oblomov/new_input'
2011-08-22 14:46:52 +03:00
Giuseppe Bilotta
9c94538fb7
Change way commands are displayed in chat window
2011-08-22 13:43:53 +02:00
Giuseppe Bilotta
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
Giuseppe Bilotta
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
Giuseppe Bilotta
0488bf54d3
/me command
2011-08-22 13:02:08 +02:00
Giuseppe Bilotta
da19aee307
Server now supports replies without prefix
2011-08-22 13:02:08 +02:00
Giuseppe Bilotta
d2c0b4905a
Defines for server command context flags
2011-08-22 13:02:08 +02:00