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

Node:Particle3D abnormal texture effects #19204

Merged
merged 1 commit into from
Nov 23, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Binary file modified docs/cocos2dx_portrait.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified templates/cpp-template-default/Resources/CloseNormal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified templates/cpp-template-default/Resources/CloseSelected.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified templates/cpp-template-default/Resources/HelloWorld.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified templates/js-template-default/res/HelloWorld.png
Binary file modified templates/lua-template-default/res/HelloWorld.png
Binary file modified tests/cpp-empty-test/Resources/bang.png
Binary file modified tests/cpp-empty-test/Resources/icons/Icon-20.png
Binary file modified tests/cpp-empty-test/Resources/icons/Icon-20@2x.png
Binary file modified tests/cpp-empty-test/Resources/icons/Icon-20@3x.png
Binary file modified tests/cpp-empty-test/Resources/icons/Icon-29.png
Binary file modified tests/cpp-empty-test/Resources/icons/Icon-29@2x.png
Binary file modified tests/cpp-empty-test/Resources/icons/Icon-29@3x.png
Binary file modified tests/cpp-empty-test/Resources/icons/Icon-40.png
Binary file modified tests/cpp-empty-test/Resources/icons/Icon-40@2x.png
Binary file modified tests/cpp-empty-test/Resources/icons/Icon-40@3x.png
Binary file modified tests/cpp-empty-test/Resources/icons/Icon-50.png
Binary file modified tests/cpp-empty-test/Resources/icons/Icon-50@2x.png
Binary file modified tests/cpp-empty-test/Resources/icons/Icon-57.png
Binary file modified tests/cpp-empty-test/Resources/icons/Icon-57@2x.png
Binary file modified tests/cpp-empty-test/Resources/icons/Icon-60@2x.png
Binary file modified tests/cpp-empty-test/Resources/icons/Icon-60@3x.png
Binary file modified tests/cpp-empty-test/Resources/icons/Icon-72.png
Binary file modified tests/cpp-empty-test/Resources/icons/Icon-72@2x.png
Binary file modified tests/cpp-empty-test/Resources/icons/Icon-76.png
Binary file modified tests/cpp-empty-test/Resources/icons/Icon-76@2x.png
Binary file modified tests/cpp-empty-test/Resources/icons/Icon-83.5@2x.png
Binary file modified tests/cpp-empty-test/Resources/ipad/CloseNormal.png
Binary file modified tests/cpp-empty-test/Resources/ipad/CloseSelected.png
Binary file modified tests/cpp-empty-test/Resources/ipad/HelloWorld.png
Binary file modified tests/cpp-empty-test/Resources/ipadhd/CloseNormal.png
Binary file modified tests/cpp-empty-test/Resources/ipadhd/CloseSelected.png
Binary file modified tests/cpp-empty-test/Resources/ipadhd/HelloWorld.png
Binary file modified tests/cpp-empty-test/Resources/iphone/CloseNormal.png
Binary file modified tests/cpp-empty-test/Resources/iphone/CloseSelected.png
Binary file modified tests/cpp-empty-test/Resources/iphone/HelloWorld.png
Binary file modified tests/cpp-empty-test/proj.ios/LaunchScreenBackground.png
Binary file modified tests/cpp-empty-test/proj.win10/Assets/LockScreenLogo.scale-200.png
Binary file modified tests/cpp-empty-test/proj.win10/Assets/StoreLogo.png
Binary file modified tests/cpp-tests/Resources/ActionTimeline/Default/Button_Disable.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/ActionTimeline/Default/Sprite.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/ActionTimeline/testAnimationResource/1.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/ActionTimeline/testAnimationResource/2.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/ActionTimeline/testAnimationResource/3.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/ActionTimeline/testAnimationResource/4.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/ActionTimeline/testAnimationResource/5.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/ActionTimeline/testAnimationResource/6.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/ActionTimeline/testAnimationResource/7.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/ActionTimeline/testAnimationResource/8.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/ActionTimeline/testAnimationResource/hat.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Hello.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/Comet.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/CyanSquare.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/CyanTriangle.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/Fog.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/HelloWorld.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/Icon.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/MagentaSquare.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/Pea.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/SendScoreButton.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/SendScoreButtonPressed.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/SpinningPeas.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/SpookyPeas.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/YellowSquare.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/YellowTriangle.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/arrows-hd.png
Binary file modified tests/cpp-tests/Resources/Images/arrows.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/arrowsBar-hd.png
Binary file modified tests/cpp-tests/Resources/Images/arrowsBar.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/assetMgrBackground2.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/assetMgrBackground3.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/atlastest.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/b1.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/b2.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/background.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/background1.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/background2.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/background3.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/ball.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/bitmapFontTest3.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/blocks.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/blocks9.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/blocks9c.png
Binary file modified tests/cpp-tests/Resources/Images/blocks9cr.png
Binary file modified tests/cpp-tests/Resources/Images/blocks9r.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/blocks9ss.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/btn-about-normal-vertical.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/btn-about-normal.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/btn-about-selected.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/btn-highscores-normal.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/btn-highscores-selected.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/btn-play-normal.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/btn-play-selected.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/bug12847_sprite.png
Binary file modified tests/cpp-tests/Resources/Images/bug12847_spriteframe.png
Binary file modified tests/cpp-tests/Resources/Images/bug14017.png
Binary file modified tests/cpp-tests/Resources/Images/bugs/bug886.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/bugs/circle.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/bugs/corner.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/bugs/edge.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/bugs/fill.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/bugs/picture.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/close.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/cocos-html5.png
Binary file modified tests/cpp-tests/Resources/Images/cocos2dbanner.png
Binary file modified tests/cpp-tests/Resources/Images/concave.png
Binary file modified tests/cpp-tests/Resources/Images/dot.png
Binary file modified tests/cpp-tests/Resources/Images/elephant1_Diffuse.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/elephant1_Normal.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/f1.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/f2.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/fire-grayscale.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/fire.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/fps_images.png
Binary file modified tests/cpp-tests/Resources/Images/grossini.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/grossini_dance_01.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/grossini_dance_02.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/grossini_dance_03.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/grossini_dance_04.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/grossini_dance_05.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/grossini_dance_06.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/grossini_dance_07.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/grossini_dance_08.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/grossini_dance_09.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/grossini_dance_10.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/grossini_dance_11.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/grossini_dance_12.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/grossini_dance_13.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/grossini_dance_14.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/grossini_dance_atlas-mono.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/grossini_dance_atlas.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/grossini_dance_atlas_nomipmap.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/grossinis_heads.png
Binary file modified tests/cpp-tests/Resources/Images/grossinis_sister1-testalpha.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/grossinis_sister1.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/grossinis_sister2.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/hole_effect.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/hole_stencil.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/island_polygon.png
Binary file modified tests/cpp-tests/Resources/Images/issue_17116.png
Binary file modified tests/cpp-tests/Resources/Images/issue_17119.png
Binary file modified tests/cpp-tests/Resources/Images/labelatlas.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/menuitemsprite.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/movement.png
Binary file modified tests/cpp-tests/Resources/Images/noise.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/paddle.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/particles-hd.png
Binary file modified tests/cpp-tests/Resources/Images/particles.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/pattern1.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/piece.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/poly_test_textures.png
Binary file modified tests/cpp-tests/Resources/Images/powered.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/r1.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/r2.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/shapemode.png
Binary file modified tests/cpp-tests/Resources/Images/snow.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/sprite_frames_test/test_AI88.png
Binary file modified tests/cpp-tests/Resources/Images/sprite_polygon_crash.png
Binary file modified tests/cpp-tests/Resources/Images/sprites_test/sprite-0-0.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/sprites_test/sprite-0-1.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/sprites_test/sprite-0-2.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/sprites_test/sprite-0-3.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/sprites_test/sprite-0-4.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/sprites_test/sprite-0-5.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/sprites_test/sprite-0-6.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/sprites_test/sprite-0-7.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/sprites_test/sprite-1-0.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/sprites_test/sprite-1-1.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/sprites_test/sprite-1-2.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/sprites_test/sprite-1-3.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/sprites_test/sprite-1-4.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/sprites_test/sprite-1-5.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/sprites_test/sprite-1-6.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/sprites_test/sprite-1-7.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/sprites_test/sprite-2-0.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/sprites_test/sprite-2-1.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/sprites_test/sprite-2-2.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/sprites_test/sprite-2-3.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/sprites_test/sprite-2-4.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/sprites_test/sprite-2-5.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/sprites_test/sprite-2-6.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/sprites_test/sprite-2-7.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/sprites_test/sprite-3-0.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/sprites_test/sprite-3-1.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/sprites_test/sprite-3-2.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/sprites_test/sprite-3-3.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/sprites_test/sprite-3-4.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/sprites_test/sprite-3-5.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/sprites_test/sprite-3-6.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/sprites_test/sprite-3-7.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/sprites_test/sprite-4-0.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/sprites_test/sprite-4-1.png
100644 → 100755
Binary file modified tests/cpp-tests/Resources/Images/sprites_test/sprite-4-2.png
100644 → 100755
Loading