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

222 Commits

Author SHA1 Message Date
CocosRobot f7e87f2269 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2012-12-07 09:51:17 +08:00
CocosRobot fe9e6ba688 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2012-12-06 17:22:53 +08:00
James Chen 34eb3a88c2 Commented JS_SetGCZeal. 2012-12-04 17:23:08 +08:00
James Chen b5ae1f6d2a Updated MoonWarriors/Classes/AppDelegate.cpp. 
Updated the submodule reference of cocos2d-js-tests to the latest one.
Fixed duplicate define in js_bindings_ccbreader.cpp.
 2012-12-04 11:36:45 +08:00
CocosRobot 545002b3a9 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2012-12-04 10:59:58 +08:00
minggo 4e7fca3185 merge dualface's pull request for fixing CCLayer script support and fix error for js-binding 2012-12-04 10:52:49 +08:00
James Chen 7c074d4ced issue #1550: fixed a memory leak in jsbinding. 2012-12-03 22:17:53 +08:00
James Chen 478791a472 Added CCBReader::setCCBRootPath. 2012-12-03 18:27:50 +08:00
James Chen f6185844a9 fixed #1588: Get the right js callback function in js_CCScheduler_schedule. 2012-12-03 15:59:29 +08:00
James Chen d97dfe162a fixed #1588: RescheduleCallback support for JSBinding. 2012-12-03 15:33:36 +08:00
James Chen 399fb53452 fixed #1586: Native object need to be an autorelease object. 2012-12-01 11:41:51 +08:00
James Chen e3615e2fb1 fixed #1586: Invoking removeAllRoots in ScriptingCore destructor to avoid crash when app exits. 2012-12-01 11:41:50 +08:00
James Chen 36bc0ab0bb Invoking JS_SetGCZeal only when the macros DEBUG and JS_GC_ZEAL is defined. 2012-12-01 11:41:50 +08:00
Rohan Kuruvilla 745392ad6c Changing chipmunk manual bindings to fix GC issues 2012-11-30 16:08:19 -08:00
CocosRobot 3533358049 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2012-11-30 22:20:22 +08:00
James Chen 07661a1e21 issue #1581: Added jsb_set_reserved_slot and jsb_get_reserved_slot, 2012-11-30 22:00:30 +08:00
James Chen 15d02e4db8 Merge branch 'iss1581-fix-jsbinding-bugs' of https://github.com/dumganhar/cocos2d-x into iss1583-js-tests 
Conflicts:
	scripting/javascript/bindings/cocos2d_specifics.cpp
 2012-11-30 21:43:44 +08:00
James Chen 95875112fa Merge branch 'iss1583-js-tests' of https://github.com/dumganhar/cocos2d-x into iss1583-js-tests 2012-11-30 21:19:19 +08:00
James Chen 26790eb17a issue #1583: Added some Macros as follows: 
cc.MENU_STATE_WAITING = 0;
cc.MENU_STATE_TRACKING_TOUCH = 1;
cc.MENU_HANDLER_PRIORITY = -128;
cc.DEFAULT_PADDING = 5;
 2012-11-30 21:15:54 +08:00
James Chen 0d93f2d651 issue #1583: Bind cc.Menu.alignItemsInRows, cc.Menu.alignItemsInColums, cc.LayerMultiplex.create 2012-11-30 21:15:01 +08:00
James Chen 96e2707f39 issue #1583: Added jsvals_variadic_to_ccarray function. 2012-11-30 21:12:14 +08:00
James Chen e8c5f5f38c Added CCTexture2D::setTexParameters binding. 
Fixed pass one more argument in JSCallFuncWrapper::callbackFunc if extraData is void.
 2012-11-30 18:15:29 +08:00
minggo bb6e03bd3f Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1583-update-js 2012-11-30 17:42:51 +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 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
CocosRobot 9e929019c3 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2012-11-28 11:53:56 +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 e0948a4817 fixed #1576: Sync CCBReader to latest version, CCString* --> std::string, CocosBuilderTest crash fixes. 2012-11-26 21:51:05 +08:00
CocosRobot 0ec7f873fe cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2012-11-26 10:40:03 +08:00
James Chen 7c1e860d78 issue #1573: Added CocosDragonJS. Made it compiled ok on iOS,android and win32. 2012-11-23 15:09:03 +08:00
Rohan Kuruvilla 36bbd80b68 Adding changes to CCBreader 2012-11-23 15:08:55 +08:00
James Chen c32ea4486b issue #1572: WatermelonWithMe works on Android now. 2012-11-22 18:46:30 +08:00
James Chen ee97633a4f Merge pull request #1637 from dumganhar/gles20 
Minor fix in ScriptingCore::log;Avoiding pointer point to a destroyed variable.
 2012-11-22 01:53:57 -08:00
