Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,504 Commits 4 Branches 31 Tags 1.1 GiB
Commit Graph

95 Commits

Author SHA1 Message Date
Sam Clegg c0b150c859 Cleanup the tolua++ bindings build system. 
Update basic.lua to do all the required patching of
the output file without helper scripts such as
build.xml or build.php.

Update README file with current instructions.

Re-generate output file using new build system.

Add build.sh and build.bat for building on POSIX and
win32 respectively.
 2013-03-08 11:09:10 -08:00
wangshuai d5cdba484e Merge branch 'master' into feature_1802 
Conflicts:
	scripting/lua/cocos2dx_support/LuaCocos2d.cpp
 2013-03-07 14:32:31 +08:00
wangshuai 6914c9d902 feature #1802:add touches lua test 2013-03-07 11:55:57 +08:00
wangshuai 3aaa18f7f4 Merge branch 'master' into iss1425-lua 
Conflicts:
	scripting/lua/cocos2dx_support/LuaCocos2d.cpp
 2013-03-06 20:39:01 +08:00
Sam Clegg 38878b084b Fix all compiler warnings produced by gcc. 
This allows the linux and NaCl builds (and perhaps others)
to be compiles with -Wall and -Werror, and it makes the build
output much less noisy.
 2013-03-05 17:01:00 -08:00
wangshuai bdbdbc27f5 issue #1425:exist lua test case is ok! 
1.add some lua test case
2.add ccset.pkg
3.fixed ParticleSystem error in lua test case
 2013-03-05 14:46:18 +08:00
Sam Clegg dcb591eadb Add missing ccGLServerState to CCNode.pkg. 
Without this missing enum the resuling cpp file would generate
an unused function warning.

Also, remove the duplication between build_macosx.xml and build.xml.
They only differed in single property.  Instead use build.sh, which
should work on all UNIXs, no just maxosx.
 2013-03-02 11:28:04 -08:00
wangshuai 8867766241 issue #1425: exist lua test case is ok. 
1.fixed some bugs in some lua test case;
2.modify touch event and node event type;
3.fixed some bugs in CCParticleSystem.pkg
 2013-03-01 17:09:42 +08:00
wangshuai b4e13af460 issue #1425: 
1.fixed some bugs in .lua file. like this:local b = a:copy():autorelease() 
2.fixed bug of CCShakyTiles3D's create() in CCActionTilesGrid.pkg
3.delete method copyWithZone in .pkg files
 2013-02-28 10:23:30 +08:00
giginet 70612a722b Fix CCRepeat#create is recieved bad argument on Lua binding. 
CCRepeat#create must be recieved CCFiniteTimeAction as first argument.
But, CCActionInterval recieved in LuaCocos2d.cpp
 2013-02-22 20:24:22 +09:00
James Chen ab00de629a Removed the definition of the touch event type . 2013-02-20 12:06:12 +08:00
minggo 1b743b37c9 issue #1731:change CCSize, CCPoint and CCRect to struct in pkg files 2013-02-19 10:08:25 +08:00
minggo 0c5bcb3f7b issue #1702:fix a typo error 2013-02-06 18:04:40 +08:00
dualface 5904512ac6 add CCFileUtils Lua support 2013-02-04 12:41:24 +08:00
minggo 744bfb3cb2 Merge pull request #1945 from dualface/add_CCLuaObjcBridge 
add CCLuaObjcBridge
 2013-02-03 19:32:17 -08:00
dualface 74e497bb2b restore CCLuaEngine missed methods 2013-02-04 11:28:09 +08:00
dualface 7839ceb45b add CCLuaObjcBridge 2013-02-02 02:05:52 +08:00
James Chen 3a9346e6ff issue #1687: Refactoring CCFileUtils, abstracting the same implementations for all platforms. 2013-02-01 11:20:46 +08:00
James Chen c80d438110 issue #1683: Exporting `fullPathForFilename` to Lua. 2013-01-27 20:26:04 +08:00
James Chen f2303b854a Fixed a typo, and regenerated luabinding codes. 2013-01-23 15:59:13 +08:00
James Chen 5a41e1fc86 fixed compilation errors for lua project. Rebuild LuaCocos2d.cpp. 2013-01-22 14:40:54 +08:00
minggo ffd0ca6c0e Merge pull request #1804 from dualface/fix_ccassert_lua_compatibility 
[luabinding] fix CCAssert Lua compatibility
 2013-01-03 23:51:47 -08:00
