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

57 Commits

Author SHA1 Message Date
Perttu Ahola dcedfdacd1 Scripting WIP 2011-11-29 19:13:39 +02:00
Perttu Ahola 3028bbb95b Updated .gitignore to ignore vim swap files 2011-08-12 00:33:24 +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 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 47e4eda4bb Reorganizing stuff (import from temporary git repo) 2011-06-25 04:23:21 +03:00
Nils Dagsson Moskopp b11f08d5d2 * ignore minetestmapper output 2011-06-02 16:54:05 +02:00
Nils Dagsson Moskopp 5f063ce97c + .gitignore 2011-05-29 19:08:59 +02:00