Commit Graph

168 Commits

Author SHA1 Message Date
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
Perttu Ahola 3de176cc58 crafting system! 2010-12-22 16:30:23 +02:00
Perttu Ahola b94a007864 some work-in-progress 2010-12-22 03:33:58 +02:00
Perttu Ahola 3f5bad938a organizing stuff. 2010-12-21 18:08:24 +02:00
Perttu Ahola 3b0bff2f74 Cracking blocks while digging 2010-12-21 02:25:47 +02:00
Perttu Ahola 5a36956f75 working time-of-day sending from server to client 2010-12-20 14:04:31 +02:00
Perttu Ahola ab7477c4c3 added dedicated server build without irrlicht 2010-12-19 19:11:05 +02:00
Perttu Ahola 0ca9423b8b day/night working client side 2010-12-19 16:51:45 +02:00
Perttu Ahola 240499dc2c before daynight mesh cache 2010-12-18 17:46:00 +02:00
Perttu Ahola 15a43c5ed0 before adding day/night lighting
--HG--
rename : data/light.png => data/cloud.png
2010-12-18 13:10:37 +02:00
Perttu Ahola f501cfd799 tinkering around 2010-12-14 13:14:43 +02:00
Perttu Ahola 626ed6338a in before messing with face drawing orientation 2010-12-14 00:21:18 +02:00
Perttu Ahola 571fb14f94 working nicely 2010-12-13 03:19:12 +02:00
Perttu Ahola fc26dcdb19 license stuff
--HG--
rename : src/licensecomment.txt => licensecomment.txt
2010-11-29 20:13:04 +02:00
Perttu Ahola a18525a14e fixed face updating slowness bug 2010-11-29 14:03:40 +02:00
Perttu Ahola c18af6e728 - added map generating script
- dropped support for versions older than 2 because of lighting support
2010-11-29 12:16:17 +02:00
Perttu Ahola c707e00195 sitä sun tätä tekeillä, toimii kivasti 2010-11-29 10:52:07 +02:00
Perttu Ahola 24c4b7c68d Working version before block send priorization update 2010-11-27 17:18:34 +02:00
Perttu Ahola 4e249fb3fb Initial files 2010-11-27 01:02:21 +02:00