LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-21 21:15:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

yes, yes, merge..

Browse Source
This commit is contained in:
bart@bartbes.ath.cx
2010-01-06 15:16:48 +01:00
parent 09ca3053e1 8d63c73bc4
commit 2f5d676efb
17 changed files with 97 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changes.txt
+11 -1
View File
@@ -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.
platform/macosx/love.xcodeproj/project.pbxproj
+2 -16
View File
@@ -1423,7 +1423,6 @@
8D11072C0486CEB800E47090 /* Sources */,
A9255DDE1043185300BA1496 /* Copy Frameworks */,
8D11072E0486CEB800E47090 /* Frameworks */,
A971EA481042798500EAD7F9 /* Change Link Locations */,
A9DEC1F51046F3F30049C70C /* Create DMG */,
);
buildRules = (
@@ -1466,20 +1465,6 @@
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
A971EA481042798500EAD7F9 /* Change Link Locations */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Change Link Locations";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "#! /bin/sh\n#Use install_name_tool, make love to search libs in its own framework folder instead\n#*very* hackish.\n\n# IL\ninstall_name_tool -change /Library/Frameworks/IL.framework/Versions/A/IL @executable_path/../Frameworks/IL.framework/Versions/A/IL build/Release/love.app/Contents/MacOS/love\n\n# FreeType\ninstall_name_tool -change /Library/Frameworks/FreeType.framework/Versions/2.3/FreeType @executable_path/../Frameworks/FreeType.framework/Versions/2.3/FreeType build/Release/love.app/Contents/MacOS/love\n\n# SDL\ninstall_name_tool -change /Library/Frameworks/SDL.framework/Versions/A/SDL @executable_path/../Frameworks/SDL.framework/Versions/A/SDL build/Release/love.app/Contents/MacOS/love\n\n# Lua\ninstall_name_tool -change /Library/Frameworks/Lua.framework/Versions/A/Lua @executable_path/../Frameworks/Lua.framework/Versions/A/Lua build/Release/love.app/Contents/MacOS/love\n\n# Ogg\ninstall_name_tool -change /Library/Frameworks/Ogg.framework/Versions/A/Ogg @executable_path/../Frameworks/Ogg.framework/Versions/A/Ogg build/Release/love.app/Contents/MacOS/love\n\ninstall_name_tool -change /Library/Frameworks/Ogg.framework/Versions/A/Ogg @executable_path/../Frameworks/Ogg.framework/Versions/A/Ogg build/Release/love.app/Contents/Frameworks/Vorbis.framework/Versions/A/Vorbis\n\n# Vorbis\ninstall_name_tool -change /Library/Frameworks/Vorbis.framework/Versions/A/Vorbis @executable_path/../Frameworks/Vorbis.framework/Versions/A/Vorbis build/Release/love.app/Contents/MacOS/love\n\n# mpg123\ninstall_name_tool -change /usr/local/lib/libmpg123.0.dylib @executable_path/../Frameworks/mpg123.framework/mpg123 build/Release/love.app/Contents/MacOS/love\n\ninstall_name_tool -change /Library/Frameworks/mpg123.framework/Resources/libltdl.3.dylib @executable_path/../Frameworks/mpg123.framework/Resources/libltdl.3.dylib build/Release/love.app/Contents/Frameworks/mpg123.framework/mpg123\n\n# physfs\ninstall_name_tool -change /Library/Frameworks/physfs.framework @executable_path/../Frameworks/physfs.framework build/Release/love.app/Contents/MacOS/love\n\n# libmodplug\ninstall_name_tool -change /Users/bill/libs/lib/libmodplug.0.dylib @executable_path/../Frameworks/libmodplug.framework/libmodplug build/Release/love.app/Contents/MacOS/love\n\nexit 0";
};
A9DEC1F51046F3F30049C70C /* Create DMG */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
@@ -1783,13 +1768,14 @@
GCC_C_LANGUAGE_STANDARD = c99;
GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = NO;
GCC_TREAT_NONCONFORMANT_CODE_ERRORS_AS_WARNINGS = NO;
GCC_VERSION = 4.0;
GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
GCC_WARN_ABOUT_MISSING_NEWLINE = NO;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
GCC_WARN_ABOUT_POINTER_SIGNEDNESS = YES;
GCC_WARN_ABOUT_RETURN_TYPE = NO;
GCC_WARN_CHECK_SWITCH_STATEMENTS = YES;
GCC_WARN_EFFECTIVE_CPLUSPLUS_VIOLATIONS = YES;
GCC_WARN_EFFECTIVE_CPLUSPLUS_VIOLATIONS = NO;
GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = NO;
GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = NO;
readme.txt
+5 -2
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+13
View File
@@ -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
+2
View File
@@ -331,6 +331,8 @@ namespace box2d
**/
void wakeUp();
void setFixedRotation(bool fixed);
bool getFixedRotation() const;
private:
/**
src/modules/physics/box2d/Shape.cpp
+14
View File
@@ -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
+3
View File
@@ -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
+18
View File
@@ -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
+2
View File
@@ -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
+18
View File
@@ -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
+2
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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,