Commit Graph

213 Commits (master)

Author SHA1 Message Date
Perttu Ahola 526eedf98e Scripting WIP 2011-11-29 19:13:39 +02:00
Perttu Ahola dcedfdacd1 Scripting WIP 2011-11-29 19:13:39 +02:00
Perttu Ahola ea8d6d7abd Scripting WIP 2011-11-29 19:13:39 +02:00
Perttu Ahola f145d498a6 Scripting WIP 2011-11-29 19:13:39 +02:00
Perttu Ahola 41c91391fc Scripting WIP; Lua entity step callback works 2011-11-29 19:13:39 +02:00
Perttu Ahola 1ddfdc55dd Add textures in data/textures (appeared to not have been added) 2011-11-29 19:13:39 +02:00
Perttu Ahola a6a1e6ed1a random scripting work-in-progress 2011-11-29 19:13:39 +02:00
Perttu Ahola f8430723e0 Add the default.lua script 2011-11-29 19:13:38 +02:00
Perttu Ahola ee8b6d3444 Move images to data/textures and fix some path stuff; hope that installation still works 2011-11-29 19:11:04 +02: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 43a28f04fa mobv2 2011-10-15 02:28:57 +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
Mark Holmquist f19919546d Adding sapling texture 2011-09-23 18:13:53 -07:00
darkrose 79cb754358 added locking chest texture 2011-09-22 19:12:17 +10:00
sfan5 88dc8c694e Added Iron Apple which heals 4 Hearts 2011-09-12 20:10:17 +02:00
sfan5 c0caedc373 Added Apple Trees 2011-09-11 17:50:44 +02: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
Perttu Ahola 8f42a8be0c lava! 2011-08-15 02:04:56 +03:00
Perttu Ahola 64a6da3e45 merged delta and c55 2011-08-05 11:22:13 +03:00
Nils Dagsson Moskopp 071c0b5536 * Welcome to OMSK. 2011-08-05 08:45:15 +02:00
Nils Dagsson Moskopp 7b8227039f * papyrus texture now darker and edgier 2011-08-01 16:49:42 +02:00
Nils Dagsson Moskopp 363487c97b * less clumsy ladder texture, based on rails 2011-08-01 15:47:02 +02:00
Mark Holmquist bc2819cab2 Added ladders--they don't have any use yet, though 2011-08-01 09:22:36 +02:00
Nils Dagsson Moskopp 7ece67727d Merge remote-tracking branch 'origin/upstream' 2011-07-31 20:04:04 +02:00
Perttu Ahola 17a85b947c added sword textures 2011-07-30 23:54:16 +03:00
Perttu Ahola 8e1eacf3a8 Fixed handling of inventory in creative mode (normal inventory is not trashed anymore), fixed mese pick speed, added some forgotten stuff 2011-07-30 23:33:57 +03:00
Nils Dagsson Moskopp 4ef9c7675a Merge remote-tracking branch 'origin/upstream' 2011-07-30 18:55:43 +02:00
Perttu Ahola 501034a792 merged jungle and bluish shadows 2011-07-23 20:01:06 +03:00
Perttu Ahola a42d324142 changed rat texture to mine 2011-07-23 19:05:06 +03:00
Perttu Ahola 98be778766 switched my textures back 2011-07-23 16:08:07 +03:00
Perttu Ahola f17cfb35d1 uh, i guess this now merges the new delta stuff? 2011-07-23 15:50:05 +03:00
Perttu Ahola 8993d9dd83 Jungle biome/whatever thing 2011-07-23 02:04:24 +03:00
Nils Dagsson Moskopp 909075da5c * nicer firefly texture 2011-07-21 20:13:31 +02:00
Perttu Ahola 308d861327 Merged minetest-delta a624fe549bc75855a170 2011-07-21 20:55:08 +03:00
Nils Dagsson Moskopp 9c557c3846 + unknown block is sick 2011-07-21 17:36:23 +02:00
Nils Dagsson Moskopp 8129d16dd3 + fireflies 2011-07-20 22:05:57 +02:00
Nils Dagsson Moskopp 2586a186bd * Омская птица 2011-07-18 02:09:55 +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 ab0cc1bb47 better handling of unknown blocks on client 2011-06-27 07:30:02 +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 7efe89ff58 backported cactus, papyrus and clay 2011-06-26 13:47:21 +02: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 e8a731adc5 added correct data to new images, added comments in main.cpp 2011-06-25 04:41:38 +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 bf947833e9 uh oh, forgot to add treeprop.png to the repo 2011-06-19 12:37:00 +03:00
Perttu Ahola 0bd1b782d0 modified health bar a bit 2011-06-18 09:04:31 +03:00
Nils Dagsson Moskopp 3be6891938 + rail 2011-06-07 19:24:30 +02:00
Nils Dagsson Moskopp 8835433b5e + paper, book, bookshelf 2011-06-03 13:12:56 +02:00
Nils Dagsson Moskopp ccc0420c52 + papyrus 2011-06-03 00:55:28 +02:00
Nils Dagsson Moskopp ba1460a582 + clay and associated items 2011-06-01 04:57:46 +02:00
Nils Dagsson Moskopp d7b768dc4b + brick 2011-05-31 22:04:09 +02:00
Nils Dagsson Moskopp 8d580ddf29 * menulogo now shows minetest delta 2011-05-31 20:52:20 +02:00
Nils Dagsson Moskopp 6ca51de990 + fence inventory icon 2011-05-31 03:54:39 +02:00
Nils Dagsson Moskopp 289e31ed98 + cactii 2011-05-30 14:42:08 +02:00
Nils Dagsson Moskopp 16c8826041 * better heart icon 2011-05-29 18:49:02 +02:00
Nils Dagsson Moskopp c484aaf6f6 * better glass graphics 2011-05-29 18:48:39 +02:00
Nils Dagsson Moskopp cd71566a46 * better rat graphics 2011-05-29 18:48:21 +02:00
Nils Dagsson Moskopp 50021073bf * enemies are now omsk birds 2011-05-29 18:47:40 +02:00
Nils Dagsson Moskopp c39a03d803 * better player graphics 2011-05-29 18:45:50 +02:00
Nils Dagsson Moskopp e76f4155d5 + sandstone 2011-05-29 18:44:42 +02:00
Ciaran Gultnieks 99c2ac0125 A very poor (but better than nothing) inventory icon for fences 2011-05-24 23:18:41 +01:00
Ciaran Gultnieks e16c78aac1 Added glass texture (poor artwork skills, apologies in advance) 2011-05-09 19:28:12 +01:00
Perttu Ahola a73b10eb1c made proper skyboxes for dawn/evening and night 2011-04-29 17:53:07 +03:00
Perttu Ahola 0847e550f0 added simple skybox 2011-04-29 16:00:36 +03:00
Perttu Ahola 0fecd24758 didn't actually change everything, just re-saved the grass texture. 2011-04-29 00:38:11 +03:00
Perttu Ahola 0034744568 Made the main menu a bit more unique looking 2011-04-24 00:11:23 +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 89aa8b9be1 Furnace is now usable. Added more tools.
--HG--
rename : data/tool_stpick.png => data/tool_stonepick.png
rename : data/tool_wpick.png => data/tool_woodpick.png
2011-04-05 18:23:30 +03:00
Perttu Ahola 4a92df6ff0 Chests work now! 2011-04-04 15:13:19 +03:00
Perttu Ahola e4f7f97e6c Removed lua stuff 2011-04-03 12:28:55 +03:00
Perttu Ahola 685a635aea reverted mud to old texture 2011-04-03 12:13:53 +03:00
Perttu Ahola 8581bf0091 tuned water texture and removed two debug prints from server 2011-04-02 21:10:53 +03:00
Perttu Ahola bc66bb2d40 Mapgen is better now. Not a lot, but a bit! 2011-04-02 20:55:22 +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 231386d501 tweaked mapgen 2011-02-28 14:51:57 +02:00
Perttu Ahola ad9e084e94 added trees (very glitchy) and changed grass texture 2011-02-28 02:48:31 +02:00
Perttu Ahola c8be58a65c A third try on terrain generation. No trees yet. 2011-02-28 02:01:40 +02:00
Perttu Ahola 5707c309c9 modified grass texture 2011-02-28 01:58:08 +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 3264ac4390 Better texture handling. Textures are not added to atlas if they are big, and atlas is not further made after it is full. 2011-02-17 19:07:14 +02:00
Perttu Ahola 92432a28c0 small fixes: crack texture, server build on windows, configuration file example, adding config file example to install 2011-02-16 20:03:31 +02:00
Perttu Ahola a0e8f3afd3 might work good on cmake+msvc now 2011-02-15 20:53:29 +02:00
Perttu Ahola be7391c2b1 mud gets now grass onto it when placed into sunlight. also removed three old files 2011-02-15 12:33:59 +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 7f2aa30bf2 added sand to map generator 2011-02-04 14:32:30 +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 9f882bf74d Reworked texture, material, mineral and whatever handling 2011-01-26 00:41:06 +02:00
Perttu Ahola 24e41ab4c8 Mainly some texture tweaking 2011-01-24 13:32:11 +02:00
Perttu Ahola 3fe377be4e builds on both platforms 2010-12-25 02:33:41 +02:00
Perttu Ahola 699d0e9a5e minecraft-like crafting 2010-12-25 01:54:39 +02:00
Perttu Ahola 705de63dcd ProgressBarTextureMod 2010-12-24 11:44:26 +02:00
Perttu Ahola 1611f00865 files 2010-12-24 03:17:21 +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 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 3b0bff2f74 Cracking blocks while digging 2010-12-21 02:25:47 +02:00
Perttu Ahola 6350c5d7a6 some tinkering with gui. removed updating of configuration file at end 2010-12-20 14:59:21 +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 be2c7dfb97 pausemenu stuff 2010-12-14 03:07:37 +02:00
Perttu Ahola 6129e31b96 better graphics, zlib to work on vc++ 2010-12-14 01:56:24 +02:00
Perttu Ahola 47f76d8a51 grass edges workin' 2010-12-14 00:29:32 +02:00
Perttu Ahola 626ed6338a in before messing with face drawing orientation 2010-12-14 00:21:18 +02:00
Perttu Ahola de83bfb81e added images 2010-12-13 03:22:02 +02:00
Perttu Ahola 38353751c9 better water 2010-11-30 15:35:03 +02:00
Perttu Ahola c707e00195 sitä sun tätä tekeillä, toimii kivasti 2010-11-29 10:52:07 +02:00
Perttu Ahola 4e249fb3fb Initial files 2010-11-27 01:02:21 +02:00