Commit Graph

6480 Commits

Author SHA1 Message Date
James Chen 788b478b3c Make sure HelloCpp can be full screen. 2012-11-29 16:31:29 +08:00
James Chen a37cc8a098 Updated jsb_constants_chipmunk.js and jsb_constants_cocosbuilder.js. 2012-11-29 15:29:58 +08:00
James Chen 494806167b Temporary commit. 2012-11-29 15:26:24 +08:00
James Chen 208132895e issue #1583: Moved the common js codes to scripting/javascript/bindings/js folder. Deleted the old js sample resources. 2012-11-29 11:27:39 +08:00
James Chen 358e47e981 issue #1583: Updated the submodule reference of cocos2d-js-tests. 2012-11-29 11:27:16 +08:00
James Chen e7219058af Merge pull request #1671 from dumganhar/gles20
fixed #1582: A logic bug in CCBAnimationManager::setAnimatedProperty.
2012-11-28 19:09:05 -08:00
James Chen 10195d0215 fixed #1582: A logic bug in CCBAnimationManager::setAnimatedProperty. 2012-11-29 11:07:06 +08:00
James Chen bb4b3fb4bc issue #1581: Deleted JS_AddObjectRoot when construct a JS array since JS_SetElement will not trigger a GC. 2012-11-29 11:01:32 +08:00
Rohan Kuruvilla a4b55b5217 Fixing Accelerometer crash on Android 2012-11-28 15:56:57 -08:00
James Chen a4762605b8 issue #1581: Removed some unused codes. 2012-11-28 22:24:12 +08:00
James Chen a814066601 issue #1581: JSBinding bug fixes.
Some fixes of JSBinding codes:
[1] Check whether the proxy was already added in JS_NEW_PROXY
[2] In struct schedFunc_proxy_t, JSScheduleWrapper* --> CCArray*
Reason: One js function may correspond to many targets. To debug this, you could refer to JSScheduleWrapper::dump function. It will prove that i'm right. :)
[3] In ScriptingCore::cleanupSchedulesAndActions function, we must invoke unschedule for all targets and remove the proxy both in _schedFunc_target_ht and _schedTarget_native_ht, otherwise the hash tables will grow bigger and bigger, so I added a new function JSScheduleWrapper::removeAllTargetsForNatiaveNode to make this things easier.
[4] To easily find out the bugs of binding codes, I add JS_SetGCZeal in ScriptingCore::createGlobalContext, it only works in DEBUG mode.
[5] In js_cocos2dx_CCNode_getChildren, we should add the generated array to root to avoid gc happen when invoking JS_SetElement.
[6] The JSCallFuncWrapper isn't needed since an action will be run by a cc.Node and it will be released at the CCNode::cleanup.
[7] Some improvements of JSScheduleWrapper class.
[8] Added a new function JSScheduleWrapper::setTarget, it's for js_CCNode_unschedule to find out which target need to be unscheduled.
[9] Commented JS_SetReservedSlot in js_CCNode_scheduleOnce and js_CCNode_schedule.
Reason:
For js_CCNode_scheduleOnce: Don't add the callback function to the reserved slot of this js object.Since the class of js object may be inherited from cocos class(e.g. cc.Sprite). The subclass will not contain reserved slots. It will crash if invoking this.
For js_CCNode_schedule: Don't add js callback function to the reserved slot of scheduler js object. Since the scheduler is an object always rooted.
So the callback function might not be released when gc comes.I looked inside the implementation of cc.Node.schedule, and it doesn't use JS_SetReservedSlot there.
2012-11-28 22:04:55 +08:00
Taro Kobayashi 3a814de07e implemented CCApplication::getCurrentLanguage() for linux platform 2012-11-28 19:41:50 +09:00
Taro Kobayashi 472ce4f9f3 add kLanguageKorean and kLanguageJapanese for lua binding 2012-11-28 18:21:06 +09:00
Taro Kobayashi a37e034e61 added support for Japanese language 2012-11-28 17:53:10 +09:00
James Chen cccd9d5294 Merge pull request #1664 from CocosRobot/updategeneratedsubmodule_1354074829
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2012-11-27 19:55:27 -08:00
CocosRobot 9e929019c3 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2012-11-28 11:53:56 +08:00
James Chen 40e8073167 Merge pull request #1663 from dumganhar/gles20
Updated the submodule reference of cxx-generator. Bind some functions for js:
2012-11-27 19:51:08 -08:00
James Chen 95ccf17739 Bind some functions for js:
void runAnimationsForSequenceNamedTweenDuration(const char *pName, float fTweenDuration);
    void runAnimationsForSequenceNamed(const char *pName);
    void runAnimationsForSequenceIdTweenDuration(int nSeqId, float fTweenDuraiton);
