Commit Graph

791 Commits

Author SHA1 Message Date
pandamicro de9b51c0cf Fix other GC issues 2016-01-28 01:03:50 +08:00
pandamicro 554523a201 Use JS::Heap instead of Mozilla::maybe to improve stability 2016-01-28 01:03:13 +08:00
pandamicro 93987c7848 Remove PersistentRooted as much as possible and use pure JS references 2016-01-26 19:33:35 +08:00
zilongshanren bc44769b8b add more deprecated functions 2016-01-25 18:14:48 +08:00
zilongshanren 00ad5bd620 fix jsb deprecated constants 2016-01-25 15:40:51 +08:00
pandamicro d6cedb88ec Remove JS::Persistent and move js object reference into JS scope 2016-01-24 19:47:26 +08:00
pandamicro 0daa846020 Improve gc test case and add cycle reference tests
t

Improve gc test case and add action cycle reference test
2016-01-24 19:47:24 +08:00
CocosRobot 039286f814 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-01-22 14:25:59 +00:00
James Chen ed9ed6c92f Don't change the behavior of WebSocket::close method. WebSocket::close is an synchronous method before, adds a WebSocket::closeAsync method for asynchronous closing. 2016-01-22 14:22:33 +08:00
Ricardo Quesada ec2d29ed16 Merge pull request #14930 from ricardoquesada/rich_text_fixes
adds JS tests for RichText
2016-01-20 22:47:35 -08:00
zilongshanren 8fda08abcd Merge pull request #14755 from mogemimi/fix-redefinition-warning
Fix OpenGL macro redefinition warning in JS bindings/Mac
2016-01-21 10:46:58 +08:00
CocosRobot 4dab20b715 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-01-21 02:37:23 +00:00
Ricardo Quesada 7735a75651 adds JS tests for RichText 2016-01-20 17:59:13 -08:00
mogemimi 73793a8317 Fix macro redefinition warning in JS bindings/Mac 2016-01-20 23:17:24 +09:00
CocosRobot b340e48cb1 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-01-20 10:21:41 +00:00
pandamicro 39ab445f7d Merge pull request #14904 from pandamicro/v3
[ci skip]Add more test case to jsb memory test
2016-01-20 11:43:49 +08:00
pandamicro fc19435123 Merge branch 'v3' of github.com:pandamicro/cocos2d-x into hbmemory
Conflicts:
	cocos/base/ccConfig.h
	cocos/scripting/js-bindings/manual/ScriptingCore.cpp
	cocos/scripting/js-bindings/manual/ScriptingCore.h
	cocos/scripting/js-bindings/script/jsb_prepare.js
2016-01-18 16:40:00 +08:00
pandamicro f8016978ff Fix an improper macro syntax for windows platform 2016-01-18 14:28:39 +08:00
pandamicro 8bc9f712ea Merge pull request #14895 from minggo/firefox-remote-debug
web console supports for JSB projects
2016-01-15 21:27:27 +08:00
minggo 5f9bd06bee support webconsole 2016-01-15 18:05:59 +08:00
minggo e062ade514 make require() returns the value of last statement 2016-01-15 18:02:11 +08:00
pandamicro 2640396822 Merge pull request #14890 from minggo/firefox-remote-debug
can use new firefox version to debug cocos2d-x jsb projects
2016-01-15 12:48:46 +08:00
minggo 299a56d52e can use new firefox version to debug cocos2d-x jsb projects 2016-01-15 11:39:17 +08:00
Ricardo Quesada d589e44b0a Merge pull request #14692 from CodeAndWeb/spriteframe-anchor-from-plist
Load anchor points from plist files
2016-01-13 15:58:02 -08:00
James Chen f9e8ae0f09 WebSocket refactoring, bug fixes, improvements, and passes most Autobahn Test (The most standard WebSocket Protocol Test). 2016-01-13 21:14:38 +08:00
mogemimi 41dd44c75d Fix some typos in docs 2016-01-11 19:23:05 +09:00
XiaoFeng ab0efd933a Merge branch 'v3.10' of https://github.com/cocos2d/cocos2d-x into v3
Conflicts:
	CHANGELOG
	cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp
	tests/js-tests/src/RenderTextureTest/RenderTextureTest.js
2016-01-09 18:01:56 +08:00
XiaoFeng 0fcfb359d2 Fix more js parser font setting error 2016-01-06 20:42:27 +08:00
XiaoFeng d82b6b6f1c Fix js parser use resource path name for font name when font name is blank in BMFontLoader and ButtonLoader 2016-01-06 19:36:32 +08:00
zilongshanren 100a119181 add overFlow enum to jsb and lua.
1. change clamp to 1 and shrink to 2
2016-01-04 21:43:37 +08:00
Ricardo Quesada b92b67edad moves macro definition to `ccConfig.h` 2015-12-29 17:36:02 -08:00
Ricardo Quesada 7cd80cb669 Adds iOS tests, calls GC after replacing scene
and some bug fixes

