James Chen
|
190e6c1de5
|
Merge branch 'linux-lua' of https://github.com/dumganhar/cocos2d-x into lua-linux
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
|
2012-12-10 17:25:23 +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 |
James Chen
|
6a7a365365
|
Updated eclipse project configurations for linux
|
2012-12-06 14:57:03 +08:00 |
James Chen
|
b044a89d6f
|
Merge branch 'gles20' of https://github.com/ivzave/cocos2d-x into linux-lua
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
|
2012-12-06 14:55:18 +08:00 |
minggo
|
75845b56c0
|
Merge pull request #1694 from dualface/update_luabinding
Update luabinding
|
2012-12-03 18:59:23 -08:00 |
minggo
|
bbcbfa71ef
|
Merge pull request #1704 from minggo/cclayer_script_support
Cclayer script support
|
2012-12-03 18:55:11 -08:00 |
James Chen
|
9f168faeb0
|
Merge pull request #1696 from fape/lua_marmalade
fixed #1591: Update for Lua marmalade.
* Add ignore marmalade generated Visual Studio directory
* Update Lua and HelloLua marmalade project file
* Add TestLua marmalade project
|
2012-12-03 18:51:39 -08:00 |
fape
|
aac98975da
|
update lua marmalade project
|
2012-12-02 15:29:10 +01: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
|
308a01e629
|
[luabinding] add tolua.isnull()
|
2012-12-02 15:29:00 +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 |
minggo
|
33529afc07
|
Merge pull request #1592 from fape/luaCocos2d
fix compile: rename kOrientation to kCCTransitionOrientation
|
2012-11-19 17:36:25 -08:00 |
ivzave
|
28ca22bfde
|
added lua support for linux platform
|
2012-11-19 14:56:02 +04:00 |
James Chen
|
f2e0df4de3
|
issue #1565: Removed VS2008 support.
|
2012-11-19 14:42:27 +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
|
833b5b1be8
|
Merge branch 'gles20' of https://github.com/mrmop/cocos2d-x into iss1557-marmalade
Conflicts:
cocos2dx/base_nodes/CCNode.cpp
cocos2dx/sprite_nodes/CCSprite.cpp
samples/TestCpp/Classes/TouchesTest/Ball.cpp
samples/TestCpp/Classes/VisibleRect.cpp
samples/TestCpp/Classes/VisibleRect.h
|
2012-11-12 10:20:04 +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 |
Mat Hopwood
|
2b265929e2
|
Marmalade Sample data removed and merged changes
* Marmalade samples now use Resources folder, excess data removed
* Merged in James' changes
* CCNode::updateTransform() added
|
2012-10-25 21:40:37 +01:00 |
Mat Hopwood
|
24115675b0
|
Marmalade Cocos2d-x Main Repo Changes
These are changes to the main Cocos2d-x repo that Marmalade would like
to request for inclusion in the main repo
|
2012-10-19 16:38:58 +01:00 |
Mat Hopwood
|
988835560d
|
Marmalade Support
Full Marmalade support added for Cocos2d-x
|
2012-10-19 16:26:34 +01:00 |
johnangel
|
a2e1400402
|
Merge remote branch 'upstream/gles20' into gles20
|
2012-10-16 08:42:30 +02:00 |
James Chen
|
99a7dcefa4
|
issue #1486: Updated lua bindings.
|
2012-10-12 16:04:26 +08:00 |
johnangel
|
ad7dacc281
|
Merge remote branch 'upstream/gles20' into gles20
|
2012-10-08 16:35:43 +02: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 |
johnangel
|
fdec1ba4b9
|
Fixing include paths to be able to compile cocos2d-x using
external Visual Studio solution, without copying all files
|
2012-09-15 16:34:31 +02:00 |
dualface
|
515ec3c482
|
ccDrawCircle() add scaleX and scaleY
|
2012-09-14 18:00:11 +08:00 |
YuLei
|
9de34c4f07
|
[Lua] remove unused codes
|
2012-09-11 17:13:45 +08:00 |
YuLei
|
214d4e7623
|
[Lua] remove CCLuaEngine::purgeDefaultEngine()
|
2012-09-11 16:11:42 +08:00 |
YuLei
|
fc3a55a065
|
[Lua] move LUA_FUNCTION, LUA_TABLE, LUA_STRING declare to CCLuaEngine.h
|
2012-09-11 15:44:33 +08:00 |
YuLei
|
a2259ab0dd
|
[Lua] update CCLuaEngine for new script binding protocol
|
2012-09-11 15:24:25 +08:00 |
James Chen
|
7d8b261ced
|
fixed #1477: Abstracts Lua and JS binding protocol, some bugs fixes in lua-binding, adding custom menu on win32 and mac for switching resolutions.
|
2012-09-11 14:02:33 +08:00 |
YuLei
|
a22122d0ed
|
[Lua] fix: CCCallFunc : public CCActionInstant declare typo error
|
2012-09-07 19:19:50 +08:00 |
YuLei
|
9d2b0b04f2
|
[Lua] update luabinding for CCPoint, CCSize, CCRect
|
2012-09-05 14:49:26 +08:00 |
YuLei
|
39b019b2cb
|
[Mac] fix CC_ASSERT error
[Mac] add CC_DISABLE_ASSERT check
[cocos2d-x] CCSprite::createWithSpriteFrame() check pSpriteFrame
|
2012-09-04 11:16:59 +08:00 |
YuLei
|
c86595ddde
|
[Lua] remove glLineWidth()
|
2012-09-02 01:18:28 +08:00 |
YuLei
|
6f3833af73
|
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
|
2012-09-02 00:56:27 +08:00 |
YuLei
|
da79992275
|
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
|
2012-09-02 00:38:57 +08:00 |