yes, yes, merge..

changes.txt

@@ -1,11 +1,21 @@
+LOVE 0.6.1
+----------
+
+  * Added Shape:setGroupIndex and getGroupIndex.
+  * Added Body:setFixedRotation and Body:getFixedRotation.
+  * Added icons and file associations for the debs.
+  * It's now possible to run a .love from Resources in Mac OSX, thanks to stevejohnson and diordna.
+  * Fixed a bug with multiple Sources on the same Music.
+
 LOVE 0.6.0
 ----------
 
+  * Lost track of 0.6.0 changes a long while ago. Don't trust the list below.
+
   * Added love.graphics.print()/printf().
   * Added unicode-translated parameter to love.keypressed().
   * Added love.event.
   * Added love.filesystem.setIdentity().
-  * Added experimental support for Lua lanes.
   * Added OpenAL dependency.
   * Added SDL_sound dependency.
   

readme.txt

@@ -2,13 +2,16 @@
 ! WARNING ! 
 -----------
 
-This software is not complete. This is just a preview. Don't expect to find any interface consistencies between releases at all. With each release, everything you once knew and loved may be brutally murdered. By which I mean removed and/or changed.
+This software is not complete. This is just a preview. Don't expect to find any 
+interface consistencies between releases at all. With each release, everything 
+you once knew and loved may be brutally murdered. By which I mean removed and/or changed.
 
 
 RUNNING GAMES
 -------------
 
-In Windows or other graphical enviroments, just open the .love file you want to run with love.exe (~^-^)~
+In Windows or other graphical enviroments, just open the .love file you want to run 
+with love.exe (~^-^)~
 
 In a console, type "love" followed by the relative or absolute path to a directory (or archive).
 

src/love.cpp

@@ -294,7 +294,7 @@ int main(int argc, char ** argv)
 	}
 
 	// Boot
-	if (luaL_loadbuffer(L, love::boot_lua, sizeof(love::boot_lua), "boot.lua") == 0)
+	if (luaL_loadbuffer(L, (const char *)love::boot_lua, sizeof(love::boot_lua), "boot.lua") == 0)
 		lua_call(L, 0, 0);
 
 	lua_close(L);

src/modules/graphics/opengl/wrap_Graphics.cpp

@@ -892,7 +892,7 @@ namespace opengl
 
 		luax_register_module(L, w);
 
-		if (luaL_loadbuffer(L, graphics_lua, sizeof(graphics_lua), "graphics.lua") == 0)
+		if (luaL_loadbuffer(L, (const char *)graphics_lua, sizeof(graphics_lua), "graphics.lua") == 0)
 			lua_call(L, 0, 0);
 
 		return 0;

src/modules/physics/box2d/Body.cpp

@@ -282,6 +282,19 @@ namespace box2d
 		body->WakeUp();
 	}
 
+	void Body::setFixedRotation(bool fixed)
+	{
+		if(fixed)
+			body->m_flags |= b2Body::e_fixedRotationFlag;
+		else
+			body->m_flags |= ~(b2Body::e_fixedRotationFlag);
+	}
+
+	bool Body::getFixedRotation() const
+	{
+		return (body->m_flags & b2Body::e_fixedRotationFlag) != 0;
+	}
+
 	b2Vec2 Body::getVector(lua_State * L)
 	{
 		love::luax_assert_argc(L, 2, 2);

src/modules/physics/box2d/Body.h

@@ -331,6 +331,8 @@ namespace box2d
 		**/
 		void wakeUp();
 
+		void setFixedRotation(bool fixed);
+		bool getFixedRotation() const;
 	private:
 
 		/**

src/modules/physics/box2d/Shape.cpp

@@ -183,6 +183,20 @@ namespace box2d
 		return 0;
 	}
 
+	void Shape::setGroupIndex(int index)
+	{
+		b2FilterData f = shape->GetFilterData();
+		f.groupIndex = (uint16)index;
+		shape->SetFilterData(f);
+		shape->GetBody()->GetWorld()->Refilter(shape);
+	}
+
+	int Shape::getGroupIndex() const
+	{
+		b2FilterData f = shape->GetFilterData();
+		return f.groupIndex;
+	}
+
 	int Shape::getCategory(lua_State * L)
 	{
 		return pushBits(L, shape->GetFilterData().categoryBits);

src/modules/physics/box2d/Shape.h

@@ -168,6 +168,9 @@ namespace box2d
 		**/
 		void getFilterData(int * v);
 		
+		void setGroupIndex(int index);
+		int getGroupIndex() const;
+
 		int setCategory(lua_State * L);
 		int setMask(lua_State * L);
 		int getCategory(lua_State * L);

src/modules/physics/box2d/wrap_Body.cpp

@@ -425,6 +425,22 @@ namespace box2d
 		return 0;
 	}
 
+	int w_Body_setFixedRotation(lua_State * L)
+	{
+		Body * t = luax_checkbody(L, 1);
+		bool b = luax_toboolean(L, 2);
+		t->setFixedRotation(b);
+		return 0;
+	}
+
+	int w_Body_getFixedRotation(lua_State * L)
+	{
+		Body * t = luax_checkbody(L, 1);
+		bool b = t->getFixedRotation();
+		luax_pushboolean(L, b);
+		return 1;
+	}
+
 	int w_Body_destroy(lua_State * L)
 	{
 		Proxy * p = (Proxy *)lua_touserdata(L, 1);
@@ -477,6 +493,8 @@ namespace box2d
 		{ "setAllowSleeping", w_Body_setAllowSleeping },
 		{ "putToSleep", w_Body_putToSleep },
 		{ "wakeUp", w_Body_wakeUp },
+		{ "setFixedRotation", w_Body_setFixedRotation },
+		{ "getFixedRotation", w_Body_getFixedRotation },
 		{ "destroy", w_Body_destroy },
 		{ 0, 0 }
 	};

