Merge branch 'master' of github.com:Jeija/BlockPlanet

Conflicts:
	games/minetest/mods/default/textures/default_steel_ingot.png
	games/minetest/mods/default/textures/default_tool_steelaxe.png
	games/minetest/mods/default/textures/default_tool_stoneaxe.png
	games/minetest/mods/default/textures/default_tool_woodaxe.png

README.md

@@ -1,13 +1,15 @@
-Minetest++
+BlockPlanet
 ==========
 
-A game built off of the best free and open source Minecraft clone, Minetest-C55.
+A fork of minetest-c55, made to be faster, funner, and have more features.
 
+Copyright (c) 2012 Jordan Craige <jordan4ibanez@gmail.com>
+and their contributors (see source file comments and the version control log)
+
+Minetest-C55:
 Copyright (c) 2010-2012 Perttu Ahola <celeron55@gmail.com>
 and their contributors (see source file comments and the version control log)
 
-This contains 2 different game modes, Minetest and Minimal.
-Game mode Minimal is just a test and will be taken out soon. Game mode Minetest has all the cool features.
 
 Further documentation
 ----------------------
@@ -18,22 +20,21 @@ Further documentation
 This game is in alpha!
 --------------------------
 - Don't expect it to work as well as a finished game will.
-- Please tell me about any bugs you come across. Just look in your debug.txt file. (/minetest/bin/debug.txt)
+- Please tell me about any bugs you come across. Just look in your debug.txt file. (/blockplanet/bin/debug.txt)
 - But other then that, have fun and expect new features :)
 
 Default Controls
 -----------------
 - WASD: Move
+    - When double-tapping W, it makes you sprint
 - Space: Jump
-- E: 
-    - While walking: Run (need the fast privelage)
-    - While flying: Go down
-- Shift: Sneak
+    - When double-tapped, it makes you fly
+- Shift:
+    - On ground: Sneak
+    - While flying or on a ladder: Go down
 - Q: Drop item
-- R: Open inventory
+- E: Open inventory
 - Mouse: Turn/look
-- C: Toggle fly (need fly privelage)
-- X: toggle fast (need fast Privelage)
 - Settable in the configuration file, see the section below.
 
 Compiling:
@@ -213,7 +214,7 @@ License of Minetest-c55 textures and sounds
 This applies to textures and sounds contained in the main Minetest
 distribution.
 
-Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)                                 
+Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)
 http://creativecommons.org/licenses/by-sa/3.0/
 
 License of Minetest-c55 source code

README.txt

@@ -37,7 +37,7 @@ Compiling:
 GNU/Linux
 Install dependencies.
 
-Here's an example for Debian/Ubuntu: sudo apt-get install build-essential libirrlicht-dev cmake libbz2-dev libpng12-dev libjpeg8-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl3
+Here's an example for Debian/Ubuntu: sudo apt-get install build-essential libirrlicht-dev cmake libbz2-dev libpng12-dev libjpeg8-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl3 libghc6-curl-dev libfreetype6-dev
 Download source:
 Method 1: Download tarball
 

builtin/item_entity.lua

