cc66191422
Merge branch 'master' of https://github.com/placki/minetest-jachoo
...
Conflicts:
src/game.cpp
src/player.h
src/server.h
2011-11-10 20:33:41 +01:00
adbd11e4ed
Borderstones always have valid owners.
...
(but what happens when clan is removed?!)
2011-11-02 17:51:36 +01:00
dcf0ddf4c2
+comments for teleport
2011-11-02 13:36:19 +01:00
b8c0827434
Merge from celeron, many new features and bugs fixed
2011-10-30 16:45:00 +01:00
f0e9065426
build on borders option
2011-10-29 01:09:54 +02:00
d264de084c
crafted_teleports, teleport pairs/loops, working "0,0,0"
2011-10-29 00:14:40 +02:00
73360b86cd
"die" server command added
2011-10-27 23:17:44 +02:00
ba858f17a0
fix and message for building on edge of clan territory
2011-10-27 23:10:43 +02:00
0d367550bc
Merge branch 'master' of git://github.com/celeron55/minetest
...
Also: Some changes, bigger teleports
2011-10-26 23:20:14 +02:00
4b6138e69b
Improve Connection with threading and some kind of congestion control
2011-10-20 23:04:09 +03:00
3a06fb8831
Fix and tune block sending
2011-10-19 02:17:23 +03:00
78f4142f4f
Add /clearobjects
2011-10-18 00:01:50 +03:00
d828688383
Merge branch 'master' of git://github.com/celeron55/minetest
...
Conflicts:
src/client.cpp
src/clientserver.h
src/content_mapnode.cpp
src/content_mapnode.h
src/game.cpp
src/map.cpp
src/player.cpp
src/server.cpp
2011-10-16 22:59:11 +02:00
2419d0029a
Some more profiler stuff to get the hang on what really uses CPU
2011-10-16 22:39:35 +03:00
b8f2dcea4d
Improve debug profiler usage for investigating CPU usage of server
2011-10-16 21:16:44 +03:00
07d000cc54
When granting or revoking privileges, notify the target player too
2011-10-16 20:03:43 +03:00
143dce6672
When player times out, log the action as a timeout rather than regular quitting
2011-10-16 19:38:56 +03:00
96b2d1fd29
Check NULL pointer properly in some new code trying to log new stuff
2011-10-16 18:50:30 +03:00
0bf533f753
Switch more stuff to use the logging thing and fix segfault on player leave from server as introduced in a previous switch-to-logging commit
2011-10-16 16:28:12 +03:00
b65a5aceb0
Use the logger; also, default to not showing much crap in console. Use --info-on-stderr to enable crap.
2011-10-16 14:57:53 +03:00
875abb76db
Fixed: Linux compilation error
2011-10-16 11:57:14 +02:00
72251ff000
Clans privs
...
Deleting clans
New teleport icon
2011-10-16 00:12:37 +02:00
94dfececf6
strict_protocol_version_checking setting; PROTOCOL_VERSION in clientserver.h; clean up defaultsettings.cpp and minetest.conf.example
2011-10-15 15:02:28 +03:00
74febd5c31
Handle death and respawn better
2011-10-15 14:46:59 +03:00
5341bf59c2
Improve mobv2
2011-10-15 12:17:21 +03:00
43a28f04fa
mobv2
2011-10-15 02:28:57 +03:00
080002f8ed
Lock mutex when accessing m_env in Server::~Server
2011-10-14 12:39:25 +03:00
9e46cbf7ea
Header file tweaking; mainly for speed
2011-10-12 13:53:38 +03:00
b60b58b627
Saner block modification flag operation for not saving everything always
2011-10-12 10:53:37 +03:00
0c5485108b
Groups renamed to Clans.
...
Merge branch 'master' of git://github.com/celeron55/minetest
2011-09-30 22:14:12 +02:00
a7833cca22
Merge remote-tracking branch 'marktraceur/master'
2011-09-26 22:41:06 +03:00
061d4b4202
Merge branch 'view_bobbing_and_vielded_tool'
2011-09-26 15:10:02 +03:00
b9e680d06c
Server user limit configuration option
2011-09-26 11:57:51 +03:00
0ccc0ac927
Merge remote-tracking branch 'darkrose/master'
2011-09-26 11:57:28 +03:00
ae561d705f
Fixed null pointer dereference errors found by cppcheck
2011-09-24 02:11:43 -05:00
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
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
582e450bad
added locking chests - clean patch
2011-09-22 19:11:48 +10:00
2945239b58
Teleport
2011-09-20 02:07:48 +02:00
2d72c4b0cf
added BorderStone block
2011-09-19 19:10:24 +02:00
acfb2bb8bc
Revert some changes that could lead to slower map transfer and increaed network load.
2011-09-16 18:03:58 +02:00
d4dff7f8e4
Groups - everything should work now
2011-09-15 19:17:50 +02:00
e4cb004460
trying something else... also replaced M_PI by PI everywhere
2011-09-08 16:10:44 +02:00
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
87b9e5467d
Merge remote-tracking branch 'queatz/furnace-is-not-out-nor-can-rat-escape'
2011-08-30 14:24:07 +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
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
d4df20a913
if creative mode and player has no build privileges, cannot drop items.
2011-08-22 22:55:17 +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
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
jachoo
placki
Perttu Ahola
Joshua Beck
Mark Holmquist
darkrose
Kahrl
JacobF