9bd302e35b
fixed #1627 : VS version check in project file.
2012-12-29 13:54:46 +08:00
0adc6abe30
Merge pull request #1776 from dualface/make_ccassert_compatible_lua
...
[luabinding] make CCAssert compatible Lua
2012-12-26 23:28:32 -08:00
38e5b67cb5
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2012-12-27 13:43:19 +08:00
7d9f06b48c
fixed #1625 : Updated TestCpp. 'ccg' --> 'CCSizeMake' . And exchanged the parameter order for 3D action tests.
2012-12-27 10:55:25 +08:00
09b1d9f520
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into make_ccassert_compatible_lua
2012-12-26 18:37:51 +08:00
57bccc7e4a
remove CC_LUA_ENGINE_ENABLED macro
2012-12-26 18:33:55 +08:00
a6ded65f59
Added COCOS2D_DEBUG=1 for libJSBinding.vcxproj of debug mode.
2012-12-25 11:33:36 +08:00
bdb4df293b
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1602-jsb-sys
2012-12-25 10:01:48 +08:00
3de95c9362
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2012-12-25 09:54:52 +08:00
cc7d383737
fixed #1622 : Crash occurs when cc.Node.getChildren is invoked if there are no children.
2012-12-24 11:55:04 +08:00
22a2b34637
issue #1620 : Made sys.localStorage support for jsb, works ok on android.
2012-12-24 11:46:27 +08:00
f26ce4fb84
Made sys.localStorage support for jsb, works ok on win32.
2012-12-21 18:07:45 +08:00
9a0a5e6b31
issue #1603 : fixed some warnings.
2012-12-20 17:18:49 +08:00
1562658bd8
issue #1603 : Added libJSBinding project for win32 platform.
2012-12-20 17:18:02 +08:00
e8c0844dd5
fixed #1617 : Some improvements for JS Bindings.
...
1) Changed cc.REPEAT_FOREVER = - 1 to cc.REPEAT_FOREVER = 0xffffffff
[Reason]: If cc.REPEAT_FOREVER = -1, it will be a very big double value after converting it to double by JS_ValueToNumber on android.
Then cast it to unsigned int, the value will be 0. The schedule will not be able to work.
I don't know why this occurs only on android.
[Solution]: Instead of passing -1 to it, I assign it with max value of unsigned int in c++.
2) Added two helper function, cc.ArrayGetIndexOfObject and cc.ArrayContainsObject.
3) Added JSScheduleWrapper::removeTargetForNativeNode to avoid memory leaks.
4) Improvments for JSTouchDelegate. Added four functions as follows:
// Set the touch delegate to map by using the key (pJSObj).
static void setDelegateForJSObject(JSObject* pJSObj, JSTouchDelegate* pDelegate);
// Get the touch delegate by the key (pJSObj).
static JSTouchDelegate* getDelegateForJSObject(JSObject* pJSObj);
// Remove the delegate by the key (pJSObj).
static void removeDelegateForJSObject(JSObject* pJSObj);
void unregisterTouchDelegate();
And exported cc.unregisterTouchDelegate(); to js.
Fix a memory leak for JSTouchDelegate by making it as an autorelease object.
5) Don't add js callback function to the reserved slot of object.
[Reason]: The target object may execute more than one schedule.
Therefore, previous js callback function will be replaced
by the current one. For example:
this.scheduleOnce(function() { temporary function 1 }, 0.5);
this.scheduleOnce(function() { temporary function 2 }, 0.5);
In this case, the temporary function 1 will be removed from reserved slot 0.
And temporary function 2 will be set to reserved slot 0 of this object.
If gc is triggered before the JSScheduleWrapper::scheduleFunc is invoked,
crash will happen. You could simply reproduce it by adding jsc.garbageCollect(); after scheduleOnce.
[Solution] Because one schedule corresponds to one JSScheduleWrapper, we root
the js callback function in JSScheduleWrapper::setJSCallbackFunc and unroot it
at the destructor of JSScheduleWrapper.
2012-12-18 11:56:44 +08:00
13b04e3ee4
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2012-12-17 15:26:28 +08:00
e7328cf3ba
fixed #1614 : DrawNodeTest crashes on JSB.
2012-12-14 10:31:31 +08:00
9537389949
Added cc.DrawNode.extend.
2012-12-12 21:49:29 +08:00
268aa45d2c
rename CCNode:scheduleUpdateScriptHandlerWithPriority() to CCNode::scheduleUpdateWhitPriorityLua()
...
remove unused functions
2012-12-10 16:09:23 +08:00
c8753f72ef
[scripting] add CCNode::scheduleUpdateScriptHandlerWithPriority()
2012-12-10 13:48:27 +08:00
f7e87f2269
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2012-12-07 09:51:17 +08:00
fe9e6ba688
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2012-12-06 17:22:53 +08:00
34eb3a88c2
Commented JS_SetGCZeal.
2012-12-04 17:23:08 +08:00
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
545002b3a9
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2012-12-04 10:59:58 +08:00
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
7c074d4ced
issue #1550 : fixed a memory leak in jsbinding.
2012-12-03 22:17:53 +08:00
478791a472
Added CCBReader::setCCBRootPath.
2012-12-03 18:27:50 +08:00
f6185844a9
fixed #1588 : Get the right js callback function in js_CCScheduler_schedule.
2012-12-03 15:59:29 +08:00
d97dfe162a
fixed #1588 : RescheduleCallback support for JSBinding.
2012-12-03 15:33:36 +08:00
399fb53452
fixed #1586 : Native object need to be an autorelease object.
2012-12-01 11:41:51 +08:00
e3615e2fb1
fixed #1586 : Invoking removeAllRoots in ScriptingCore destructor to avoid crash when app exits.
2012-12-01 11:41:50 +08:00
36bc0ab0bb
Invoking JS_SetGCZeal only when the macros DEBUG and JS_GC_ZEAL is defined.
2012-12-01 11:41:50 +08:00
745392ad6c
Changing chipmunk manual bindings to fix GC issues
2012-11-30 16:08:19 -08:00
94b1d39b2c
Using release version of spidermonkey for win32, otherwise jsbinding project can't be run on other machines.
2012-11-30 22:45:51 +08:00
3533358049
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2012-11-30 22:20:22 +08:00
07661a1e21
issue #1581 : Added jsb_set_reserved_slot and jsb_get_reserved_slot,
2012-11-30 22:00:30 +08:00
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
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
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
0d93f2d651
issue #1583 : Bind cc.Menu.alignItemsInRows, cc.Menu.alignItemsInColums, cc.LayerMultiplex.create
2012-11-30 21:15:01 +08:00
96e2707f39
issue #1583 : Added jsvals_variadic_to_ccarray function.
2012-11-30 21:12:14 +08:00
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
bb6e03bd3f
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1583-update-js
2012-11-30 17:42:51 +08:00
a37cc8a098
Updated jsb_constants_chipmunk.js and jsb_constants_cocosbuilder.js.
2012-11-29 15:29:58 +08:00
494806167b
Temporary commit.
2012-11-29 15:26:24 +08:00
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
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
a4b55b5217
Fixing Accelerometer crash on Android
2012-11-28 15:56:57 -08:00
a4762605b8
issue #1581 : Removed some unused codes.
2012-11-28 22:24:12 +08:00
James Chen