James Chen c0097db48c Avoiding pointer point to a destroyed variable. 2012-11-22 17:36:49 +08:00
James Chen 692d16f296 Minor fix in ScriptingCore::log. 2012-11-22 17:34:58 +08:00
CocosRobot 10ceef62dc cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2012-11-22 17:22:19 +08:00
CocosRobot ce19b26771 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2012-11-22 15:38:09 +08:00
James Chen b66bc98a46 issue #1564: Made ChipmunkTest of TestJavascript works 2012-11-22 15:19:16 +08:00
James Chen 51d61ba214 issue #1564: fix the wrong order of parameters in CCScheduler::scheduleSelector. 
Made MoonWarriors works.
 2012-11-22 12:05:38 +08:00
James Chen 1ce1b4b471 issue #1564: Closed verbose log of TestJavascript for android. And Made it compiled ok. 2012-11-22 10:47:57 +08:00
James Chen 89a51433b8 issue #1564: Make TestJavascript works on windows. 2012-11-22 10:24:26 +08:00
CocosRobot c991b0b6b0 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2012-11-21 21:46:28 +08:00
James Chen 9abb63b670 Merge pull request #1589 from funkaster/gles20 
fixed #1570: Improves the debugger for JSBindings.
 2012-11-21 05:32:24 -08:00
James Chen b73b30d1b0 issue #1564: Deleted duplicated declare in ScriptingCore.h 2012-11-20 16:26:06 +08:00
James Chen 28b692279e issue #1564: Deleted CCPhysicsSprite in jsbindings since it's supported at Extension. 2012-11-20 16:20:16 +08:00
Rolando Abarca d9baa8a24d fixes merge conflict 2012-11-19 11:23:08 -08:00
Rolando Abarca ac539667f4 Merge remote-tracking branch 'origin/gles20' into gles20 
Conflicts:
	scripting/javascript/bindings/ScriptingCore.cpp
	scripting/javascript/bindings/js_bindings_chipmunk_manual.cpp
 2012-11-16 09:44:34 -08:00
James Chen 0223c0d70a issue #1555: Minor fixes. 2012-11-16 19:38:25 +08:00
James Chen 34f359384c issue #1530: Minor fixes in ScriptingCore.cpp, js_bindings_chipmunk_auto_classes.cpp and js_bindings_chipmunk_funcitons.cpp. 2012-11-16 15:58:20 +08:00
Rohan Kuruvilla f7848eb171 Adding Object Oriented Chipmunk JS bindings 2012-11-16 15:56:29 +08:00
Rohan Kuruvilla 6d59009953 Adding executeAccelerometerEvent for to CCScriptSupport and ScriptingCore 2012-11-16 15:56:29 +08:00
Rohan Kuruvilla 39a4e6a19e Fixing bindings bug for CCScheduler. Also adding custom bindings for TMXLayer. Also updating ini 2012-11-16 15:56:27 +08:00
Rohan Kuruvilla 66f85468e5 Adding JS conversion of CCDictionary objects, also modified CCArray conversion 2012-11-16 15:56:27 +08:00
Rohan Kuruvilla 672bed3ed0 Updating bindings for ONE_BY_ONE touch handling 2012-11-16 15:56:27 +08:00
Rohan Kuruvilla f9aea7befe Changing parameter ordering for callbacks (making thisObj optional). Also adding custom bindigns for CCScheduler 2012-11-16 15:56:26 +08:00
Rolando Abarca 6e9d2e808c improved debugger 2012-11-15 11:14:57 -08:00
Rolando Abarca c9df076378 new JSStringWrapper 2012-11-15 11:14:37 -08:00
Rolando Abarca 2ea2cb616c adds compartment code to chipmunk 2012-11-15 11:13:32 -08:00
Rolando Abarca b894524ed0 removing some warnings 2012-11-15 11:13:21 -08:00
CocosRobot cfd84b3fe6 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2012-11-08 22:53:19 +08:00
CocosRobot b72c48f4c5 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2012-11-06 17:01:34 +08:00
James Chen 449c719d96 issue #1549: Added "ccdictionary_to_jsval" function, now TMXOrthoObjectsTest and TMXIsoObjectsTest don't crash. 2012-11-06 16:11:45 +08:00
James Chen 21e4f80fbd Added "executeAccelerometerEvent" for CCScriptEngineProtocol class. Exported Accelerometer event to JS. 2012-11-06 14:18:13 +08:00
CocosRobot 5efdb93ef7 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2012-11-06 10:12:52 +08:00
James Chen ceb4371f12 issue #1549: Using new JS API for MoonWarriors. 
Updated the logics of js_cocos2dx_CCMenuItemSprite_create and js_cocos2dx_CCMenuItemImage_create.
 2012-11-05 23:22:59 +08:00
