zilongshanren
df2ebfbc9c
change uibutton nons9 to simple rendering mode
2015-12-09 14:21:26 +08:00
Ricardo Quesada
2251b52929
Merge pull request #14611 from ricardoquesada/js_get_or_create_jsobject
...
js_get_or_create_jsobject() and other stuff
2015-12-08 20:48:58 -08:00
Ricardo Quesada
96ee343884
fixes for windows
2015-12-08 20:07:13 -08:00
zilongshanren
9fd5985581
add simple rendering mode to slider
2015-12-09 11:32:52 +08:00
zilongshanren
a671bf7ce9
loading bar use new scale9 feature
2015-12-09 10:41:31 +08:00
mogemimi
f280a31323
Fix typo in documentation and comments
2015-12-09 01:48:24 +09:00
zilongshanren
ea5dacedd0
Merge pull request #14608 from xiaofeng11/v3_310fix
...
Bug fix & make test case more clear.
2015-12-08 18:05:36 +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
zilongshanren
5ef1c92420
Merge pull request #14609 from zilongshanren/fixLabelClampIssue
...
fix horizontal clamp and shrink issue
2015-12-07 19:45:19 +08:00
XiaoFeng
73d0f8a46e
Bug fix & make test case more clear.
...
1. In CameraBackgroundSkyBoxBrush _actived and _textureValid should set true as default, otherwise will cause user get wrong display status.
2. "Enable Wrap" check box in "31:Node: Label - New API -> 55:Resize content Test" is not used, so set it to disabled, won't let user to change it.
3. When set blank texture to UISlider or UISlider button, use resetRender function to clear texture, use init with blank file name will cause error.
2015-12-07 18:36:28 +08:00
zilongshanren
6f7e5a5c06
Merge pull request #14607 from liamcindy/v3_issuseRevert
...
revert error changes
2015-12-07 18:16:49 +08:00
zilongshanren
6c17ef4baf
fix horizontal clamp and shrink issue
2015-12-07 18:13:03 +08:00
Liam
15072a6dd3
revert error changes
2015-12-07 16:21:12 +08:00
James Chen
462796d2dd
Bug fix for ActionNode in CocosStudio, please don't use weak reference.
2015-12-07 15:06:50 +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
mogemimi
09c6e5d2f7
Replace 'Disabeld' with 'Disabled'
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
pandamicro
d371ec2c8a
Merge pull request #14585 from CocosRobot/update_lua_bindings_1449222153
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-04 17:53:46 +08:00
pandamicro
51acfa8908
Merge pull request #14581 from xiaofeng11/v3_xf
...
Add missing lua engine export declaration.
2015-12-04 17:51:38 +08:00
CocosRobot
d5e54bdb81
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-04 09:48:13 +00:00
pandamicro
6ff2586f26
Merge pull request #14574 from super626/v3
...
Fix Sprite3D::setMaterial when multiple meshes exist
2015-12-04 17:38:56 +08: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
XiaoFeng
8f9ea8a87e
Add missing lua engine export declaration.
2015-12-04 15:23:59 +08:00
XiaoFeng
71217fd393
Fix indent
2015-12-04 15:14:47 +08:00
CocosRobot
d09eae92f0
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-04 07:13:02 +00:00
Ricardo Quesada
f6c2758801
Merge pull request #14409 from xiaofeng11/v3_combine_opengl
...
Combine Studio change for openGL related operation
2015-12-03 23:03:40 -08:00
XiaoFeng
1171c6aaa1
Remove desktop only function, set ondraw serial function in DrawNode override able.
2015-12-04 14:55:54 +08:00
Ricardo Quesada
0e34a864b2
Merge pull request #14528 from xiaofeng11/v3_3dtouch
...
Add 3d touch support to iOS 9.0 or higher version on iPhone6s or later device
2015-12-03 22:21:48 -08:00
yangxiao
8d546828f4
fix Sprite3D::setMaterial
2015-12-04 10:54:43 +08:00
XiaoFeng
6fb65b5610
Editing code as comment.
...
Move CocosStudioExtension path and update related files.
2015-12-04 10:43:39 +08:00
CocosRobot
fd2d616aed
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-04 02:03:46 +00:00
zilongshanren
01644cb46e
Merge pull request #14569 from mogemimi/fix-docs-typo
...
Fix typos in documentation
2015-12-04 09:55:30 +08:00
XiaoFeng
2da192a1c2
Remove cocostudio header file from sprite and particle, and adjust tests
...
Fix compile error under iOS & Mac
2015-12-04 09:26:14 +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
Ricardo Quesada
3646d1e9fc
Adds init(array) for Sequence and Spawn
...
it also makes the code cleaner.
this is needed for JS
2015-12-03 12:16:21 -08:00
Shun Lin
d0ce2473a1
Merge pull request #14499 from xiaofeng11/v3_combine_safety
...
Change ASSERT to safety mode
2015-12-04 00:04:36 +08:00
mogemimi
be213bf306
Fix typos in documentation
2015-12-03 21:03:00 +09:00
zilongshanren
ea42c09243
Merge pull request #14566 from zilongshanren/fixIssue14564
...
fix scale9sprite be culled unexpectedly
2015-12-03 19:17:40 +08: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
91909081da
Merge pull request #14542 from pandemosth/issue_14539
...
Fix for Issue 14539
2015-12-03 18:47:17 +08:00
pandamicro
e23432c6fa
Merge pull request #14530 from cezheng/fix/downloader_bug_ios_android
...
Fix Downloader bug iOS & Android
2015-12-03 18:46:43 +08:00
zilongshanren
73d00b9262
fix scale9sprite be culled unexpectedly
...
tickets: https://github.com/cocos2d/cocos2d-x/issues/14564
2015-12-03 17:53:02 +08:00
pandamicro
4cc4dd3a9f
Fix Rooting API usage issue in cocos2d_specifics
2015-12-03 16:48:25 +08:00
Liam
07bc48c1b8
revert glprogram
2015-12-03 16:29:02 +08:00
CocosRobot
b1fd2277d8
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-03 07:53:26 +00:00
pandamicro
d0cd5ee9ab
Merge pull request #14562 from ricardoquesada/js_fixes
...
JS bindings fixes for Menu, Sprite and Label
2015-12-03 15:44:01 +08:00
XiaoFeng
70b9183ddb
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine_2d
...
Conflicts:
tools/bindings-generator
2015-12-03 14:35:36 +08:00
XiaoFeng
32b81a69f5
Add test for new API
...
remove Sprite::setOffsetPosFromCenter api add by cocos studio, and reset _unflippedOffsetPositionFromCenter to zero in Sprite::setTexture
2015-12-03 14:21:00 +08:00
pandamicro
9deee44965
Merge pull request #14548 from mogemimi/fix-deprecation-warning
...
Fix deprecation warning in SkeletonRenderer
2015-12-03 13:18:15 +08: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
mogemimi
d4233dd63a
Fix deprecation warning in SkeletonRenderer
2015-12-03 00:09:47 +09:00
zilongshanren
3fc0d327bf
Merge pull request #14544 from CocosRobot/update_lua_bindings_1449037532
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-02 18:27:03 +08:00
zilongshanren
706e005c3d
Merge pull request #14543 from zilongshanren/fixLabelOverflowShrink
...
fix label clamp when scaled with bmfont
2015-12-02 18:26:46 +08:00
XiaoFeng
a804c67a12
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine_2d
...
Conflicts:
cocos/scripting/lua-bindings/manual/LuaBasicConversions.h
2015-12-02 15:07:58 +08:00
CocosRobot
edd786e7f6
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-02 06:30:18 +00:00
XiaoYang
867664197e
Merge pull request #14526 from super626/v3
...
3D Normal Map Support
2015-12-02 14:22:20 +08:00
zilongshanren
ed55d41858
fix label clamp when scaled with bmfont
2015-12-02 13:48:20 +08:00
Pan Demosthenous
ef931b61af
correct typo in method name of doDestroy
2015-12-02 15:23:05 +11:00
Pan Demosthenous
528a94d36f
fixes a crash in destructor of CCDownloader-apple when completing a data download
2015-12-02 15:21:42 +11:00
Pan Demosthenous
151e7a7a53
CCDownloader-apple : call onTaskFinish when the download session completes for a data task
2015-12-02 15:16:00 +11:00
yangxiao
ebd5c1cca7
resolve conflict and fix checktexture bug
2015-12-02 11:26:05 +08:00
肖峰
5dfc8f6a26
Remove default arguments
2015-12-02 11:02:27 +08:00
pandamicro
70dd2af5d5
Merge pull request #14518 from mogemimi/fix-memory-leak-texture-cache
...
Fix memory leak when initWithImage() failed
2015-12-02 10:20:04 +08:00
CocosRobot
0c67171b9d
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-02 02:05:32 +00:00
xiaofeng11
18666a9b41
Merge pull request #14393 from xiaofeng11/v3_combine_3d
...
Combine Studio change for 3d components
2015-12-02 09:47:12 +08:00
XiaoFeng
e5d57b4fa2
update binding-generator sub module & code
2015-12-01 22:30:36 +08:00
yangxiao
54e13c3acd
update comment
2015-12-01 17:47:34 +08:00
Ce Zheng
ecf94a3dc4
Add a buffer queue to iOS Downloader
...
Upon calling NSURLSessionDownloadTask's resume, the task's timeout
countdown starts. When the AssetManagerEx starts downloading, it creates
all the tasks all at once and just `resume` upon creation. When the
number of asset files is very large, later tasks tend to end up in
'request timed out -1001' error before they can even start downloading.
This commit adds a buffer queue to prevent all the NSURLSessionTasks to
start all at once.
2015-12-01 17:24:26 +09:00
Ce Zheng
d174a98afa
Add a buffer queue for Android Downloader to prevent out of memory
...
When the AssetManagerEx start downloading, it used to create all the
download tasks all at once. When the app has a large number of asset
files, it is likely to crash due to out of memory when creating
threads for each of the download tasks. This commit adds a buffer
queue to the downloader to use the `countOfMaxProcessingTasks`
property from hints, preventing all the tasks from starting all at once.
2015-12-01 16:25:50 +09: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
肖峰
bb832f8d60
Add 3d touch support to iOS 9.0 or higher version on iPhone6s or later device
2015-12-01 13:02:53 +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
mogemimi
d539e6c797
Fix memory leak when initWithImage() failed
2015-12-01 12:48:54 +09:00
yangxiao
23f03bc65f
update comment
2015-12-01 10:47:25 +08:00
yangxiao
11f1bd6e28
builtin material normal map support
2015-12-01 10:37:53 +08:00
xiaofeng11
423726995c
Merge pull request #23 from liamcindy/pull_14393
...
update sprite 3d test
2015-11-30 16:56:33 +08:00
pandamicro
17bdfb4050
Fix android compilation issue
2015-11-30 15:20:57 +08:00
Liam
4d379ed9bd
revert ccplane
2015-11-30 14:53:37 +08:00
Liam
e0349ae975
update sprite 3d test
2015-11-30 14:48:19 +08:00
XiaoFeng
cbbfc69ad4
Add missing studio change for Director::drawScene
2015-11-30 11:19:02 +08:00