minetest.git - modified minetest for gpcfs purposes

	Commit message (Collapse)	Author	Age
*	Merge remote-tracking branch 'origin/upstream'	Nils Dagsson Moskopp	2011-07-31
\|\
\| *	added sword textures	Perttu Ahola	2011-07-30
\| \|
\| *	Fixed handling of inventory in creative mode (normal inventory is not ↵	Perttu Ahola	2011-07-30
\| \| \| \| \| \| \| \|	trashed anymore), fixed mese pick speed, added some forgotten stuff
* \|	Merge remote-tracking branch 'origin/upstream'	Nils Dagsson Moskopp	2011-07-30
\|\\|
\| *	merged jungle and bluish shadows	Perttu Ahola	2011-07-23
\| \|\
\| \| *	Jungle biome/whatever thing	Perttu Ahola	2011-07-23
\| \|/ \|/\|
\| *	changed rat texture to mine	Perttu Ahola	2011-07-23
\| \|
\| *	switched my textures back	Perttu Ahola	2011-07-23
\| \|
\| *	uh, i guess this now merges the new delta stuff?	Perttu Ahola	2011-07-23
\| \|\ \| \|/ \|/\|
\| *	Merged minetest-delta a624fe549bc75855a170	Perttu Ahola	2011-07-21
\| \|\
* \| \|	* nicer firefly texture	Nils Dagsson Moskopp	2011-07-21
\| \| \|
* \| \|	+ unknown block is sick	Nils Dagsson Moskopp	2011-07-21
\|/ /
* \|	+ fireflies	Nils Dagsson Moskopp	2011-07-20
\| \|
* \|	* Омская птица	Nils Dagsson Moskopp	2011-07-18
\| \|
* \|	Merge branch 'upstream/master'	Nils Dagsson Moskopp	2011-07-14
\|\\| \| \| \| \| \| \| \| \| \| \|	Conflicts: data/oerkki1.png src/client.cpp
\| *	better handling of unknown blocks on client	Perttu Ahola	2011-06-27
\| \|
\| *	reorganized a lot of stuff and modified mapgen and objects slightly while ↵	Perttu Ahola	2011-06-26
\| \| \| \| \| \| \| \|	doing it
* \|	backported cactus, papyrus and clay	Sebastian Rühl	2011-06-26
\| \|
* \|	Merge branch 'master' of https://github.com/erlehmann/minetest-delta.git ↵	Sebastian Rühl	2011-06-26
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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>
\| *	+ rail	Nils Dagsson Moskopp	2011-06-07
\| \|
\| *	+ paper, book, bookshelf	Nils Dagsson Moskopp	2011-06-03
\| \|
\| *	+ papyrus	Nils Dagsson Moskopp	2011-06-03
\| \|
\| *	+ clay and associated items	Nils Dagsson Moskopp	2011-06-01
\| \|
\| *	+ brick	Nils Dagsson Moskopp	2011-05-31
\| \|
\| *	* menulogo now shows minetest delta	Nils Dagsson Moskopp	2011-05-31
\| \|
\| *	+ fence inventory icon	Nils Dagsson Moskopp	2011-05-31
\| \|
\| *	+ cactii	Nils Dagsson Moskopp	2011-05-30
\| \|
\| *	* better heart icon	Nils Dagsson Moskopp	2011-05-29
\| \|
\| *	* better glass graphics	Nils Dagsson Moskopp	2011-05-29
\| \|
\| *	* better rat graphics	Nils Dagsson Moskopp	2011-05-29
\| \|
\| *	* enemies are now omsk birds	Nils Dagsson Moskopp	2011-05-29
\| \|
\| *	* better player graphics	Nils Dagsson Moskopp	2011-05-29
\| \|
\| *	+ sandstone	Nils Dagsson Moskopp	2011-05-29
\| \|
* \|	added correct data to new images, added comments in main.cpp	Perttu Ahola	2011-06-25
\| \|
* \|	New map generator added (and SQLite, messed up the commits at that time...) ↵	Perttu Ahola	2011-06-25
\| \| \| \| \| \| \| \|	(import from temporary git repo)
* \|	uh oh, forgot to add treeprop.png to the repo	Perttu Ahola	2011-06-19
\| \|
* \|	modified health bar a bit	Perttu Ahola	2011-06-18
\| \|
* \|	A very poor (but better than nothing) inventory icon for fences	Ciaran Gultnieks	2011-05-24
\|/
*	Added glass texture (poor artwork skills, apologies in advance)	Ciaran Gultnieks	2011-05-09
\|
*	made proper skyboxes for dawn/evening and night	Perttu Ahola	2011-04-29
\|
*	added simple skybox	Perttu Ahola	2011-04-29
\|
*	didn't actually change everything, just re-saved the grass texture.	Perttu Ahola	2011-04-29
\|
*	Made the main menu a bit more unique looking	Perttu Ahola	2011-04-24
\|
*	Some work-in-progress in hp and mobs and a frightening amount of random fixes.	Perttu Ahola	2011-04-21
\|
*	Furnace is now usable. Added more tools.	Perttu Ahola	2011-04-05
\| \| \| \| \| \|	--HG-- rename : data/tool_stpick.png => data/tool_stonepick.png rename : data/tool_wpick.png => data/tool_woodpick.png
*	Chests work now!	Perttu Ahola	2011-04-04
\|
*	Removed lua stuff	Perttu Ahola	2011-04-03
\|
*	reverted mud to old texture	Perttu Ahola	2011-04-03
\|
*	tuned water texture and removed two debug prints from server	Perttu Ahola	2011-04-02
\|
*	Mapgen is better now. Not a lot, but a bit!	Perttu Ahola	2011-04-02
\|