CocosRobot 7de31acd38 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2012-11-05 18:50:00 +08:00
James Chen 10ba589ed5 issue #1549: * Arguments in callbacks: 
instead of: callback(this, func), it is now:callback( func, [this] )
 2012-11-05 18:44:28 +08:00
CocosRobot da457732b9 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2012-11-02 18:56:53 +08:00
James Chen f88aa5058d Merge branch 'gles20' of https://github.com/rohankuruvilla/cocos2d-x into rohan-ccb 
Conflicts:
	scripting/javascript/bindings/cocos2d_specifics.cpp
	scripting/javascript/bindings/cocos2d_specifics.hpp
	tools/tojs/cocos2dx.ini
 2012-11-02 18:15:25 +08:00
CocosRobot 2bba105453 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2012-11-02 15:38:46 +08:00
James Chen f031a09e77 Added cc.TMXLayer.getTileFlagsAt to jsbindings. 2012-11-02 15:21:44 +08:00
James Chen d2a9acd227 issue #1530: Two memory leaks fixes. 2012-11-01 16:06:05 +08:00
James Chen 026662ee5f issue #1530: Assigned JSVAL_VOID to member variables for JSCallbackWrapper class. 2012-11-01 15:45:22 +08:00
Rohan Kuruvilla b3c6f1a2e1 Adding bindings for CCBReader and other improvements. 
1. Added additional CCBReader bindings, including callback support for animationCompleted
2. Improved design for JS CallbackWrappers
3. Added bindings for pDistance
4. Updating cocos2dx.ini
 2012-11-01 15:34:23 +08:00
Rohan Kuruvilla ea92936c1f Adding bindings for CCBReader and other improvements. 
1. Added additional CCBReader bindings, including callback support for animationCompleted
2. Improved design for JS CallbackWrappers
3. Added bindings for pDistance
4. Updating cocos2dx.ini
 2012-11-01 00:08:01 -07:00
Rohan Kuruvilla dc51a78981 Updating bindings for CCBReader. It is now very similar to cocos2d-iphone CCBReader bindings 2012-11-01 00:06:24 -07:00
Rohan Kuruvilla 2fbb748b7c Adding sections for CCBReader bindings generation as well as renaming other bindings 2012-11-01 00:06:24 -07:00
James Chen bdbb70bea5 Merge branch 'gles20' of https://github.com/funkaster/cocos2d-x into js-surith-gnu 2012-10-31 10:04:35 +08:00
CocosRobot e3304e44ba cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2012-10-29 18:22:46 +08:00
Rohan Kuruvilla 8f026d0b21 Fixing Javascript bindings Android makefile to include extensions 2012-10-29 15:15:00 +08:00
Rohan Kuruvilla 6773dc4154 Adding object roots for extra parameter of CallFunc and schedule 2012-10-29 15:14:25 +08:00
Rohan Kuruvilla 5760ea305c Fixing CallFuncN bindings to properly pass optional third parameter 2012-10-29 15:14:11 +08:00
Rohan Kuruvilla 094d52664d Fixing bug in CCNode::copy bindings. Fixes MoonWarriors crash 2012-10-29 15:10:29 +08:00
James Chen 1ede7b6434 Modifying action/schedules cleanup, ignoring libjs_static.a of debugging version. 2012-10-29 15:10:13 +08:00
Rohan Kuruvilla a409fc0164 Fixing CallFunc bindings to support easier cleanup 2012-10-29 15:07:27 +08:00
Rohan Kuruvilla f8fc7328d7 Fixing bug in bindings for MenuItemImage 2012-10-29 15:06:56 +08:00
Rohan Kuruvilla c24acd4733 Changing ScriptingCore flow of execution of targetted Touch events 2012-10-29 15:06:34 +08:00
Rohan Kuruvilla 7ede1373f7 Adding function to cleanup actions and schedule to ScriptingCore 2012-10-29 15:06:10 +08:00
James Chen 0ce4f61bb6 Updating submodule reference to latest autogenerated bindings. 2012-10-26 10:04:29 +08:00
James Chen 26f7b36797 update submodule for JS-Bindings auto-gen codes. 2012-10-25 11:40:24 +08:00
Rolando Abarca 463ae31180 upgrades to new spidermonkey API 
FF beta - this fixes the auto-compartment issue
 2012-10-24 11:14:15 -07:00
Rolando Abarca 003f6e4cf3 fixes ScriptingCore for FF 16 API 2012-10-19 09:54:21 -07:00
James Chen 871541ac6b Updated one comment. 2012-10-19 15:03:10 +08:00
James Chen e5096ce091 Made TestJavascript and MoonWarriors work ok on android after merging Rolando's commit. 2012-10-19 15:01:05 +08:00
James Chen 1a373f70ff issue #1517: Upgrading js engine to FF 16.0.1 for IOS. 2012-10-19 13:41:03 +08:00