minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity
2,399 Commits 6 Branches 63 Tags 352 MiB
Commit Graph

168 Commits

Author SHA1 Message Date
Perttu Ahola 103173fc9b Add InvRef and InvStack (currently untested and unusable) 2012-01-02 01:49:38 +02:00
Perttu Ahola 2dc9a0c724 Fix player double damage 2011-12-02 11:16:51 +02:00
Perttu Ahola 08a10b8a6a Remove stuff made obsolete by making players more ActiveObject-like and raise protocol version number by one (because it is not compatible at all anymore) 2011-12-01 23:55:57 +02:00
Perttu Ahola ee0d3bacbc Player-is-SAO WIP 2011-12-01 18:23:58 +02:00
Perttu Ahola b6539399f4 Fix deadlock if MeshUpdateThread asks new textures while it is being stopped (happened if texture data was transferred slowly) 2011-12-01 02:41:52 +02:00
Kahrl d6b30dd3a5 CraftItem rework and Lua interface 2011-11-29 19:13:58 +02:00
Perttu Ahola 9d5b458479 Crafting definition in scripts 2011-11-29 19:13:48 +02:00
Perttu Ahola df8346ef4d Do not expose CONTENT_* stuff in content_mapnode.h and use a name converter wrapper in old code 2011-11-29 19:13:47 +02:00
Perttu Ahola c0f6395cf0 Node definition names 2011-11-29 19:13:46 +02:00
Perttu Ahola 26abf6fd82 Cut down content transfer verbosity 2011-11-29 19:13:45 +02:00
Perttu Ahola 7696a38543 Improve loading screen and protocol 2011-11-29 19:13:45 +02:00
Perttu Ahola 6da8cb00e2 Node definitions transfer 2011-11-29 19:13:44 +02:00
Perttu Ahola 01ae0daea5 Properly update textures in node definitions 2011-11-29 19:13:43 +02:00
Perttu Ahola 45fc45a49e Sending of textures WIP 2011-11-29 19:13:43 +02:00
Perttu Ahola 4b8e4dae58 Tool definition transfer to client 2011-11-29 19:13:42 +02:00
Perttu Ahola 1afed48a2c Make possible and do update textures in node definitions after late texture atlas making 2011-11-29 19:13:42 +02:00
Perttu Ahola c6fd2986d4 GameDef compiles 2011-11-29 19:13:42 +02:00
Perttu Ahola abceeee92f Create framework for getting rid of global definitions of node/tool/item/whatever types 2011-11-29 19:13:41 +02:00
Perttu Ahola 3b77a63d5d Allocate MapBlock::m_node_metadata on heap to allow less header bloat 2011-11-29 19:13:41 +02:00
Kahrl 1c98ec94da Make Connection::Receive return the data via a SharedBuffer reference, so the caller doesn't have to choose the right buffer size in advance. 
Conflicts:

	src/test.cpp
 2011-11-07 11:21:42 +02:00
