pandamicro
|
40f91ad4d2
|
Merge pull request #279 from zilongshanren/add-editobox-support
add EditBox component.
|
2016-01-26 15:18:30 +08:00 |
|
Jare Guo
|
d48e7b6957
|
add spine asset
|
2016-01-25 16:51:57 +08:00 |
|
Jare Guo
|
ba61623c53
|
modular spine
|
2016-01-25 16:16:32 +08:00 |
|
zilongshanren
|
7c66c1e4b6
|
add EditBox component.
rename editbox to sgEditBox
add editbox components
add background scale9sprite to editbox
add function to change editbox bgsprite size
add editbox properties
add string property
sync all the interfaces
refactor button event handler
finish single line editobox
finish multiline editbox
add editbox component
|
2016-01-22 18:08:04 +08:00 |
|
pandamicro
|
a48f9ba64f
|
Remove useless cocos2d modules in modular-cocos2d.js
|
2016-01-05 18:24:33 +08:00 |
|
Huabing.Xu
|
f7d4ac37ab
|
refine code
|
2015-12-22 18:52:54 +08:00 |
|
Huabing.Xu
|
b9b96e0dba
|
reformat code
|
2015-12-22 17:06:42 +08:00 |
|
Huabing.Xu
|
7db168793f
|
rename resourcedata to spriteFrame
|
2015-12-22 15:54:22 +08:00 |
|
Huabing.Xu
|
0cec75374f
|
remove ccui.Scale9Sprite.Scale9ResourceData
|
2015-12-22 15:36:16 +08:00 |
|
Huabing.Xu
|
f42ab3d490
|
scale9 sprite will base on spriteFrame directly
|
2015-12-22 15:27:40 +08:00 |
|
Huabing.Xu
|
e2e45121e6
|
refactor to use data after trimmed
|
2015-12-21 20:22:35 +08:00 |
|
knoxHuang
|
5717fe7155
|
Merge branch 'master' into sprite
Conflicts:
extensions/ccui/base-classes/UIScale9Sprite.js
|
2015-12-21 13:36:25 +08:00 |
|
knoxHuang
|
f86cad8c5f
|
cc.sprite renname _ccsg.sprite and file name
|
2015-12-21 13:29:01 +08:00 |
|
Huabing.Xu
|
0c44e4d105
|
add deprecated
|
2015-12-21 11:50:00 +08:00 |
|
Huabing.Xu
|
aefd6e5d8e
|
adding comments back
|
2015-12-21 10:16:21 +08:00 |
|
Huabing.Xu
|
6dfc52435a
|
add interface getRenderingType
|
2015-12-21 09:45:28 +08:00 |
|
Huabing.Xu
|
b768a4c267
|
param rename
|
2015-12-19 16:35:36 +08:00 |
|
Huabing.Xu
|
2ed8cec149
|
change default blend function to non premultiplied
|
2015-12-19 09:40:22 +08:00 |
|
Huabing.Xu
|
10885794b3
|
canvas works in most cases(except rotated behave error)
|
2015-12-18 15:25:49 +08:00 |
|
Huabing.Xu
|
2fa5d8727f
|
Merge branch 'master' into refine-scale9Sprite
|
2015-12-18 14:45:27 +08:00 |
|
Huabing.Xu
|
cd5f7093fa
|
Fix bug when rotated existed in sprite frame
|
2015-12-18 14:14:44 +08:00 |
|
Huabing.Xu
|
eb5d1c384c
|
add trim support
|
2015-12-17 19:10:40 +08:00 |
|
Huabing.Xu
|
36ee29ffe8
|
fix simple sliced bug
|
2015-12-17 14:48:02 +08:00 |
|
Huabing.Xu
|
0ccc57b003
|
first refactored version of scale9 sprite
|
2015-12-17 14:28:28 +08:00 |
|
knoxHuang
|
aef994d632
|
cc.ParticleSystem Renamed _ccsg.ParticleSystem
|
2015-12-16 14:40:15 +08:00 |
|
Huabing.Xu
|
3e2f568e2f
|
fix crash
|
2015-12-15 18:23:09 +08:00 |
|
Wang Nan
|
7598176923
|
Merge pull request #49 from knoxHuang/master
cc.Animation or animationCache 改名
|
2015-12-15 18:00:55 +08:00 |
|
Huabing.Xu
|
1c63ea2389
|
Merge branch 'master' into refine-scale9Sprite
|
2015-12-15 17:33:46 +08:00 |
|
Huabing.Xu
|
3b1f192cf8
|
Scale9ResourceData mixin cc.EventTarget
|
2015-12-15 17:33:35 +08:00 |
|
Huabing.Xu
|
043266b482
|
hotfix for scale9 sprite bug
|
2015-12-15 16:43:19 +08:00 |
|
knoxHuang
|
d3e73e3569
|
cc.Animation Renamed cc.SpriteFrameAnimation
cc.animationCache Renamed cc.spriteFrameAnimationCache
|
2015-12-15 14:05:05 +08:00 |
|
Huabing.Xu
|
fe3b49fb36
|
Merge branch 'master' into refine-scale9Sprite
# Conflicts:
# extensions/ccui/base-classes/UIScale9Sprite.js
|
2015-12-15 14:00:28 +08:00 |
|
pandamicro
|
7b99a3c33b
|
Fix scale9sprite setContentSize/setAnchorPoint/setBlendFunc parameter
|
2015-12-14 23:01:27 +08:00 |
|
Jare Guo
|
306f66a3eb
|
hotfix for fireball-x/fireball#891
|
2015-12-14 20:40:40 +08:00 |
|
Huabing.Xu
|
70ca307f64
|
extract ccui.Scale9Sprite.Scale9ResourceData
|
2015-12-11 11:03:13 +08:00 |
|
Jare Guo
|
1fc0b6bc9a
|
Merge commit '067f62a6568adacee1d3f114723f45e5eb7aa279'
# Conflicts:
# cocos2d/core/base-nodes/CCAtlasNode.js
# cocos2d/core/sprites/CCSprite.js
# extensions/ccui/base-classes/UIScale9Sprite.js
|
2015-12-09 20:56:38 +08:00 |
|
Jare Guo
|
ef24960351
|
mixin EventTarget instead of inherit by polyfill
|
2015-12-09 20:53:59 +08:00 |
|
knoxHuang
|
832e55d033
|
update fireball-x/fireball#433: Shielding original cc.Node and cc.Scene
|
2015-12-09 15:27:34 +08:00 |
|
knoxHuang
|
ebeb018a97
|
fix fireball-x/fireball#433: Shielding original cc.Node and cc.Scene
|
2015-12-09 14:52:41 +08:00 |
|
Huabing.Xu
|
d5e917b0b8
|
add a new empty in file end
|
2015-12-08 15:26:06 +08:00 |
|
Huabing.Xu
|
5e198e74cf
|
fix scale9 sprite draw call status
|
2015-12-08 15:24:12 +08:00 |
|
Nan Wang
|
c0f59c1598
|
synchronized to cocos2d-html5#6700f8bb94b2. starting from fresh history.
|
2015-12-05 12:22:41 +08:00 |
|