Squashed commit of the following:

commit 36b74ce4e68bf2f4a4c464453e695497716506eb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Dec 22 19:07:01 2015 -0800

    adds missing file

commit 017d03807122faa38fefaa8f4554db8edc83561d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Dec 22 19:02:27 2015 -0800

    disables GC by default

commit a2f3767a952e052eb8f0391bb5cbd1a8d0ce1b38
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Dec 22 18:57:14 2015 -0800

    Adds iOS test and calls GC after replacing the scene

commit 7b3b628caeb3366356d9a896aebd9c96887a85ed
Merge: 79e926a e311655
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Dec 22 15:29:01 2015 -0800

    Merge branch 'v3' into v3_js_memory_test_and_fixes

commit 79e926a970e3153ee826b299c3417fb6ac599153
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Dec 21 21:27:19 2015 -0800

    fixes crashes

commit 76f3910748e15c4ea179eab846f24f3e65d52d2d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Dec 21 11:57:56 2015 -0800

    Adds standalone test for JS GC memory

    and fixes leaks on extended/subclassed objects
2015-12-29 17:36:02 -08:00
pandamicro 6ea389f475 Merge pull request #14815 from pandamicro/v3.10
Made require overwritable
2015-12-29 22:06:00 +08:00
pandamicro daac6ceb08 Made require overwritable 2015-12-29 21:28:30 +08:00
Ricardo Quesada 666a6c6f88 adds missing scheme files 2015-12-28 16:42:44 -08:00
Ricardo Quesada 692c0f8a0e adds tvOS support
Ported tests:
 - js-tests
 - cpp-tsts
 - lua-tests
 - game-controller tests

all of them working, but most of the tests can't be navigated
since they expect a controller.
2015-12-28 15:59:36 -08:00
xiaofeng11 69a6406661 Merge pull request #14805 from pandamicro/v3.10
Fix JSB issues on win32
2015-12-25 20:06:47 +08:00
pandamicro fe1336bdc7 Fix chipmunk cpSpaceAddCollisionHandler issue on argument parsing 2015-12-25 19:08:33 +08:00
pandamicro 2ce866c4ba Fix jsb_ref_rebind issue on win32 (mystery GC crash) 2015-12-25 19:08:32 +08:00
pandamicro dea1ef1290 Merge pull request #14790 from pandamicro/v3.10
Fixed WebSocket JSB crash issue
2015-12-24 01:37:17 +08:00
pandamicro acf03c06d5 Fixed WebSocket JSB crash issue 2015-12-23 23:28:14 +08:00
mogemimi b0c4adcbd0 Fix method name spelling in AutoPolygon 2015-12-23 19:07:03 +09:00
CocosRobot 30f3096c92 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-21 11:36:07 +00:00
pandamicro 8d8ac60625 Merge pull request #14761 from pandamicro/v3.10
Correct return type to adopt GC Rooting API
2015-12-21 11:46:59 +08:00
pandamicro 616f5c0a01 Correct return type to adopt GC Rooting API 2015-12-21 11:07:40 +08:00
pandamicro 4e36e24993 Correct return type to adopt GC Rooting API 2015-12-21 10:42:54 +08:00
pandamicro 81918f51ea Fix event handle function issue with compartment
and  Fix a crash issue caused by malformed js usage
2015-12-21 00:16:17 +08:00
pandamicro 8d712a4c45 Expose CC_ENABLE_GC_FOR_NATIVE_OBJECTS 2015-12-21 00:16:17 +08:00
pandamicro 34c7331b99 Issue fixes for new memory model 2015-12-21 00:16:17 +08:00
pandamicro 8ddaf310ef Update manual bindings to use the new memory model 2015-12-21 00:16:16 +08:00
pandamicro e1bc6640f4 Implement full GC relied memory model 2015-12-21 00:14:51 +08:00
pandamicro 022bcc24f1 Merge branch 'v3.10' of github.com:cocos2d/cocos2d-x into v3
Conflicts:
	cocos/scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_manual.cpp
	cocos/scripting/js-bindings/manual/component/CCComponentJS.cpp
	cocos/scripting/js-bindings/manual/js_bindings_opengl.cpp
