pandamicro
|
77febbfe3d
|
Merge branch 'master' into next
|
2018-03-13 15:07:21 +08:00 |
|
pandamicro
|
4e47017aa4
|
Merge branch 'v1.9'
|
2018-03-13 11:54:54 +08:00 |
|
pandamicro
|
d16559200f
|
Remove old deprecations
|
2018-03-13 10:30:15 +08:00 |
|
pandamicro
|
7d8887a18a
|
Merge pull request #2416 from 2youyou2/next
optimize camera
|
2018-03-12 16:28:08 +08:00 |
|
yinkaile
|
8705d6f4d5
|
fixed node cullingMask initialize
|
2018-03-12 15:59:49 +08:00 |
|
pandamicro
|
8aa424b7d7
|
Readd getRotation / setRotation, provide more deprecation error
|
2018-03-12 15:36:57 +08:00 |
|
Jare Guo
|
1fcc13cda4
|
Merge pull request #2418 from fusijie/add_private_node
add private node
|
2018-03-12 14:23:43 +08:00 |
|
fusijie
|
e08db3ca2c
|
add private node
|
2018-03-12 12:59:38 +08:00 |
|
pandamicro
|
b33aebe10b
|
Add Node.setWorldPos
|
2018-03-09 18:28:12 +08:00 |
|
pandamicro
|
6d6e1206be
|
Cleanup Node APIs
|
2018-03-09 18:27:56 +08:00 |
|
yinkaile
|
af5930f343
|
Merge branch 'next' of github.com:fireball-x/engine into next
# Conflicts:
# cocos2d/core/renderer/render-component-walker.js
|
2018-03-09 16:14:54 +08:00 |
|
yinkaile
|
22a1e2994a
|
1. support camera sort
2. support camera culling mask with node group
3. add MAIN_CAMERA to Canvas
|
2018-03-09 16:12:00 +08:00 |
|
pandamicro
|
8b3c089a42
|
Add back high bits zIndex in localZOrder design and add warning
|
2018-03-08 14:27:52 +08:00 |
|
pandamicro
|
5a78cf0052
|
Revert zIndex to simple value
|
2018-03-08 12:06:27 +08:00 |
|
pandamicro
|
74e10b193b
|
Fix quat not initialized issue
|
2018-03-02 15:33:11 +08:00 |
|
fusijie
|
36c77a3115
|
fixed scrollView bug.
|
2018-02-26 16:20:17 +08:00 |
|
pandamicro
|
ac1d219321
|
Event manager set correct node to dirty when change sibling index
|
2018-02-24 16:37:53 +08:00 |
|
Jare Guo
|
6c809263e6
|
Merge 1.8
|
2018-02-24 14:58:57 +08:00 |
|
James Chen
|
b8d7dc05aa
|
Fixed that we forget to observe onTouchCancelled event.
Reported at http://forum.cocos.com/t/touch-bug/56674 .
|
2018-02-24 10:45:31 +08:00 |
|
pandamicro
|
87d0e47a00
|
Deprecated Node getDisplayedOpacity & getDisplayedColor
|
2018-02-20 00:14:43 +08:00 |
|
pandamicro
|
6f2f7a6cc9
|
remove sgNode usage
|
2018-02-20 00:12:41 +08:00 |
|
pandamicro
|
3067fa3c40
|
Fix rotation inversed issue
|
2018-02-11 09:42:38 +08:00 |
|
yinkaile
|
a676485c68
|
fixed cameras
|
2018-02-09 11:37:43 +08:00 |
|
yinkaile
|
cf3f20bfc2
|
upgrade CCCamera
|
2018-02-08 18:07:43 +08:00 |
|
yinkaile
|
f1e2481a4b
|
Merge branch 'next' of github.com:fireball-x/engine into next
# Conflicts:
# cocos2d/core/renderer/index.js
|
2018-02-08 10:47:29 +08:00 |
|
pandamicro
|
b4c59387ed
|
Use 3d camera instead of old camera
|
2018-02-07 18:11:21 +08:00 |
|
pandamicro
|
e73a74c0ae
|
Add Node z setter
|
2018-02-07 18:10:01 +08:00 |
|
pandamicro
|
a4d49b90d2
|
Node use internal quaternion instead of vec3 rot
|
2018-02-07 18:09:45 +08:00 |
|
pandamicro
|
a25c01cd88
|
Merge pull request #2316 from pandamicro/next
Update deserialize code and add autoReleaseAssets type
|
2018-02-07 15:42:04 +08:00 |
|
pandamicro
|
cc06d40ab6
|
Use vec3 rot instead of rotationX & Y, apply 3d transform
|
2018-02-07 15:27:03 +08:00 |
|
pandamicro
|
a5e5787410
|
Merge pull request #2315 from pandamicro/next
Use vec3 scale instead of scaleX & scaleY
|
2018-02-07 12:30:40 +08:00 |
|
pandamicro
|
5de9366c08
|
Use vec3 scale instead of scaleX & scaleY
|
2018-02-07 12:07:05 +08:00 |
|
yinkaile
|
d93cf3acac
|
support camera
|
2018-02-07 10:59:23 +08:00 |
|
fusijie
|
d74781ff48
|
fixed node opacity
|
2018-02-01 15:01:25 +08:00 |
|
Jare Guo
|
a6fb92ad90
|
updating license
|
2018-02-01 09:38:54 +08:00 |
|
Jare Guo
|
ded7092432
|
Merge branch 'v1.8'
# Conflicts:
# cocos2d/core/platform/deserialize.js
# extensions/dragonbones/CCFactory.js
# gulp/util/utils.js
|
2018-01-25 13:47:35 +08:00 |
|
knoxHuang
|
890efb443b
|
fix gizmo error
|
2018-01-23 14:36:01 +08:00 |
|
pandamicro
|
cc1c03248b
|
Fix hit test on rotated nodes
|
2018-01-18 18:34:10 +08:00 |
|
pandamicro
|
027274708f
|
Fix issues caused by merging master
|
2018-01-16 17:28:05 +08:00 |
|
pandamicro
|
7712da14f5
|
Merge remote-tracking branch 'fireball/master' into next
|
2018-01-15 17:51:33 +08:00 |
|
shay_chen
|
482cb4b18b
|
Delete unnecessary code
|
2018-01-04 15:19:01 +08:00 |
|
shay_chen
|
b5c4f2fae6
|
Delete the calls for object.retain() and object.release()
|
2017-12-27 18:34:35 +08:00 |
|
yinkaile
|
2efc147fe2
|
Merge branch 'next' of github.com:fireball-x/engine into next
# Conflicts:
# cocos2d/core/CCDirectorCanvas.js
# cocos2d/core/CCDirectorWebGL.js
# cocos2d/core/base-nodes/CCSGNode.js
# cocos2d/core/base-nodes/CCSGNodeBaseRenderCmd.js
# cocos2d/core/sprites/CCSGSpriteWebGLRenderCmd.js
# cocos2d/core/sprites/CCScale9SpriteWebGLRenderCmd.js
# cocos2d/particle/CCParticleSystem.js
|
2017-12-26 16:11:50 +08:00 |
|
yinkaile
|
fed14c2b07
|
fixed touch event order not right
|
2017-12-25 19:01:50 +08:00 |
|
yinkaile
|
e3ff6f6fb3
|
fixed node hitTest
|
2017-12-25 16:01:56 +08:00 |
|
yinkaile
|
d85ca563f7
|
fixed node data type
|
2017-12-25 16:01:45 +08:00 |
|
pandamicro
|
a31c515557
|
Merge remote-tracking branch 'fireball/next' into next
|
2017-12-25 14:04:34 +08:00 |
|
pandamicro
|
8cf1591e3a
|
Use cc.renderer to point at new renderer
|
2017-12-25 14:02:15 +08:00 |
|
yinkaile
|
e23a97d790
|
fixed node matrix is wrong when undo/redo
|
2017-12-22 15:05:20 +08:00 |
|
Jare Guo
|
33f80773b7
|
Merge commit '87304f287ab53bfe091b6ded51def95b6904db6e'
# Conflicts:
# cocos2d/core/platform/preprocess-class.js
# extensions/dragonbones/ArmatureDisplay.js
|
2017-12-21 15:52:45 +08:00 |
|