@@ -117,6 +117,7 @@ minetest.register_entity("__builtin:item", {
 		local playerfound = false
 		for k, obj in pairs(objs2) do
 			local objpos=obj:getpos()
+			self.object:setacceleration({x=0, y=-10, z=0})
 			if obj:get_player_name() ~= nil and objpos.y >= pos.y-1.25 and objpos.y <= pos.y+.25 then
 				playerfound = true
 				if self.dontbugme == false then

games/blockplanet/mods/default/init.lua~

@@ -204,6 +204,13 @@ minetest.register_craft({
 	}
 })
 
+minetest.register_craft({
+	output = 'default:wood 4',
+	recipe = {
+		{'default:jungletree'},
+	}
+})
+
 minetest.register_craft({
 	output = 'default:stick 4',
 	recipe = {
@@ -688,11 +695,11 @@ end
 function default.node_sound_stone_defaults(table)
 	table = table or {}
 	table.footstep = table.footstep or
-			{name="wood", gain=0.25}
+			{name="stone", gain=0.2}
 	table.dig = table.dig or
-			{name="wood", gain=0.9}
+			{name="stone", gain=0.5}
 	table.dug = table.dug or
-			{name="wood", gain=1.5}
+			{name="stone", gain=1.0}
 	default.node_sound_defaults(table)
 	return table
 end
@@ -700,11 +707,11 @@ end
 function default.node_sound_dirt_defaults(table)
 	table = table or {}
 	table.footstep = table.footstep or
-			{name="grass", gain=0.25}
+			{name="grass", gain=0.2}
 	table.dig = table.dig or
-			{name="grass", gain=0.9}
+			{name="grass", gain=0.5}
 	table.dug = table.dug or
-			{name="grass", gain=1.5}
+			{name="grass", gain=1.0}
 	default.node_sound_defaults(table)
 	return table
 end
@@ -724,11 +731,11 @@ end
 function default.node_sound_wood_defaults(table)
 	table = table or {}
 	table.footstep = table.footstep or
-			{name="wood", gain=0.25}
+			{name="wood", gain=0.2}
 	table.dig = table.dig or
-			{name="wood", gain=0.9}
+			{name="wood", gain=0.5}
 	table.dug = table.dug or
-			{name="wood", gain=1.5}
+			{name="wood", gain=1.0}
 	default.node_sound_defaults(table)
 	return table
 end
@@ -736,11 +743,11 @@ end
 function default.node_sound_leaves_defaults(table)
 	table = table or {}
 	table.footstep = table.footstep or
-			{name="grass", gain=0.25}
+			{name="grass", gain=0.2}
 	table.dig = table.dig or
-			{name="grass", gain=0.9}
+			{name="grass", gain=0.5}
 	table.dug = table.dug or
-			{name="grass", gain=1.5}
+			{name="grass", gain=1.0}
 	default.node_sound_defaults(table)
 	return table
 end
@@ -748,11 +755,11 @@ end
 function default.node_sound_glass_defaults(table)
 	table = table or {}
 	table.footstep = table.footstep or
-			{name="wood", gain=0.25}
+			{name="wood", gain=0.2}
 	table.dig = table.dig or
-			{name="wood", gain=0.9}
+			{name="wood", gain=0.5}
 	table.dug = table.dug or
-			{name="glass_shatter", gain=1.5}
+			{name="glass_shatter", gain=1.0}
 	default.node_sound_defaults(table)
 	return table
 end
@@ -1226,11 +1233,11 @@ minetest.register_node("default:chest_locked", {
 	sounds = default.node_sound_wood_defaults(),
 })
 
-minetest.register_entity("default:monkey_mob_entity", {
+--[[minetest.register_entity("default:monkey_mob_entity", {
 	description = "The Evil Monkey",
 	textures = {"default_furnace_front.png"},
 	visual = "file",
-	meshfile = "monkey.obj",
+	meshfile = "altair.3ds",
 	physical = "true",
 	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
 	sounds = default.node_sound_wood_defaults(),
@@ -1247,7 +1254,7 @@ minetest.register_on_placenode(function(pos, newnode, placer)
 		nodeupdate(pos)
 		minetest.env:add_entity(pos, "default:monkey_mob_entity")
 	end
-end)
+end)]]
 
 minetest.register_node("default:furnace", {
 	description = "Furnace",

games/blockplanet/mods/default/sounds/Credits

@@ -1,9 +1,11 @@
-Wood:
+Stone:
 http://www.youtube.com/watch?v=u6UNjvQIurQ&feature=related
+Wood:
+http://www.freesound.org/people/ddohler/sounds/34260/
 Grass and Dirt:
 http://www.freesound.org/people/Snoman/
 Glass Break:
 http://www.freesound.org/people/datasoundsample/sounds/41348/
 http://www.freesound.org/people/cmusounddesign/sounds/71947/
 http://www.freesound.org/people/Tomlija/sounds/97669/
-http://www.freesound.org/people/lsprice/sounds/88808/
+http://www.freesound.org/people/lsprice/sounds/88808/