dualface e74e597dba [luabinding] fix CCAssert Lua compatibility 2012-12-30 02:27:25 +08:00
dualface d1e39a9c00 [luabinding] add CCDirector::setDisplayStats() 2012-12-29 11:16:07 +08:00
minggo 0adc6abe30 Merge pull request #1776 from dualface/make_ccassert_compatible_lua 
[luabinding] make CCAssert compatible Lua
 2012-12-26 23:28:32 -08:00
James Chen 023b32a618 issue #1625: Updated LuaCocos2d.cpp. 2012-12-27 11:48:14 +08:00
dualface 57bccc7e4a remove CC_LUA_ENGINE_ENABLED macro 2012-12-26 18:33:55 +08:00
dualface cc69e39c8a [luabinding] make CCAssert compatible Lua 2012-12-22 10:13:37 +08:00
dualface f815cdc423 merge gles20 2012-12-10 17:00:16 +08:00
dualface 268aa45d2c rename CCNode:scheduleUpdateScriptHandlerWithPriority() to CCNode::scheduleUpdateWhitPriorityLua() 
remove unused functions
 2012-12-10 16:09:23 +08:00
dualface 77d4da6e22 [lua] remove va_list 2012-12-10 14:28:26 +08:00
dualface b6e605b9ae [lua] fix CCSequence export 2012-12-10 14:19:18 +08:00
dualface 4ca6cf8c7a [lua] update LuaCocos2d.cpp 2012-12-10 14:09:00 +08:00
dualface c8753f72ef [scripting] add CCNode::scheduleUpdateScriptHandlerWithPriority() 2012-12-10 13:48:27 +08:00
minggo 75845b56c0 Merge pull request #1694 from dualface/update_luabinding 
Update luabinding
 2012-12-03 18:59:23 -08:00
dualface 0e65257bc2 [luabinding] remove duplicate ccLanguageType 2012-12-02 16:17:17 +08:00
dualface 5bc95780c0 update luabinding 2012-12-02 15:48:15 +08:00
dualface e0ee27cb17 [luabinding] fix CCLayer:getScriptTOuchHandlerEntry() 
[luabinding] add CCLayer keypad, accelerometer support
 2012-12-02 15:17:34 +08:00
minggo 542c407346 make lua work 2012-11-23 10:36:26 +08:00
fape 355d8df79e fix compile: rename kOrientation to kCCTransitionOrientation 2012-11-17 19:02:04 +01:00
James Chen ceced09c2d CCLuaEngine::executeAccelerometerEvent return 0 by default. 2012-11-12 10:37:42 +08:00
James Chen 21e4f80fbd Added "executeAccelerometerEvent" for CCScriptEngineProtocol class. Exported Accelerometer event to JS. 2012-11-06 14:18:13 +08:00
James Chen 8ed7d63309 Updated LuaBindings codes since CCEGLViewProtocol::getSize has been renamed to CCEGLViewProtocol::getDesignResolutionSize. 2012-10-30 10:35:19 +08:00
James Chen 99a7dcefa4 issue #1486: Updated lua bindings. 2012-10-12 16:04:26 +08:00
dualface 8d104b8244 [Lua] add CCApplication:getTargetPaltform() 2012-09-25 16:43:36 +08:00
dualface a2b468f2b3 [Lua] fix CCActionInterval, CCFiniteTimeAction, CCAction declare 2012-09-25 16:27:54 +08:00
dualface 46a8eb5491 [Lua] add ccTexParams, add new luabinding build script, update luabinding 2012-09-20 23:37:23 +08:00
dualface 1313398335 [Lua] fix lua function reference error 2012-09-20 23:22:45 +08:00
dualface eba97a9b1e [Lua] fix luabinding overloaded functions 2012-09-17 14:40:42 +08:00
dualface 515ec3c482 ccDrawCircle() add scaleX and scaleY 2012-09-14 18:00:11 +08:00