Wuzzy
/
BlockColor-Engine
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity
635 Commits 1 Branch 1 Tag 115 MiB
Commit Graph

60 Commits

Author SHA1 Message Date
Nils Dagsson Moskopp 5086bd5664 * fix automerge regression 2011-07-15 20:16:02 +02: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 7b290660ea made screen go slightly blue when underwater 2011-07-01 21:25:31 +03:00
Perttu Ahola 71f5d4b344 Fixed objects being sometimes not able to be stored statically in a block when block has been unloaded 2011-07-01 21:04:40 +03: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
Perttu Ahola 91cfbe2891 reorganized a lot of stuff and modified mapgen and objects slightly while doing it 2011-06-26 15:48:56 +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 bb940a946d even more code refactoring 2011-06-26 02:34:36 +03:00
Perttu Ahola aed9e809a1 mapgen stuff 2011-06-25 16:32:09 +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 dc5319b6c9 Moved some mapnode content stuff from mapnode.{h,cpp} and digging property stuff from material.cpp to content_mapnode.{h,cpp} 2011-06-17 22:20:15 +03:00
Perttu Ahola 9b565b6bc4 tried to reduce unnecessary map saving disk i/o a bit 2011-06-05 18:57:36 +03:00
Perttu Ahola bbead93c1a Reduced server CPU usage on NodeMetadata step()s. Also furnace now cooks while no players are near it. 2011-05-31 20:02:55 +03:00
Perttu Ahola b3d242ae38 tuned grass growth rate 
--HG--
extra : rebase_source : 8ad4d13fc7ab1088ebd18cf968d912949aab8eae
 2011-05-29 21:16:15 +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
Perttu Ahola 4a6b9a6ac1 Some work-in-progress stuff and many comment updates 2011-05-22 23:55:02 +03:00
Perttu Ahola 0af5311538 Preliminary "active block" stuff + set up test code to grow grass. 2011-05-22 17:00:09 +03:00
Perttu Ahola af7d50e910 Fixed a small memory leak in ServerEnvironment and cleaned the code a bit 2011-05-21 14:28:58 +03:00
Perttu Ahola 9c72d44fe7 random comment updates 2011-04-30 02:12:32 +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 bb39795ab2 fixed the object update interval thingy 2011-04-10 23:29:36 +03:00
Perttu Ahola 9d5ccafbb0 changed server to do object management at longer intervals (0.5s) 2011-04-10 23:14:41 +03:00
Perttu Ahola 26eb607a11 Made environment to not consider disconnected players when dealing with ActiveObjects 2011-04-10 23:05:21 +03:00
Perttu Ahola 10eedbc1d2 Map generation is now properly threaded and doesn't block block placement and other stuff. 2011-04-10 20:18:34 +03:00
Perttu Ahola 6fa85c8502 a commit before starting to reorganize the map loading/generation logic 2011-04-10 19:12:56 +03:00
Perttu Ahola 7aa2d4d109 new-style rats are now generated in the map 2011-04-10 16:20:31 +03:00
Perttu Ahola 1a32e5585f fixed a bit 2011-04-10 15:23:36 +03:00
Perttu Ahola 5a4d8ffad3 implemented rats in new system to verify that it works 2011-04-10 15:16:27 +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 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 e4f7f97e6c Removed lua stuff 2011-04-03 12:28:55 +03:00
Perttu Ahola ec3cb2d1d7 fixed a possible infinite loop in ClientEnvironment (dtime counter getting so small that it doesn't increment the value) 2011-02-24 18:25:19 +02:00
Perttu Ahola be32adc872 updated scripting api a bit 
--HG--
rename : data/luaobjects/test/client.lua => data/scripts/objects/test/client.lua
rename : data/luaobjects/test/server.lua => data/scripts/objects/test/server.lua
 2011-02-23 11:10:09 +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 14fafc7217 added sneaking/crouching and changelog 2011-02-14 02:54:15 +02:00
Perttu Ahola 1704badc30 work-in-progress texture atlas optimization 2011-02-10 02:13:03 +02:00
Perttu Ahola dd9e82f5bc bug-fixin' 2011-02-08 01:12:55 +02:00
Perttu Ahola 25a7fabed8 mapgen tweaking 2011-02-06 16:35:27 +02:00
Perttu Ahola e92238edc8 This map generator is starting to look pretty good now... also, disabled loading player position from disk because map is regenerated always. 2011-02-01 16:17:55 +02:00
Perttu Ahola 80acdab93b Commented out some debug output about saving players on server. 2011-01-29 00:48:54 +02:00
Perttu Ahola 64b5975732 Now texture handling is fast. Also now players are saved on disk. 2011-01-28 01:38:16 +02:00
Perttu Ahola c914cbb0a0 OMG! Main Menu! 2011-01-23 17:29:15 +02:00
Perttu Ahola b6787a2b58 fixed erroneus handling of many players with no peer existing at same time 2011-01-18 00:27:14 +02:00
Perttu Ahola 0fa0e0752a old water removed, some fixes here and there 2011-01-17 14:57:37 +02:00
Perttu Ahola 7068bc90af Initial commit of mapgen v.2. Lacks configuration and saving to disk. 2011-01-16 19:32:14 +02:00