Skip to content

fix bug: ParticelBatchNode effect is inconsistent with ParticelSystem #1267

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Nov 25, 2013
Merged

fix bug: ParticelBatchNode effect is inconsistent with ParticelSystem #1267

merged 1 commit into from
Nov 25, 2013

Conversation

@rablwupei
Copy link
Contributor

@rablwupei rablwupei commented Nov 24, 2013

No description provided.

@dingpinglv
Copy link
Contributor

dingpinglv commented Nov 25, 2013

Thanks, Wupei.

dingpinglv added a commit that referenced this pull request Nov 25, 2013
@dingpinglv
Merge pull request #1267 from rablwupei/fix_particle
3b6142b 
fix bug: ParticelBatchNode effect is inconsistent with ParticelSystem
@dingpinglv dingpinglv merged commit 3b6142b into cocos2d:develop Nov 25, 2013
@rablwupei rablwupei deleted the fix_particle branch November 25, 2013 02:21
dingpinglv added a commit to dingpinglv/cocos2d-html5 that referenced this pull request Jan 12, 2015
@dingpinglv
Issue cocos2d#1267: refactor ccui's visit
289944b
dingpinglv added a commit to dingpinglv/cocos2d-html5 that referenced this pull request Jan 12, 2015
@dingpinglv
Issue cocos2d#1267: Migrating ccui.Scale9Sprite
7ecdcf4
dingpinglv added a commit to dingpinglv/cocos2d-html5 that referenced this pull request Jan 12, 2015
@dingpinglv
Issue cocos2d#1267: Migrating ccui.Scale9Sprite
7d476c5
dingpinglv added a commit to dingpinglv/cocos2d-html5 that referenced this pull request Jan 12, 2015
@dingpinglv
Issue cocos2d#1267: revert ccui.Scale9Sprite, because WebGL renderer …
56cebd8 
…doesn't support auto-batch
dingpinglv added a commit to dingpinglv/cocos2d-html5 that referenced this pull request Jan 12, 2015
@dingpinglv
Issue cocos2d#1267: added flippedX/flippedY to ccui.Scale9Sprite
71efef0
dingpinglv added a commit to dingpinglv/cocos2d-html5 that referenced this pull request Jan 12, 2015
@dingpinglv
Issue cocos2d#1267: implemented ccui.Scale9Sprite's setState
7931299
dingpinglv added a commit to dingpinglv/cocos2d-html5 that referenced this pull request Jan 12, 2015
@dingpinglv
Issue cocos2d#1267: migrating UIWidget.js
064784b
dingpinglv added a commit to dingpinglv/cocos2d-html5 that referenced this pull request Jan 12, 2015
@dingpinglv
Issue cocos2d#1267: migrated ccui.Widget
1ee6e7a
VisualSJ added a commit to VisualSJ/cocos2d-html5 that referenced this pull request Jan 12, 2015
@VisualSJ
Issue cocos2d#1267: update UIButton.js
33298c3
VisualSJ added a commit to VisualSJ/cocos2d-html5 that referenced this pull request Jan 12, 2015
@VisualSJ
Issue cocos2d#1267: update UICheckBox.js
5b7fb17
VisualSJ added a commit to VisualSJ/cocos2d-html5 that referenced this pull request Jan 12, 2015
@VisualSJ
Issue cocos2d#1267: remove _updateFlipped
f4433a4
VisualSJ added a commit to VisualSJ/cocos2d-html5 that referenced this pull request Jan 12, 2015
@VisualSJ
Issue cocos2d#1267: update UIImageView.js
82f0cd6
VisualSJ added a commit to VisualSJ/cocos2d-html5 that referenced this pull request Jan 12, 2015
@VisualSJ
Issue cocos2d#1267: update UILoadingBar.js
0d73663
VisualSJ added a commit to VisualSJ/cocos2d-html5 that referenced this pull request Jan 12, 2015
@VisualSJ
Issue cocos2d#1267: update UISlider.js
1fdc125
VisualSJ added a commit to VisualSJ/cocos2d-html5 that referenced this pull request Jan 12, 2015
@VisualSJ
Issue cocos2d#1267: update UIText.js
eab417d
dingpinglv added a commit to dingpinglv/cocos2d-html5 that referenced this pull request Jan 13, 2015
@dingpinglv
Issue cocos2d/cocos2d-js/cocos2d#1267: ccui.LayoutComponent has been …
97c40ad 
…migrated.
dingpinglv added a commit to dingpinglv/cocos2d-html5 that referenced this pull request Jan 13, 2015
@dingpinglv
Issue cocos2d/cocos2d-js/cocos2d#1267: ccui.Layout has been migrated.
f768e9e
dingpinglv added a commit to dingpinglv/cocos2d-html5 that referenced this pull request Jan 13, 2015
@dingpinglv
Issue cocos2d/cocos2d-js/cocos2d#1267: ccui.helper has been migrated.
6105e3d
dingpinglv added a commit to dingpinglv/cocos2d-html5 that referenced this pull request Jan 13, 2015
@dingpinglv
Issue cocos2d/cocos2d-js/cocos2d#1267: ccui.PageView and ccui.ScrollV…
964e410 
…iew have been migrated.
dingpinglv added a commit to dingpinglv/cocos2d-html5 that referenced this pull request Jan 13, 2015
@dingpinglv
Issue cocos2d/cocos2d-js/cocos2d#1267: ccui.ListView has been migrated.
0e5e3b5
dingpinglv added a commit to dingpinglv/cocos2d-html5 that referenced this pull request Jan 13, 2015
@dingpinglv
Issue cocos2d#1267: ccui.TextAtlas and ccui.TextBMFont have been migr…
49e059e 
…ated.
dingpinglv added a commit to dingpinglv/cocos2d-html5 that referenced this pull request Jan 13, 2015
@dingpinglv
Issue cocos2d#1267: modified ccui.Button's codes
5fa5ffa
dingpinglv added a commit to dingpinglv/cocos2d-html5 that referenced this pull request Jan 13, 2015
@dingpinglv
Fixed cocos2d/cocos2d-js/cocos2d#1267: fixed a bug of ccui.Button
ccd0885
dingpinglv added a commit to dingpinglv/cocos2d-html5 that referenced this pull request Jan 13, 2015
@dingpinglv
Fixed cocos2d/cocos2d-js/cocos2d#1267: fixed a bug of ccui.Button tha…
c1670dd 
…t its content size is incorrect.
dingpinglv added a commit to dingpinglv/cocos2d-html5 that referenced this pull request Jan 13, 2015
@dingpinglv
Fixed cocos2d#1267: add 'isSwallowTouches' to cc._EventListenerTouchO…
9ff1f27 
…neByOne
dingpinglv added a commit to dingpinglv/cocos2d-html5 that referenced this pull request Jan 13, 2015
@dingpinglv
Fixed cocos2d#1267: correct a jsDoc of ccui.Button
36bb01f
dingpinglv added a commit to dingpinglv/cocos2d-html5 that referenced this pull request Jan 13, 2015
@dingpinglv
Fixed cocos2d#1267: refactor ccui.Button, ccui.Slider and ccui.TextFi…
ae2d03d 
…eld's eventCallback
dingpinglv added a commit that referenced this pull request Jan 13, 2015
@dingpinglv
Merge pull request #2589 from dingpinglv/Iss1267_MigrateUI
b20fe05 
Fixed cocos2d/cocos2d-js/#1267: ccui has been migrated
dingpinglv added a commit to dingpinglv/cocos2d-html5 that referenced this pull request Jan 27, 2015
@dingpinglv
Fixed cocos2d/cocos2d-js/cocos2d#1267: migrated the up-to-date -x UI
a9d70ba
@dingpinglv dingpinglv mentioned this pull request Jan 27, 2015
Merged
dingpinglv added a commit that referenced this pull request Jan 27, 2015
@dingpinglv
Merge pull request #2647 from dingpinglv/Iss1267_MigrateUI
2a9cda0 
Fixed cocos2d/cocos2d-js/#1267: migrated the up-to-date -x UI
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@rablwupei @dingpinglv