Perttu Ahola 4b6138e69b Improve Connection with threading and some kind of congestion control 2011-10-20 23:04:09 +03:00
Perttu Ahola 3a06fb8831 Fix and tune block sending 2011-10-19 02:17:23 +03:00
Perttu Ahola 558a133044 Display RTT (round trip time, ping) on client status text 2011-10-17 17:18:50 +03:00
Perttu Ahola 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
Perttu Ahola 3f58028d31 Make dungeon masters though and make oerkkis disappear when they get to you (because hitting them doesn't work for some unknown reason) 2011-10-15 16:04:25 +03:00
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 9e46cbf7ea Header file tweaking; mainly for speed 2011-10-12 13:53:38 +03:00
Perttu Ahola 061d4b4202 Merge branch 'view_bobbing_and_vielded_tool' 2011-09-26 15:10:02 +03:00
Perttu Ahola 0ccc0ac927 Merge remote-tracking branch 'darkrose/master' 2011-09-26 11:57:28 +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
Kahrl 36bcbca9ac Added sprite extruder 2011-09-19 03:01:11 +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 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 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 371af9c241 Notify other players of wielded item change 2011-08-11 15:22:36 +02:00
Giuseppe Bilotta 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
Giuseppe Bilotta 91d1186cbb Keep track of player item 2011-08-11 15:22:36 +02:00
Giuseppe Bilotta 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
Nils Dagsson Moskopp 7ece67727d Merge remote-tracking branch 'origin/upstream' 2011-07-31 20:04:04 +02:00
Perttu Ahola e0b8e66540 Fixed problem of server always receiving an empty password from the client 2011-07-31 15:32:45 +03:00
Nils Dagsson Moskopp 96bee29e35 Merge branch 'upstream/master' 2011-07-30 19:47:55 +02:00
Perttu Ahola 24a662705c Added network protocol version number in protocol 2011-07-30 20:02:17 +03:00
Perttu Ahola 308d861327 Merged minetest-delta a624fe549bc75855a170 2011-07-21 20:55:08 +03:00
Nils Dagsson Moskopp 3560f0de08 Merge branch 'upstream/master' 
Conflicts:
	data/oerkki1.png
	src/client.cpp
 2011-07-14 22:43:28 +02:00
Perttu Ahola dd22ea051a map unloading is now a whole lot better 2011-06-27 00:27:17 +03:00
Perttu Ahola 3fccc67eb7 fixed block unloading from memory (a better fix coming next) 2011-06-26 21:53:11 +03:00
Sebastian Rühl 9d09103e48 Merge branch 'master' of https://github.com/erlehmann/minetest-delta.git into upstream_merge 
Conflicts:
	.gitignore
	CMakeLists.txt
	data/heart.png
	src/CMakeLists.txt
	src/game.cpp
	src/guiMainMenu.cpp
	src/inventory.cpp
	src/map.cpp
	src/mapblock.cpp
	src/mapnode.cpp
	src/mapnode.h
	src/materials.cpp
	src/server.cpp

Signed-off-by: Sebastian Rühl <bahamada_basti@yahoo.de>
 2011-06-26 12:24:32 +02:00
Perttu Ahola c1ceabef71 added and commented out some debug output 2011-06-26 03:14:52 +03:00
Perttu Ahola bb940a946d even more code refactoring 2011-06-26 02:34:36 +03:00
Perttu Ahola cb130d9158 cleaned map stuff 2011-06-26 00:03:58 +03:00
Perttu Ahola 7538b4c620 New map generator added (and SQLite, messed up the commits at that time...) (import from temporary git repo) 2011-06-25 04:25:14 +03:00
Perttu Ahola 02006a9540 Modified the mesh update thread's sleep time to speed it up (it was way too high) 2011-06-18 22:31:24 +03:00
Perttu Ahola 51cf464f74 Fixed the password crash on Windows 2011-06-02 00:01:11 +03:00
Perttu Ahola 63611932eb player passwords and privileges in world/auth.txt 
--HG--
extra : rebase_source : 7260636295d9068fbeeddf4143c89f2b8a91446c
 2011-05-29 21:11:16 +03:00
Ciaran Gultnieks a8a3271470 Added the ability to change your password (via pause menu) 
--HG--
extra : rebase_source : e8ec407f60711d42d33be4811b2880088f617b5b
 2011-05-22 21:09:12 +01:00
Perttu Ahola 0af5311538 Preliminary "active block" stuff + set up test code to grow grass. 2011-05-22 17:00:09 +03:00
Ciaran Gultnieks d4d49ee8f4 Passwords - password entry at main menu, stored and checked by server 2011-05-20 20:28:03 +01:00
Perttu Ahola 8c3b4fed10 Removed a single outdated comment in client.cpp 2011-05-09 16:39:37 +03:00
Perttu Ahola 1995b59320 Code refactoring; split half of main.cpp to game.cpp. 2011-04-23 18:31:31 +03:00
Perttu Ahola c638442e78 Some work-in-progress in hp and mobs and a frightening amount of random fixes. 2011-04-21 19:35:17 +03:00
Perttu Ahola 9d4e9c59de fixed warnings reported by cppcheck 2011-04-11 11:36:13 +03:00
Perttu Ahola fd7a0735c9 new object system 2011-04-10 04:15:10 +03:00
Perttu Ahola 4b54b291ae Some progress on transitioning from MapBlockObject to ActiveObject. 2011-04-08 00:47:14 +03:00
Perttu Ahola b5ace9a064 Made mesh update on node removal asynchronous on client, to reduce frametime spikes 2011-04-06 11:01:55 +03:00
Perttu Ahola e56d166337 Made mesh update on node addition asynchronous on client, to reduce frametime spikes 2011-04-06 10:28:39 +03:00
Perttu Ahola 4a92df6ff0 Chests work now! 2011-04-04 15:13:19 +03:00
Perttu Ahola fa736e138c fully implemented the sign with the new framework 2011-04-04 05:12:33 +03:00
Perttu Ahola fa08294d09 Node metadata framework 2011-04-04 03:45:08 +03:00
Perttu Ahola 2f466726e6 Made a proper queued thread to client for handling some block mesh updates. Also made client mutex-free to allow easier adding of new stuff. 2011-04-04 02:05:12 +03:00
Perttu Ahola e0f7bd4d57 Modified block mesh generation to have clearer input and output. Instead of being a messy object oriented cludge, it now is a messy cludge with separate parameters. 2011-04-03 19:50:54 +03:00
Perttu Ahola 01c2b003e1 commit before some more radical changes 2011-04-03 16:21:06 +03:00
Perttu Ahola e4f7f97e6c Removed lua stuff 2011-04-03 12:28:55 +03:00
Perttu Ahola 2990f5d90b commit before some radical changes 2011-04-02 13:44:06 +03:00
Perttu Ahola 2e7b15fed3 mapgen work-in-progress 2011-03-02 02:00:11 +02:00
Perttu Ahola c8be58a65c A third try on terrain generation. No trees yet. 2011-02-28 02:01:40 +02:00
Perttu Ahola 9f859d8389 modified the build system of lua to a more minimal one 2011-02-24 00:19:41 +02:00
Perttu Ahola 9778347c7f mainly work on object scripting api 2011-02-23 02:49:57 +02:00
Perttu Ahola 69dbc046eb preliminary lua scripting framework for objects 2011-02-21 16:10:36 +02:00
Perttu Ahola c57637b4c3 Temporary commit; lots of test code and stuff 2011-02-21 00:45:14 +02:00
Perttu Ahola 21372749f5 now it works nicely 2011-02-11 20:37:54 +02:00
Perttu Ahola dd9e82f5bc bug-fixin' 2011-02-08 01:12:55 +02:00
Perttu Ahola 9f882bf74d Reworked texture, material, mineral and whatever handling 2011-01-26 00:41:06 +02:00
Perttu Ahola de3fdba568 Tweaking around 2011-01-25 09:30:49 +02:00
Perttu Ahola c914cbb0a0 OMG! Main Menu! 2011-01-23 17:29:15 +02:00
Perttu Ahola 3fb0d2fb65 Players are left on server while server is running. No passwords yet. 2011-01-15 03:28:19 +02:00
Perttu Ahola ec509fac12 removed Client::isFetchingBlocks 2011-01-07 14:53:01 +02:00
Perttu Ahola bcd9813acc tuned expired mesh updating while drawing a bit 2010-12-29 18:14:14 +02:00
Perttu Ahola 6d4cd2ea1a A bit longer day and a bit shorter night. Client-side. 2010-12-29 15:26:47 +02:00
Perttu Ahola fa64103aa8 better debug output in segfaults and stack overflows in windows 2010-12-27 14:34:17 +02:00
Perttu Ahola 4ba5cd580d drawing range updater update and myrand() (but not usage of it) 2010-12-26 13:33:20 +02:00
Perttu Ahola 582af0cb21 new viewing range updater algorithm 2010-12-26 03:58:19 +02:00
Perttu Ahola a26c92d7dd disconnect method to connection to be used instead of just timing out 2010-12-24 17:08:50 +02:00
Perttu Ahola f15670379d base stuff for item->object conversion 2010-12-24 03:08:05 +02:00
Perttu Ahola 10b06419ab changes to handing of digging (non backwards-compatible i guess) 2010-12-23 22:35:53 +02:00
Perttu Ahola a55850e4dc fixed crack animation timing in client 2010-12-23 12:10:46 +02:00