2012-11-28 11:49:20 +08:00
Lu Guanqun f64774ec6c when user specified 'group' parameter, it should be parsed as an 'int'
Otherwise, when we do slicing, it would report type error.
2012-11-27 15:11:43 +08:00
minggo 33647ccebb Merge pull request #1660 from minggo/gles20
make CocosGragon work on iOS devices with debug mode
2012-11-26 19:57:37 -08:00
minggo 09344d55be make CocosGragon work on iOS devices with debug mode 2012-11-27 11:55:59 +08:00
James Chen 342c7bc724 Merge pull request #1657 from fape/cocos_extensions_marmalade
fixed #1578: Create cocos2dx-ext marmalade project.
2012-11-26 19:15:06 -08:00
James Chen 0ce47db8f1 Merge pull request #1648 from CocosRobot/updategeneratedsubmodule_1353897594
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2012-11-26 19:13:05 -08:00
James Chen 24d6a1658d Merge pull request #1659 from dumganhar/gles20
fixed #1577: Fix touch event lost on Win32, the reason is that:
Cocos2d-x is using touch event callback for all platforms, it's different from cocos2d-iphone which uses mouse event for Mac port. So we just need to touch event by using kCCBPlatformIOS.
2012-11-26 19:09:24 -08:00
James Chen de8be8561e minor fix for a comment. 2012-11-27 11:05:52 +08:00
James Chen 8d55abd432 fix touch event lost on Win32, the reason is that:
Cocos2d-x is using touch event callback for all platforms, it's different from cocos2d-iphone which uses mouse event for Mac port. So we just need to touch event by using kCCBPlatformIOS.
2012-11-27 11:03:12 +08:00
James Chen 8dffd457db Merge pull request #1658 from dumganhar/gles20
fixed #1576: Fixed CocosBuilderTest/AnimationTest crash, fixed some memory leaks in CCBReader.cpp.
2012-11-26 18:28:46 -08:00
James Chen 9bd3014137 Fixed CocosBuilderTest/AnimationTest crash, fixed some memory leaks in CCBReader.cpp. 2012-11-27 10:26:40 +08:00
fape 1843d576d8 create cocos2dx-ext marmalade project 2012-11-26 20:14:10 +01:00
James Chen 277fefd386 Merge pull request #1656 from dumganhar/gles20
fixed #1576: CCNode::setUserObject needs to be retained.
2012-11-26 06:12:47 -08:00
James Chen d7ebd681ec fix a warning in CCRenderTexture. 2012-11-26 22:11:56 +08:00
James Chen be914811fb fixed #1576: CCNode::setUserObject needs to be retained. 2012-11-26 22:11:04 +08:00
James Chen f9b8e846b1 Merge pull request #1655 from dumganhar/gles20
fixed #1576: Updated CocosBuilderTest.
2012-11-26 06:01:04 -08:00
James Chen e248d9d472 fixed #1576: Updated CocosBuilderTest. 2012-11-26 22:00:25 +08:00
James Chen ebc20e02b3 Merge pull request #1654 from dumganhar/gles20
fixed #1576: Sync CCBReader to latest version, CCString* --> std::string, CocosBuilderTest crash fixes.
2012-11-26 05:54:27 -08:00
James Chen e0948a4817 fixed #1576: Sync CCBReader to latest version, CCString* --> std::string, CocosBuilderTest crash fixes. 2012-11-26 21:51:05 +08:00
minggo 900fdb53e8 Merge pull request #1653 from minggo/gles20
give a guide information to run Box2dTest
2012-11-26 01:27:34 -08:00
minggo 8063b9b9fb give a guide information to run Box2dTest 2012-11-26 17:23:36 +08:00
minggo 69f6b3970a Merge pull request #1647 from guanqun/fix-doxygen
Fix doxygen related errors and warnings
2012-11-25 23:26:48 -08:00
minggo 418bb788d6 Merge pull request #1652 from minggo/gles20
Gles20
2012-11-25 23:25:22 -08:00
minggo 735815240a Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-11-26 15:18:44 +08:00
minggo 6bb11d8d71 Merge branch 'gles20' of https://github.com/minggo/cocos2d-x into gles20 2012-11-26 15:09:34 +08:00
minggo bd025c94c3 use macro CC_TARGET_OS_IPHONE instead of TARGET_OS_IPHONE and make xcode template work ok 2012-11-26 15:08:40 +08:00
minggo 832f9180b6 Merge pull request #1651 from minggo/gles20
issue #1564:work ok on linux
2012-11-25 19:50:36 -08:00
minggo 1b9a38e195 issue #1564:work ok on linux 2012-11-26 11:46:37 +08:00
CocosRobot 0ec7f873fe cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2012-11-26 10:40:03 +08:00
James Chen a730f8866f Merge pull request #1644 from fape/testcpp_marmalade
fixed #1575: Update samples/TestCpp to compatible with marmalade
2012-11-25 17:51:32 -08:00
James Chen 79cfe38d40 Merge pull request #1645 from fape/marmalade_language
fixed #1574: Update marmalade languages.
2012-11-25 17:48:48 -08:00
Lu Guanqun 0f2d8f8c6b fix the doxygen warnings
cocos2d-x.git/extensions/network/HttpClient.h:64: warning: The following parameters of cocos2d::extension::CCHttpClient::setTimeoutForConnect(int value) are not documented:
  parameter 'value'
cocos2d-x.git/extensions/network/HttpClient.h:79: warning: argument 'timeout' of command @param is not found in the argument list of CCHttpClient::setTimeoutForRead(int value)
cocos2d-x.git/extensions/network/HttpClient.h:79: warning: The following parameters of cocos2d::extension::CCHttpClient::setTimeoutForRead(int value) are not documented:
  parameter 'value'
2012-11-25 23:27:29 +08:00
Lu Guanqun 64bec838c0 fix doxygen rendering output of CCLayerGradient
Otherwise, the first line of CCLayerGradient is rendered with a box in
doxygen's output.
2012-11-25 23:27:29 +08:00