Commit Graph

17466 Commits

Author SHA1 Message Date
2youyouo2 faa34caa4b export Curve and Bezier helper 2015-12-14 11:17:39 +08:00
2youyouo2 d13481a3a5 should return when motionPaths length is 0 2015-12-14 11:17:07 +08:00
2youyouo2 29ee9ce1b2 Merge branch 'master' of github.com:fireball-x/engine 2015-12-14 09:32:51 +08:00
Jare Guo 07bce2fbb5 Merge pull request #41 from jareguo/master
offset the canvas to make it align to center of the screen if FIXED_W…
2015-12-14 01:16:08 +08:00
Jare Guo b958846dfd offset the canvas to make it align to center of the screen if FIXED_WIDTH or FIXED_HEIGHT 2015-12-14 01:15:09 +08:00
pandamicro 3ca506cf50 Merge pull request #40 from pandamicro/master
Fix _setLocalZOrder usage
2015-12-13 09:26:02 +08:00
pandamicro b7581b6b58 Fix _setLocalZOrder usage 2015-12-13 09:22:33 +08:00
Jare Guo 6e0db2ed65 Merge pull request #33 from pandamicro/master
Fix issues for jsb runtime
2015-12-13 00:19:00 +08:00
pandamicro a4a051404e reverse function invocation to property usage 2015-12-12 23:29:17 +08:00
pandamicro 7a1fac062d Fix issues for jsb runtime 2015-12-12 23:29:17 +08:00
pandamicro 45657da750 Fix issues for jsb build 2015-12-12 23:27:55 +08:00
Wang Nan c2921415da Merge pull request #39 from nantas/master
fix node.opacity property name.
2015-12-12 18:06:13 +08:00
Nan Wang 8d945dd986 fix node.opacity property name. 2015-12-12 18:04:48 +08:00
Jare Guo c40c2e3f77 Merge pull request #38 from jareguo/master
_ccsg.Node should alloc instance id if defined by cc.Class
2015-12-12 16:45:31 +08:00
Jare Guo 68a3687426 _ccsg.Node should alloc instance id if defined by cc.Class 2015-12-12 16:45:06 +08:00
Wang Nan a95b73f788 Merge pull request #37 from nantas/master
fixed cc.Object api comment.
2015-12-12 16:02:10 +08:00
Nan Wang 1df8075bff fixed cc.Object api comment. 2015-12-12 15:59:24 +08:00
2youyouo2 12bc4582d4 Merge branch 'master' of github.com:fireball-x/engine 2015-12-12 14:13:14 +08:00
Wang Nan fbc2bbc8f5 Merge pull request #35 from nantas/master
remove compiling editor template jsb_polyfill from build engine.
2015-12-12 14:12:37 +08:00
Jare Guo 364578146c Merge pull request #36 from 2youyouo2/master
fixed equalClips
2015-12-12 14:04:37 +08:00
2youyouo2 7cef8c0239 Merge branch 'master' of github.com:fireball-x/engine 2015-12-12 13:20:39 +08:00
2youyouo2 96ff975556 fixed equalClips 2015-12-12 12:56:35 +08:00
Nan Wang ff7dbc2288 remove compiling editor template jsb_polyfill from build engine. 2015-12-12 11:03:53 +08:00
Jare Guo 0eb71f73af Merge pull request #34 from jareguo/master
canvas should use design resolution size
2015-12-12 01:45:15 +08:00
Jare Guo 1ddec54b1c canvas should use design resolution size (+1 squashed commit)
Squashed commits:
[edaaa1b] fix computing position of standalone widget
2015-12-12 01:43:45 +08:00
Huabing.Xu aa98f5109c Merge branch 'master' into feature-mask
# Conflicts:
#	cocos2d/core/components/index.js
2015-12-11 11:05:32 +08:00
Huabing.Xu 70ca307f64 extract ccui.Scale9Sprite.Scale9ResourceData 2015-12-11 11:03:13 +08:00
Wang Nan 8bc463aa60 Merge pull request #21 from zilongshanren/addProgressBar
Add progress bar
2015-12-10 20:38:07 +08:00
zilongshanren 6748eeae65 reset progress bar size and position 2015-12-10 19:47:10 +08:00
Wang Nan da1e34ec7a Merge pull request #32 from nantas/master
correct example path.
2015-12-10 19:35:06 +08:00
Nan Wang 3981104a1f correct example path. 2015-12-10 19:26:35 +08:00
Wang Nan ce7e12df72 Merge pull request #31 from nantas/comment-review
fixed code-editor parsing error for engine apis.
2015-12-10 19:15:08 +08:00
Jare Guo 4eabfda712 Merge pull request #30 from jareguo/master
add designResolution for CCCanvas
2015-12-10 18:10:38 +08:00
Jare Guo d99880c11f add designResolution for CCCanvas 2015-12-10 18:05:30 +08:00
pandamicro 7e50283bdd Merge pull request #29 from pandamicro/master
fireball-x/fireball#454: Fix issues in JS bindings
2015-12-10 18:02:44 +08:00
pandamicro 8c29ce728d fireball-x/fireball#454: Fix issues in JS bindings 2015-12-10 17:58:31 +08:00
Nan Wang 4b059294d2 fixed code-editor parsing error for engine apis. 2015-12-10 16:38:26 +08:00
Jare Guo 0d1ccf68a8 Merge pull request #28 from 2youyouo2/master
add executeInEditMode for animation
2015-12-10 15:11:14 +08:00
Jare Guo 901eb1bc74 revert hotfix code 2015-12-10 15:06:00 +08:00
2youyouo2 fb093695f7 animation should not init in onLoad in editor 2015-12-10 15:04:12 +08:00
2youyouo2 7ac11eb3ca add executeInEditMode for CCAnimation 2015-12-10 14:33:09 +08:00
zilongshanren f6f5d90ab4 don't use old value, keep the code more cleaner 2015-12-10 14:06:59 +08:00
zilongshanren 4d008d3728 fix bar sprite 2015-12-10 12:04:40 +08:00
zilongshanren 8f299d33d9 update progress bar format 2015-12-10 11:21:50 +08:00
Jare Guo c64a008dfc Merge pull request #27 from jareguo/master
canvas should adjust position automatically to fit the screen
2015-12-10 01:43:45 +08:00
Jare Guo a6435dac88 canvas should adjust position automatically to fit the screen 2015-12-10 01:41:34 +08:00
Jare Guo 748fd8f74b Merge pull request #26 from jareguo/master
add size-changed event for node
2015-12-10 00:32:34 +08:00
Jare Guo 627fb37874 add size-changed event for node 2015-12-10 00:28:47 +08:00
Jare Guo c040995ca1 Merge pull request #25 from jareguo/master
add polyfill for cc.ENode and cc.EScene
2015-12-10 00:28:29 +08:00
Jare Guo 22fe2e1146 add polyfill for cc.ENode and cc.EScene 2015-12-10 00:26:32 +08:00