Jare Guo
|
145b2fcecf
|
support spine
|
2017-10-11 16:36:38 +08:00 |
|
pandamicro
|
f7d920dd1b
|
Merge pull request #2025 from jareguo/asset
working on texture asset
|
2017-10-09 20:43:13 -05:00 |
|
Jare Guo
|
2fa9571205
|
reviewed
|
2017-10-10 01:04:43 +08:00 |
|
Jare Guo
|
c592141bc7
|
fixes
|
2017-10-08 13:30:23 +08:00 |
|
Jare Guo
|
a815a844f9
|
Merge master
# Conflicts:
# cocos2d/core/textures/CCTexture2D.js
# cocos2d/core/textures/CCTextureCache.js
|
2017-10-07 18:46:57 +08:00 |
|
Jare Guo
|
e0a92f093b
|
Merge pull request #2023 from cocos-creator/master
Sync master
|
2017-10-07 05:40:36 -05:00 |
|
Jare Guo
|
ccc91746cb
|
support deferred load texture in runtime
|
2017-10-07 17:53:56 +08:00 |
|
Jare Guo
|
36f2767e41
|
tweaks (+1 squashed commit)
Squashed commits:
[f2bb64e] tweaks
|
2017-10-07 16:18:51 +08:00 |
|
Jare Guo
|
a1c535c6bb
|
update texture in property
|
2017-10-07 16:18:51 +08:00 |
|
Jare Guo
|
79c4913964
|
Merge pull request #1987 from jareguo/asset
[WIP] Refactoring Texture2D to Asset
|
2017-10-07 03:02:45 -05:00 |
|
Jare Guo
|
7a3bc0c724
|
Merge pull request #2014 from pandamicro/master
Support mouse propagation
|
2017-10-04 10:36:12 -05:00 |
|
pandamicro
|
77aaf77604
|
Support mouse propagation
|
2017-10-01 22:31:25 +08:00 |
|
pandamicro
|
07b4acd2b9
|
Merge pull request #2013 from pandamicro/master
Add separate macro to control texture shrink in tiled map
|
2017-10-01 20:49:18 +08:00 |
|
Jare Guo
|
5c443fecd2
|
remove comments
|
2017-10-01 12:55:09 +08:00 |
|
pandamicro
|
5dcca53c6d
|
Remove premultiply alpha setting by png file detection
|
2017-09-30 12:58:47 +08:00 |
|
pandamicro
|
549b3c7ac1
|
Add CC_FIX_ARTIFACTS_BY_STRECHING_TEXEL_TMX to control texture shrink in tiled map
|
2017-09-30 12:58:14 +08:00 |
|
Jare Guo
|
bca9d854ac
|
deprecate texture.releaseTexture(), use texture.destroy() instead
|
2017-09-28 22:55:59 +08:00 |
|
Jare Guo
|
69bc927d90
|
Merge pull request #2011 from cocos-creator/revert-2005-master
Revert "修复 DragonBones 名字相同,骨骼数据不同时无法正确加载的问题"
|
2017-09-28 05:01:06 -05:00 |
|
Jare Guo
|
3742ab8f16
|
Revert "修复 DragonBones 名字相同,骨骼数据不同时无法正确加载的问题"
|
2017-09-28 04:58:07 -05:00 |
|
Wang Nan
|
80ce092f8b
|
Merge pull request #2005 from jareguo/master
修复 DragonBones 名字相同,骨骼数据不同时无法正确加载的问题
|
2017-09-28 04:54:11 -05:00 |
|
Wang Nan
|
a7e4b599e5
|
Merge pull request #2007 from dumganhar/fix/createWithTTF
Fixes passing wrong argument to createWithTTF
|
2017-09-28 04:52:57 -05:00 |
|
Jare Guo
|
eff438f784
|
Merge pull request #2008 from 2youyou2/master
minor fix for animation
|
2017-09-28 02:58:44 -05:00 |
|
2youyouo2
|
8c9896c01b
|
fixed animation pause
|
2017-09-28 15:49:32 +08:00 |
|
2youyouo2
|
2dbc70a4ac
|
fixed init animation curve
|
2017-09-28 15:48:46 +08:00 |
|
James Chen
|
172d650428
|
Fixes passing wrong argument to createWithTTF
|
2017-09-28 15:14:25 +08:00 |
|
Jare Guo
|
e0468ff9f9
|
Merge pull request #1 from feijing566/master
[dragonBones] Determine whether there is a new armature
|
2017-09-27 02:37:25 -05:00 |
|
pandamicro
|
9c21024fce
|
Merge branch 'master' of github.com:cocos-creator/engine
|
2017-09-27 12:52:49 +05:30 |
|
feijing566
|
3f63f50859
|
Determine whether there is a new armature
|
2017-09-26 14:32:05 +08:00 |
|
Jare Guo
|
3e3b3bef67
|
Merge pull request #2001 from 2youyou2/master
remove AnimationNode
|
2017-09-25 22:20:50 -05:00 |
|
2youyouo2
|
d3ce14c677
|
refine code
|
2017-09-26 11:11:18 +08:00 |
|
2youyouo2
|
c108123b40
|
add AnimationState to AnimationAnimator in AnimationState onPlay
|
2017-09-26 10:46:42 +08:00 |
|
2youyouo2
|
5fccfd4477
|
remove AnimationNode
|
2017-09-26 10:06:02 +08:00 |
|
Jare Guo
|
e27666cfac
|
update jsb
|
2017-09-25 17:19:12 +08:00 |
|
Jare Guo
|
9894641229
|
Merge pull request #1997 from cocos-creator/master
Sync master
|
2017-09-22 20:22:57 -05:00 |
|
Jare Guo
|
6561b380ff
|
Merge commit 'c0a1b5e369829cd2fd63b52b4cb588690e3ddeea' into asset
|
2017-09-23 09:02:21 +08:00 |
|
Jare Guo
|
64c13c7dab
|
sync jsb
|
2017-09-23 09:02:13 +08:00 |
|
Jare Guo
|
c0a1b5e369
|
Merge pull request #1995 from jareguo/master
fix anysdk getIAPPlugins
|
2017-09-21 23:47:47 -05:00 |
|
Jare Guo
|
391070653b
|
fix anysdk getIAPPlugins
|
2017-09-22 12:00:34 +08:00 |
|
Jare Guo
|
e1601ac00f
|
Merge 1.6
# Conflicts:
# cocos2d/core/CCDirector.js
# cocos2d/core/components/CCSprite.js
|
2017-09-22 10:48:01 +08:00 |
|
Wang Nan
|
f147fcdbc1
|
Merge pull request #1994 from knoxHuang/v1.6
fix webview event error for fireball/issues/6328
|
2017-09-22 10:31:11 +08:00 |
|
Wang Nan
|
d4b5071f74
|
Merge pull request #1993 from 2youyou2/optimize-animation
Optimize animation
|
2017-09-22 10:26:59 +08:00 |
|
Jare Guo
|
a39f58d916
|
reviewed
|
2017-09-22 00:39:45 +08:00 |
|
knoxHuang
|
320d5d5915
|
fix webview event error for fireball/issues/6328
|
2017-09-21 16:51:43 +08:00 |
|
2youyouo2
|
a73dc7a0ff
|
stop AnimationAnimator if all animations are removed
|
2017-09-21 15:28:13 +08:00 |
|
2youyouo2
|
d5cd11a8b1
|
Merge branch 'master' into optimize-animation
|
2017-09-21 15:06:59 +08:00 |
|
Jare Guo
|
c384c1e8ef
|
Merge pull request #1992 from 2youyou2/master
fixed global variable
|
2017-09-21 01:41:24 -05:00 |
|
2youyouo2
|
2f66ecce71
|
fixed global variable
|
2017-09-21 14:37:01 +08:00 |
|
Jare Guo
|
083a213ce2
|
Merge pull request #1991 from 2youyou2/v1.6
fixed duplicate definition
|
2017-09-21 01:11:49 -05:00 |
|
2youyouo2
|
15ef9ba0d3
|
fixed duplicate definition
|
2017-09-21 14:05:59 +08:00 |
|
Jare Guo
|
fcfb81f1af
|
Merge pull request #1989 from 2youyou2/native-modular
Native modular
|
2017-09-19 04:22:00 -05:00 |
|