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

3 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
Perttu Ahola 974c5cc08c Added key configuration in the configuration file. 2011-05-14 15:43:26 +03:00