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

7 Commits

Author SHA1 Message Date
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
teddydestodes 6434f64ab4 added new submenu for key assignment 
configwriting/saving isn't complete and will break your config if you use fancy keys
 2011-06-01 19:44:07 +02: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 c9967d6d07 updated menu a bit, and some other small fixes 2011-04-24 15:37:41 +03:00
Perttu Ahola 0034744568 Made the main menu a bit more unique looking 2011-04-24 00:11:23 +03:00
Perttu Ahola 035345f13d Map deletion button 2011-01-26 00:40:33 +02:00
Perttu Ahola c914cbb0a0 OMG! Main Menu! 2011-01-23 17:29:15 +02:00