Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix native texture hash calculation issue #4017

Merged
merged 2 commits into from Mar 12, 2019

Conversation

Projects
None yet
1 participant
@pandamicro
Copy link
Member

commented Mar 12, 2019

@pandamicro pandamicro merged commit eac7090 into cocos-creator:v2.1-release Mar 12, 2019

1 check passed

ci/circleci: test Your tests passed on CircleCI!
Details

jareguo added a commit that referenced this pull request May 7, 2019

Fix native texture hash calculation issue (#4017)
* Fix native texture hash calculation issue

* User Number instead of parseInt

jareguo added a commit that referenced this pull request May 7, 2019

Merge branch 'v2.0.10-release' into v2.1.2
* v2.0.10-release:
  add huawei platform (#4193)
  fixed error when remove current edit clip from animation component (#4202)
  setting the anchor point causes the slider to display an error (#4163)
  Fix db set slot name throw error (#4124)
  add polyfills (#4096)
  Added <video muted> attribute on video muted or volume = 0 (#4072)
  Fix native texture hash calculation issue (#4017)

# Conflicts:
#	cocos2d/core/platform/CCSys.js

jareguo added a commit that referenced this pull request May 7, 2019

Merge branch 'v2.1.2' into v2.2.0
* v2.1.2:
  add huawei platform (#4193)
  fixed error when remove current edit clip from animation component (#4202)
  setting the anchor point causes the slider to display an error (#4163)
  Fix db set slot name throw error (#4124)
  add polyfills (#4096)
  Added <video muted> attribute on video muted or volume = 0 (#4072)
  Fix native texture hash calculation issue (#4017)
  Optimize event manager. (#4209)
  Adding parameter check in tween and increase easing API doc (#4328)

jareguo added a commit that referenced this pull request May 8, 2019

Merge branch 'v2.0.10-release' into mi-runtime
* v2.0.10-release: (21 commits)
  add huawei platform (#4193)
  fixed error when remove current edit clip from animation component (#4202)
  setting the anchor point causes the slider to display an error (#4163)
  Fix db set slot name throw error (#4124)
  add polyfills (#4096)
  Added <video muted> attribute on video muted or volume = 0 (#4072)
  Fix native texture hash calculation issue (#4017)
  Optimize event manager. (#4209)
  Adding parameter check in tween and increase easing API doc (#4328)
  Fixed divSelf method smart tips (#4336)
  Fix particle throw when edit from prefab (#4339)
  fixed tween api (#4330)
  fix scrollview dispatch scroll event bug (#4310)
  Supplementary api information for videoplayer and webview. (#4293)
  Fix if addEventListener before buildArmature will invalid bug (#4295)
  fix object already destroyed warn tips (#4291)
  fix particle system leak (#4262)
  fix particle system leak (#4256)
  fix button target update (#4252)
  Supplementary label (#4240)
  ...

# Conflicts:
#	cocos2d/core/platform/CCSys.js
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.