2015-12-20 22:56:33 +08:00
pandamicro 1071f63ac7 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2015-12-20 22:45:51 +08:00
pandamicro f747075a83 Merge pull request #14748 from pandamicro/v3.10
Temporary disable forceGC on win32
2015-12-19 23:27:12 +08:00
pandamicro 8f836162aa Temporary disable forceGC on win32 2015-12-19 22:45:57 +08:00
pandamicro 386b850871 Fix issue in MenuItem init usage 2015-12-19 22:45:22 +08:00
pandamicro ae48253da6 Fix UI addEventListener issue 2015-12-19 22:44:25 +08:00
fanli ffbac99dc5 fix script samples error with controlButton 2015-12-19 22:22:41 +08:00
CocosRobot 0f90f74df9 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-19 09:12:27 +00:00
pandamicro 6481a0f3c1 Merge pull request #14740 from xiaofeng11/v3.10
Bug Fix & h5 engine ref update
2015-12-19 14:13:37 +08:00
XiaoFeng a139221618 Synchronize parser match modify from h5 engine
Update h5 engine ref
2015-12-19 13:56:12 +08:00
CocosRobot b5141a28bd [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-18 13:28:14 +00:00
xiaofeng11 2ee5c88f9a Merge pull request #14733 from xiaofeng11/v3.10
Update h5 sub-module ref
2015-12-18 19:06:59 +08:00
XiaoFeng a13a0c35d3 Update h5 sub-module ref
Synchronize studio parser match change from h5 modify
2015-12-18 15:40:21 +08:00
Ricardo Quesada d943381c65 Update spidermonkey_specifics.h
updated docstrings
2015-12-16 20:03:09 -08:00
Ricardo Quesada 1ba3f2badb minor fixes 2015-12-16 17:47:50 -08:00
Ricardo Quesada f023d5a378 no more uthash
Instead of using two uthash entires, it uses two unordered_map entries.
Benefits are:

easier to debug. I can inspect the contents of the unorderd_map with the
debugger
less memory. I don't need to allocate two proxies. I only allocate one
proxy and I added it into both maps
If also fixes an important bug when unrooting objects. Unroot was
cleaning the heap object. So now proxy adds a _jsobj, which is a raw
pointer. Needed under certain cases.
2015-12-16 17:37:44 -08:00
Wenhai Lin 66b0a0e9b1 Adds `std::nothrow` to the `new` statements 2015-12-16 17:06:56 +08:00
pandamicro a8a9c8ec92 Merge pull request #14694 from ricardoquesada/v3_10_js_fixes
ccvector_to / ccmap_to converted to new API
2015-12-16 16:34:51 +08:00
Ricardo Quesada eb8e755362 removes logs 2015-12-15 18:21:44 -08:00
Ricardo Quesada 43a573f4fd ccvector_to / ccmap_to converted to new API
and more fixes
2015-12-15 17:37:48 -08:00
GuoLunHao 7d72f66f5b add 'js_module_register.cpp' and 'lua_module_register.cpp' in Compile Sources on iOS Targets' Build Phases 2015-12-15 21:00:24 +08:00
Joachim Grill 98079b49e8 updated javascript bindings 2015-12-15 11:18:32 +01:00
CocosRobot 8cb2ec6187 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-15 04:31:50 +00:00
pandamicro 6e20c3cc4f Merge pull request #14681 from pandamicro/v3.10
Fix ComponentJS proxy management issue in JSB
2015-12-15 12:26:12 +08:00
pandamicro 64276bd664 Fix ComponentJS proxy management issue in JSB 2015-12-15 11:48:44 +08:00
pandamicro 280a8e9d9c Merge pull request #14663 from xiaofeng11/v3.10
Update all version number to v3.10
2015-12-15 10:48:51 +08:00
Dale Stammen 46b926a18e added missing _USRJSSTATIC preprocessor define for ARM builds 2015-12-14 14:55:33 -08:00
pandamicro 0e7a02d025 Merge pull request #14670 from pandamicro/v3
Fix evalString doesn't return result issue
2015-12-14 17:26:34 +08:00
pandamicro 662c7fbec5 Made API consistent with old version 2015-12-14 13:55:17 +08:00
pandamicro cbce4d37c3 Merge pull request #14671 from ricardoquesada/more_js_fixes
More js fixes
2015-12-14 13:41:59 +08:00
pandamicro 330b588215 Fix evalString doesn't return result issue 2015-12-14 13:13:54 +08:00
pandamicro 41218a65e7 Merge pull request #14668 from pandamicro/v3
Sync v3 and Fix win32 js project crash issue
2015-12-14 13:12:42 +08:00
XiaoFeng 4815ec8b9a Update version number to v3.10 2015-12-14 10:32:29 +08:00
pandamicro 445442c964 Upgrade spider monkey to solve win32 js project crash issue 2015-12-14 10:27:11 +08:00
pandamicro 2ef0197534 Merge pull request #14643 from GuoLunHao/v3.10
fix compile error and link error on ios/Mac platform
2015-12-12 23:46:32 +08:00
Ricardo Quesada c5058aa2f9 more conversions 2015-12-11 17:18:20 -08:00
Ricardo Quesada 47911e0c24 more js fixes
fixes in how ref count is measured
opengl bindings converted to new API
2015-12-11 15:18:09 -08:00
CocosRobot 71f9ead981 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-11 17:52:29 +00:00
Ricardo Quesada fd321530e5 restores autobindings 2015-12-11 08:59:35 -08:00
XiaoFeng 49d03d9de1 Synchronize js parsers modification from html5 version 2015-12-11 18:22:02 +08:00
Ricardo Quesada 8b2dfb1a4b Mooooores fixes
but GC memory model doesn't work yet... somewhere someone is still
retaining a reference that prevents the whole thing from
releasing
2015-12-10 22:15:44 -08:00
Ricardo Quesada 96d391ea30 Squashed commit of the following:
commit aff4e27200a77db60b13ea30c2457558e5f53059
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Dec 10 17:58:41 2015 -0800

    compiles with new GC model

commit 1fa69cd71231d56371cd45a378e50a1888308b42
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Dec 10 17:41:15 2015 -0800

    Animation3D works Ok

commit d439969caf7e6fe83a74e37d078c4361a08cb816
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Dec 10 13:39:50 2015 -0800

    Sprite3d create: converted to new API

commit aabe449e4a968fad882c44df9be787eb7c3bfcec
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Dec 10 13:27:33 2015 -0800

    ouch...

commit 688ab610a8cb7607bc3c51b8ca01d800ef3c9794
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Dec 10 13:12:25 2015 -0800

    Spawn/Sequence init* were not bound

    Fixed. Now JS Scheduler Test works Ok
2015-12-10 18:02:55 -08:00
GuoLunHao 5872745593 fix compile error and link error on ios/Mac platform 2015-12-10 16:43:01 +08:00
pandamicro cb22de5a09 Merge pull request #14590 from pandemosth/issue_14589
Fixes #14589 allocation issue with remote images
2015-12-10 10:04:29 +08:00
pandamicro ceac1d9d6a Merge pull request #14626 from dumganhar/v3
Bug fix for shouldStartLoading method, should return value from JS
2015-12-10 09:36:28 +08:00
James Chen 65eb5fa4ba Bug fix for shouldStartLoading method, should return value from JS, also fix that webview callback is already in Cocos Thread, don't need to post to cocos thread for running again. 2015-12-09 22:40:57 +08:00
lunhao.guo ae980c19d2 fix the link error and compile error in windows and android platform 2015-12-09 20:18:37 +08:00
Ricardo Quesada 96ee343884 fixes for windows 2015-12-08 20:07:13 -08:00
Ricardo Quesada e675657cae improved docstrings 2015-12-07 19:14:10 -08:00
Ricardo Quesada 13dc967b03 js_get_or_create_jsobject() and other stuff
- getDescendatns() converted
- singletons converted
- new helper template-specialized js_get_or_create_jsobject()

Squashed commit of the following:

commit 3f21e65bca5f7e5e5c4bf304f2daed0eff26f6aa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Dec 7 19:04:24 2015 -0800

    logging added (and commented)

    will be useful in the future

commit f995295b385a515c1f82136688610a90eb379855
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Dec 7 19:00:09 2015 -0800

    new js_get_or_create_jsobject<T>

    Specializes Template on cocos2d::Ref.
    When Ref, it calls the `jsb_ref` functions

commit 240b80e4080757ebb47db0d02a1fe1f875237d24
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Dec 7 13:31:52 2015 -0800

    singletons converted

commit 667d94bf90267c103b620630bacfffa7767b42dd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Dec 7 12:20:07 2015 -0800

    getDescendants() converted
2015-12-07 19:05:23 -08:00
CocosRobot 7e803cbd0a [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-07 03:30:43 +00:00
zilongshanren c9d32a83b8 Merge pull request #14597 from mogemimi/fix-api-spelling
Fix misspelled APIs in v3.10
2015-12-07 11:07:13 +08:00
Ricardo Quesada d02f4afd4a using new bindings templates
ignores createInstance() from ui
2015-12-05 22:26:54 -08:00
mogemimi c7640c8aaf Replace 'resoucedata' with 'resourcedata' in JS Binding 2015-12-05 18:59:54 +09:00
mogemimi 745f54b421 Replace 'ResouceData' with 'ResourceData' 2015-12-05 18:59:54 +09:00
Ricardo Quesada aebfefd7a8 Merge branch 'v3' into js_more_conversions 2015-12-04 19:01:20 -08:00
Ricardo Quesada cd8631ef09 sfunction "create" uses new optimized code
...although this code should never be called
2015-12-04 18:42:31 -08:00
Pan Demosthenous 54ac5d8d2e fix allocation issue with remote images 2015-12-05 10:10:58 +11:00
CocosRobot d5e54bdb81 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-04 09:48:13 +00:00
pandamicro 1820a006ba Merge pull request #14502 from xiaofeng11/v3_combine_2d
Combine Studio change for 2d components
2015-12-04 16:05:24 +08:00
CocosRobot d09eae92f0 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-04 07:13:02 +00:00
XiaoFeng 6fb65b5610 Editing code as comment.
Move CocosStudioExtension path and update related files.
2015-12-04 10:43:39 +08:00
Ricardo Quesada 49882ed91c js_cocos2dx_CCGLProgram_createWithString converted to new JSAPI 2015-12-03 15:49:56 -08:00
Ricardo Quesada b87975096e GLProgram converted to new JSAPI 2015-12-03 15:47:39 -08:00
Ricardo Quesada 67948ff8c8 adds jsb_ref_get_or_create_jsobject()
kind of replaces js_get_or_create_jsobject for Ref objets.
Benefits: friendly with the new JS API
takes less space (no template)
2015-12-03 15:40:52 -08:00
Ricardo Quesada 37b4c3fe6a CallFuncN converted to new JS API 2015-12-03 15:24:37 -08:00
Ricardo Quesada 013f5b8d33 layerMultiplex converted to new JS API 2015-12-03 15:15:47 -08:00
Ricardo Quesada 3100cba5a1 Animation ported to JS 2015-12-03 15:02:39 -08:00
Ricardo Quesada cc6e72fe7c MenuToggleItem converted 2015-12-03 14:54:38 -08:00
Ricardo Quesada e5032dccc0 rootObject/unrootObject working again 2015-12-03 14:49:23 -08:00
Ricardo Quesada bd943c5415 Sequence/Spawn converted to use new API 2015-12-03 13:56:00 -08:00
CocosRobot 3edadc035b [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-03 21:34:13 +00:00
pandamicro c304348c34 Merge pull request #14565 from pandamicro/v3
Add js test case for fix, improve template
2015-12-03 18:48:34 +08:00
pandamicro 4cc4dd3a9f Fix Rooting API usage issue in cocos2d_specifics 2015-12-03 16:48:25 +08:00
CocosRobot b1fd2277d8 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-03 07:53:26 +00:00
Ricardo Quesada 58e4d3c487 JS Menu fixes 2015-12-02 17:30:54 -08:00
Ricardo Quesada 48523572b7 label JS fixes 2015-12-02 17:23:23 -08:00
Ricardo Quesada 6e50cf883f Sprite::create() using new API...
...also code easier to understand
2015-12-02 16:45:28 -08:00
Ricardo Quesada c321d35a9a Squashed commit of the following:
commit 000a025fb4027c26bf05f7296e2d1fbbf21abe6c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Dec 2 10:38:27 2015 -0800

    updated submodule

commit b5f45a62b48493f05d75aea865158c371241973d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Dec 1 19:21:34 2015 -0800

    ooops... thanks Panda

commit 85f0b9c01d5281970f748b6460107bc0ca82cdf0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Dec 1 18:19:16 2015 -0800

    better macro name for GC. Thanks panda

commit e42ad74a664dd2b85cbf4463a6fef8f6abc06664
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Dec 1 17:10:32 2015 -0800

    RepeatForever, Repeat and Speed converted

commit 3a8130ffc06301c91c836539736bbae456f05b4d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Dec 1 14:31:32 2015 -0800

    cherry-picking changes to disable retain/release from GC

commit 3ed6e00dc2d9d46248d9374a1f9874cd0b2ba67d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Dec 1 12:31:04 2015 -0800

    fixes autorelease issues on rebind

commit b65f5f6b16c1542c28b04d66377a27233c6cf214
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Dec 1 12:23:33 2015 -0800

    my JS changes... again
2015-12-02 14:45:13 -08:00
CocosRobot edd786e7f6 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-02 06:30:18 +00:00
CocosRobot 0c67171b9d [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-02 02:05:32 +00:00
XiaoFeng e5d57b4fa2 update binding-generator sub module & code 2015-12-01 22:30:36 +08:00
XiaoFeng ea077c5141 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine_LuaJsSim
Conflicts:
	cocos/scripting/js-bindings/manual/js_manual_conversions.h
2015-12-01 15:12:32 +08:00
CocosRobot e891b03eee [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-01 04:32:19 +00:00
pandamicro 81f590e52a Merge pull request #14478 from pandamicro/v3
Improved JS bindings with more secured memory management
2015-12-01 12:24:21 +08:00
pandamicro 17bdfb4050 Fix android compilation issue 2015-11-30 15:20:57 +08:00
pandamicro 43c68aa16b Fix Chipmunk bindings issue 2015-11-27 22:38:16 +08:00
CocosRobot 5c9084fd7d [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-27 09:41:59 +00:00
pandamicro e13e0cb886 Fix getJSObject issues 2015-11-27 14:54:25 +08:00
XiaoFeng 9e50c010e9 Fix win8.1 project compile error 2015-11-27 11:49:35 +08:00
pandamicro 1ee7b11e31 Refactor jsb_new_proxy and jsb_get_js_proxy with RootedObject 2015-11-27 10:20:51 +08:00
pandamicro 8320c2f702 Use rooted object for js_proxy new and get 2015-11-27 10:19:13 +08:00
pandamicro d23ffe4fc7 Fix some issue of js_type_class usage 2015-11-27 10:16:11 +08:00
pandamicro 73c3a5dcf5 Activate DEBUG to test 2015-11-27 01:35:07 +08:00
pandamicro ae2b75c8be Fix issues causing by temporary RootedObject passed as function parameters 2015-11-27 01:35:06 +08:00
XiaoFeng 24dc9f3392 update code as comment 2015-11-26 17:39:57 +08:00
CocosRobot 51cfbca523 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-26 06:02:24 +00:00
CocosRobot da9e8548a0 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-25 17:29:11 +00:00
XiaoFeng 145943068f Add missing function export 2015-11-25 22:35:02 +08:00
XiaoFeng 9811d6efcf Combine studio change for LuaBinding, jsb and simulator 2015-11-25 21:52:44 +08:00
CocosRobot 06c7b94440 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-25 09:28:43 +00:00
zilongshanren b0d88a552a Merge pull request #14419 from xiaofeng11/v3_combine_ui
Combine Studio change for UI components
2015-11-25 17:19:54 +08:00
pandamicro c202834312 Clean up manual bindings code, remove JS_THIS_OBJECT and JS_SET_RVAL 2015-11-25 14:33:43 +08:00
pandamicro 69b2b5720b Use JS::PersistentRooted instead of JS::Heap to prevent delegates and wrappers internal js object from GC
More elegant and secured way, potential crashes exists in previous implementation
2015-11-25 14:32:19 +08:00
pandamicro be2a3077c2 Remove useless manual bindings for addEventListener functions in UI 2015-11-25 14:15:45 +08:00
pandamicro 930405d52c Remove useless manual bindings for MenuItems 2015-11-24 16:32:02 +08:00
CocosRobot ded045ae26 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-24 07:01:07 +00:00
pandamicro 21d0ff846c Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2015-11-19 17:20:42 +08:00
pandamicro 0893d7d4ff Fix text color parser for TextField widget 2015-11-19 17:17:17 +08:00
XiaoFeng b6b35e0c74 Fix name space. 2015-11-19 15:47:36 +08:00
XiaoFeng 32f21ca5be Binding ResouceData structure to js to fix auto compile error 2015-11-19 14:31:39 +08:00
CocosRobot 0794c7a43c [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-17 04:09:43 +00:00
pandamicro c4f9804f5b Merge pull request #14404 from CocosRobot/update_lua_bindings_1447728669
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-11-17 10:56:58 +08:00
pandamicro efde3c3a0e Merge pull request #14403 from pandamicro/v3
Fix issue in ComponentJS::~ComponentJS
2015-11-17 10:56:37 +08:00
CocosRobot 3ee2e7a490 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-17 02:56:26 +00:00
pandamicro 5bc73c6ede Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2015-11-17 10:42:05 +08:00
pandamicro 974bdba154 Fix issue in ComponentJS::~ComponentJS 2015-11-16 11:50:48 +08:00
CocosRobot 4ccc6ce5de [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-11 06:53:45 +00:00
XiaoFeng c0c35c603e Update version number & RELEASE_NOTES.md, prepare 3.9 release 2015-11-06 18:38:09 +08:00
zhangcheng 8183d34b68 revert old timelineParser-2.x.js and add "||false" to it. 2015-11-06 12:50:36 +08:00
zhangcheng 76ed15591f Update web submodule to latest. 2015-11-06 11:56:45 +08:00
mogemimi a31cce9a80 Fix minor grammar and typo in documentation 2015-11-04 17:14:00 +09:00
mogemimi 8f632365c3 Fix typos in documentation 2015-11-03 04:43:44 +09:00
pandamicro c80f523637 Merge pull request #14269 from pandamicro/v3
[ci skip]Fix cocos2d/cocos2d-html5#3156 setBlendFunc issue in parser
2015-10-30 17:20:58 +08:00
pandamicro 246eab11a1 Fix cocos2d/cocos2d-html5#3156 setBlendFunc issue in parser 2015-10-30 17:19:21 +08:00
pandamicro c0ecf7f7aa Merge pull request #14262 from liamcindy/3.9_light_js
update for light3d js reader
2015-10-29 13:52:33 +08:00
pandamicro 617f5265f1 Merge pull request #14256 from pandamicro/v3
Use generational gc friendly API in JSTouchDelegate
2015-10-29 12:34:42 +08:00
unknown f2f6d25408 update for light3d js reader 2015-10-29 10:04:56 +08:00
pandamicro 7d832b0753 Merge pull request #14238 from pandamicro/v3
Add cc.Director.EVENT_BEFORE_UPDATE
2015-10-28 15:50:37 +08:00
pandamicro 06b828250a Merge pull request #14241 from yuyangame/patch-1
fix cc.game.config['showFPS'] bug
2015-10-28 15:48:21 +08:00
pandamicro 68d75a519a Use generational gc friendly API in JSTouchDelegate 2015-10-28 11:55:28 +08:00
CocosRobot 09cbc2145d [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-10-28 03:29:16 +00:00
Kvial 27773b6f1a fix cc.game.config['showFPS'] bug
```javascript
//project.json
{
...
'showFPS' : false,
...
}
```

```javascript
//CCBoot.js
...
config[CONFIG_KEY.showFPS] = config[CONFIG_KEY.showFPS] || true;// this property will be set to true
...
```
2015-10-27 20:36:05 +08:00
pandamicro 616eae2b6d Add cc.Director.EVENT_BEFORE_UPDATE 2015-10-27 17:32:57 +08:00
CocosRobot 35f7f3cb2f [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-10-27 09:29:42 +00:00
pandamicro a3c2904e7f Fix cc.DrawNode.drawPoly 2015-10-27 16:46:25 +08:00
pandamicro 530321fe70 #14124 Improved JSCallbackWrapper with generational GC and fix the issue 2015-10-22 17:00:57 +08:00
pandamicro 4633a93631 Disable bitcode for all targets 2015-10-22 12:18:51 +08:00
pandamicro d3664b9616 #14128 Fix cc.loader.getRes crash caused by null type 2015-10-22 01:16:56 +08:00
pandamicro 9eeda122e9 Fix Scheduler API inconsistency 2015-10-21 22:10:48 +08:00
XiaoFeng 428db9c458 update js binding version info 2015-10-20 17:04:31 +08:00
CocosRobot 6a0e1b323f [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-10-20 02:42:17 +00:00
pandamicro cde67d1261 Merge pull request #14162 from mogemimi/fix-warnings
Fix warnings on Xcode 7
2015-10-18 22:56:12 +08:00
pandamicro c365fc5883 Merge pull request #14180 from pandamicro/v3
Fix issue for web engine upgrade
2015-10-18 22:48:16 +08:00
pandamicro cfb1ee2b11 Improved logic of jsb_boot.js to sync with the web engine behavior 2015-10-18 22:45:53 +08:00
pandamicro 11890d6c4b Fix issue for web engine upgrade 2015-10-18 00:19:02 +08:00
mogemimi 8af6531c94 Replace deprecated CCApplication with Application 2015-10-16 15:02:06 +09:00
mogemimi 4600c41f9b Add override keywords 2015-10-16 15:01:10 +09:00
zhangting 27837e0615 return null if read failed in js_cocos2dx_CCFileUtils_getDataFromFile 2015-10-14 16:07:42 +08:00
pandamicro 8b0a6a6c29 Merge pull request #14099 from pandamicro/v3
[ci skip]Sync with CCBoot for web
2015-10-10 10:16:16 +08:00
pandamicro 5ae2812bf8 Sync with CCBoot for web 2015-10-10 10:15:36 +08:00
pandamicro bc9b59b7f7 Merge pull request #14096 from pandamicro/v3
[ci skip]Add opacity/color cascade test case for Scale9Sprite
2015-10-09 21:07:27 +08:00
pandamicro 0ea54868e2 Add opacity/color cascade test case for Scale9Sprite 2015-10-09 21:01:49 +08:00
CocosRobot 1919d1a679 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-10-08 03:50:33 +00:00
pandamicro 57ac40b9bc Fix simulator android x86 release compilation issue 2015-10-08 09:46:50 +08:00
Dale Stammen 32eeb560c3 clean up include files for WINRT platforms 2015-10-02 18:49:41 -07:00
CocosRobot b082620d85 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-27 15:24:49 +00:00
pandamicro 7b85211cfe Remove ScriptComponent
Because windows platform can't successfully compile in previous architecture
2015-09-27 22:18:59 +08:00
WenhaiLin f4c56e8605 Fixed compile errors 2015-09-26 19:43:36 +08:00
pandamicro 2a3526a3fd Fix lua project 2015-09-26 19:43:36 +08:00
pandamicro 91928aa23d Add ComponentJS test case and fix windows platforms 2015-09-26 19:43:36 +08:00
pandamicro ddb636a022 Add ScriptComponent and ComponentJS 2015-09-26 19:43:36 +08:00
CocosRobot c135587962 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-25 08:43:00 +00:00
江龙 9eb05707fb add custom spine skeletonAnimation test 2015-09-25 13:36:48 +08:00
Nick 003920f826 fix loading pluginx when compile Android with --compile-script flag 2015-09-24 11:41:18 +07:00
pandamicro d3504a9216 Update versions and html5 engine 2015-09-22 02:31:21 +08:00
CocosRobot 9ef7991b99 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-21 10:43:59 +00:00
CocosRobot 0af77fca90 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-21 08:35:18 +00:00
zhangting caaf912a28 add writeDataToFile() for jsb 2015-09-20 15:38:15 +08:00
CocosRobot c562a57030 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-18 16:32:43 +00:00
CocosRobot 37cb9afb3f [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-18 14:04:49 +00:00
CocosRobot 79a7878687 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-18 07:41:46 +00:00
pandamicro 4aaf017e4c Merge pull request #13890 from jianglong0156/addsetUniformLocationWithMatrix
add CCGLProgram function binding setUniformLocationWithMatrix
2015-09-17 17:45:16 +08:00
江龙 1b320ac248 add CCGLProgram function binding setUniformLocationWithMatrix 2015-09-17 15:34:41 +08:00
pandamicro 0479cca364 Merge pull request #13832 from yangws/downloader
Restructure CCDownloader implement on iOS and Android don't use libcurl.
2015-09-16 14:01:28 +08:00
CocosRobot ae8a35a726 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-15 10:36:16 +00:00
Vincent Yang 848fa2c0d0 Merge cocos2d. 2015-09-15 18:30:45 +08:00
CocosRobot 19561ca84b [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-15 06:32:52 +00:00
pandamicro dbe3e062bc Merge pull request #13801 from chengstory/OptimizateDoLayout
Move "ui::Helper::DoLayout"  to "CreateNode"。
2015-09-15 13:37:00 +08:00
zhangcheng fb104189d4 Multiplexing ccs.load. 2015-09-15 13:04:45 +08:00
zhangcheng fa7f97b26e Adjustment spaces. 2015-09-15 11:35:43 +08:00
zhangcheng 83f5f85f56 add loadWithVisibleSize js function. 2015-09-15 11:16:02 +08:00
CocosRobot 4b3e71e353 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-15 01:35:59 +00:00
CocosRobot a4cb98d993 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-14 04:01:38 +00:00
子龙山人 0e9ae83376 Merge pull request #13782 from CocosRobot/update_lua_bindings_1441965150
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-09-11 18:06:47 +08:00
CocosRobot e79678454b [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-11 09:59:04 +00:00
pandamicro 2795d0a488 Merge pull request #13779 from pandamicro/v3
Fix Chipmunk setCollisionType issue by initializing variables
2015-09-11 17:58:48 +08:00
pandamicro 5a918608c1 Fix Chipmunk setCollisionType issue by initializing variables 2015-09-11 15:23:29 +08:00
CocosRobot cfe0be269b [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-10 10:14:45 +00:00
CocosRobot b164ac059d [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-09 10:45:05 +00:00
江龙 4509a316cc add uniform conversion
relate issue:https://github.com/cocos2d/cocos2d-x/issues/13747
relate pr:https://github.com/cocos2d/bindings-generator/pull/191
2015-09-09 16:03:57 +08:00
CocosRobot 2423f05024 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-09 02:37:17 +00:00
pandamicro dc607a1784 Merge pull request #13726 from jianglong0156/actionExtendSquash
support custom action, and rewrite update function
2015-09-09 10:25:56 +08:00
江龙 badd80bf3a support custom action, and rewrite update function
support custom action in js, and developer can rewrite the update function in custom action class.
useage:
// custom action sample code
var customMoveBy = cc.MoveBy.extend({
    ctor:function (duration, deltaPos, deltaY) {
        this._super(duration, deltaPos, deltaY);
    },
    update:function (dt) {
        this._super(dt);

        if (this.getTarget()) { // rand color
            this.getTarget().setColor(cc.color(cc.rand()%255, cc.rand()%255, cc.rand()%255));
        }

    }
});
2015-09-09 10:08:07 +08:00
minggo d86b256396 don't define static variable in header file or each dynamic lib will have a copy 2015-09-08 11:04:51 +08:00
pandamicro 4fb34ba190 Merge pull request #13703 from cocos2d/v3.8
Sync v3.8 to v3
2015-09-07 14:56:37 +08:00
pandamicro 86fb0fc3bc [JS] Add common APIs for compatibility with web engine 2015-09-06 08:57:43 +08:00
WenhaiLin a3b5becb45 Sync v3.8 to v3 2015-08-31 22:05:37 +08:00
pandamicro 8f6f5c1191 Update engine versions 2015-08-31 13:52:15 +08:00