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

180 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
Perttu Ahola 47e4eda4bb Reorganizing stuff (import from temporary git repo) 2011-06-25 04:23:21 +03:00
Perttu Ahola 5ac900ddd9 Changed MapBlockObjects to be never written anymore. Incremented version number. 2011-06-18 15:16:35 +03:00
Perttu Ahola 534287892d merged Mac OSX build fix from minetest-delta 2011-06-18 03:14:13 +03:00
Perttu Ahola 1b8cff8fbf In a globally installed build, debug.txt is now placed in userdata directory. Needs testing still. 2011-06-02 19:30:03 +03:00
Perttu Ahola 7d57b71ffe 0.2.20110602_0 2011-06-02 00:15:42 +03:00
MrLoom 2f2f28d398 MacOSX build support 2011-06-01 14:13:22 +02:00
Perttu Ahola 97dc966759 updated version 2011-05-31 00:24:44 +03:00
Perttu Ahola a6c97be1a4 20110529_2 
--HG--
extra : rebase_source : cf6dd618ef0b7514c81ae87749733b5a328fc763
 2011-05-29 22:38:16 +03:00
Perttu Ahola f966ea8659 version 
--HG--
extra : rebase_source : 6fa0a8b40406aa567f8fa84b5e2045a7e3762c1d
 2011-05-29 21:35:38 +03:00
Perttu Ahola cc2df1a3ed changed version number to 0.2.20110529_0 
--HG--
extra : rebase_source : 9b05d4bfee9312aef4182fa6f63b4237368cec34
 2011-05-29 21:28:22 +03:00
Perttu Ahola 2704bdc68e Optimized smooth lighting calculation code 2011-04-24 21:15:50 +03:00
Perttu Ahola c9967d6d07 updated menu a bit, and some other small fixes 2011-04-24 15:37:41 +03:00
Perttu Ahola 83414e8b73 removed /usr prefix from install paths 2011-04-24 00:30:41 +03:00
Perttu Ahola 4b8c5b1908 changed version for making a test binary 2011-04-23 20:37:12 +03:00
Perttu Ahola 4934f3d060 updated changelog and version 2011-04-10 23:39:33 +03:00
Perttu Ahola 00dd5cbb2e still modified version! 2011-04-06 11:55:38 +03:00
Perttu Ahola 6537e67909 Fixed wrong version number 2011-04-06 11:53:46 +03:00
Perttu Ahola 12f8f09f8c Changed version number according to a new versioning scheme. 2011-04-06 11:16:44 +03:00
Perttu Ahola b7ddeb51be Incremented version to 0.0.2. 2011-04-05 18:27:00 +03: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 9998355221 oops... blew. now? 2011-01-18 23:13:29 +02:00
Perttu Ahola affa8f80ad Tried to fix install directory problem on linux... Let's hope this doesn't blow it all. 2011-01-18 23:12:52 +02:00
Perttu Ahola 56918c0ca4 random build system tweaking 2011-01-09 17:28:31 +02:00
Perttu Ahola 359e575ba3 Mainly small build system fixes 2011-01-09 00:49:32 +02:00
Perttu Ahola eb476f1ce2 Lots of small stuff 2011-01-08 19:35:14 +02:00
Perttu Ahola d435dedb89 doc updates; CMake works reasonably well now. 2011-01-08 17:45:26 +02:00
Perttu Ahola 9fbb0889a7 CMake stuff works now on linux and windows... and should be possible to make to work on OS X. 2011-01-08 17:34:25 +02:00
Perttu Ahola d825ed572f CMake working on Linux (not on windows) 
--HG--
rename : Makefile => Makefile.bak
 2011-01-08 03:10:20 +02:00