src/modules/physics/box2d/wrap_Body.h

@@ -73,6 +73,8 @@ namespace box2d
 	int w_Body_setAllowSleeping(lua_State * L);
 	int w_Body_putToSleep(lua_State * L);
 	int w_Body_wakeUp(lua_State * L);
+	int w_Body_setFixedRotation(lua_State * L);
+	int w_Body_getFixedRotation(lua_State * L);
 	int w_Body_destroy(lua_State * L);
 	int luaopen_body(lua_State * L);
 

src/modules/physics/box2d/wrap_Shape.cpp

@@ -198,6 +198,22 @@ namespace box2d
 		return t->getBoundingBox(L);
 	}
 
+	int w_Shape_getGroupIndex(lua_State * L)
+	{
+		Shape * t = luax_checkshape(L, 1);
+		int i = t->getGroupIndex();
+		lua_pushinteger(L, i);
+		return 1;
+	}
+
+	int w_Shape_setGroupIndex(lua_State * L)
+	{
+		Shape * t = luax_checkshape(L, 1);
+		int i = luaL_checkint(L, 2);
+		t->setGroupIndex(i);
+		return 0;
+	}
+
 	int w_Shape_destroy(lua_State * L)
 	{
 		Proxy * p = (Proxy *)lua_touserdata(L, 1);
@@ -229,6 +245,8 @@ namespace box2d
 		{ "setData", w_Shape_setData },
 		{ "getData", w_Shape_getData },
 		{ "getBoundingBox", w_Shape_getBoundingBox },
+		{ "getGroupIndex", w_Shape_getGroupIndex },
+		{ "setGroupIndex", w_Shape_setGroupIndex },
 		{ "destroy", w_Shape_destroy },
 		{ 0, 0 }
 	};

src/modules/physics/box2d/wrap_Shape.h

@@ -53,6 +53,8 @@ namespace box2d
 	int w_Shape_setData(lua_State * L);
 	int w_Shape_getData(lua_State * L);
 	int w_Shape_getBoundingBox(lua_State * L);
+	int w_Shape_getGroupIndex();
+	int w_Shape_setGroupIndex();
 	int w_Shape_destroy(lua_State * L);
 	int luaopen_shape(lua_State * L);
 

src/scripts/auto.lua

@@ -28,7 +28,7 @@ function auto(name)
 		end
 	end
 
-	local src_output = "const char "..cpp_name.."[] = \n{\n"
+	local src_output = "const unsigned char "..cpp_name.."[] = \n{\n"
 
 	for i,line in ipairs(lines) do
 		local concat = {}

src/scripts/boot.lua

@@ -241,7 +241,7 @@ function love.init()
 		end
 	end
 
-	if love.keyboard then
+	if love.event then
 		love.createhandlers()
 	end
 

src/scripts/boot.lua.h

@@ -22,7 +22,7 @@ namespace love
 {
 
 // [boot.lua]
-const char boot_lua[] = 
+const unsigned char boot_lua[] = 
 {
 	0x1B,0x4C,0x75,0x61,0x51,0x00,0x01,0x04,0x04,0x04,0x08,0x00,0x0A,0x00,0x00,
 	0x00,0x40,0x62,0x6F,0x6F,0x74,0x2E,0x6C,0x75,0x61,0x00,0x00,0x00,0x00,0x00,
@@ -457,7 +457,7 @@ const char boot_lua[] =
 	0x00,0x86,0x00,0x44,0x00,0x5C,0x00,0x01,0x01,0x16,0x80,0x01,0x80,0x5A,0x01,
 	0x00,0x00,0x16,0x00,0x01,0x80,0x85,0x41,0x08,0x00,0xC1,0x01,0x0A,0x00,0x00,
 	0x02,0x00,0x02,0xD5,0x01,0x82,0x03,0x9C,0x41,0x00,0x01,0x61,0x80,0x00,0x00,
-	0x16,0x80,0xFD,0x7F,0x45,0x00,0x07,0x00,0x46,0x80,0xC4,0x00,0x5A,0x00,0x00,
+	0x16,0x80,0xFD,0x7F,0x45,0x00,0x07,0x00,0x46,0x40,0xC4,0x00,0x5A,0x00,0x00,
 	0x00,0x16,0x80,0x00,0x80,0x45,0x00,0x07,0x00,0x46,0x40,0xCA,0x00,0x5C,0x40,
 	0x80,0x00,0x46,0x80,0x41,0x00,0x5A,0x00,0x00,0x00,0x16,0x40,0x09,0x80,0x46,
 	0x00,0x44,0x00,0x46,0xC0,0xC5,0x00,0x5A,0x00,0x00,0x00,0x16,0x40,0x08,0x80,

src/scripts/graphics.lua.h

@@ -22,7 +22,7 @@ namespace love
 {
 
 // [graphics.lua]
-const char graphics_lua[] = 
+const unsigned char graphics_lua[] = 
 {
 	0x1B,0x4C,0x75,0x61,0x51,0x00,0x01,0x04,0x04,0x04,0x08,0x00,0x0E,0x00,0x00,
 	0x00,0x40,0x67,0x72,0x61,0x70,0x68,0x69,0x63,0x73,0x2E,0x6C,0x75,0x61,0x00,