V2.4.3 #851
Closed
V2.4.3 #851
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
update meta 2.1.2 to 2.1.3
# Conflicts: # assets/cases/3d/mesh.fire
add support platform info for 3d mesh example
add id to example cases
# Conflicts: # assets/cases/06_rendering/01_custom_ia/CustomIA.fire # assets/cases/3d/mesh-texture.effect.meta # assets/cases/dragonbones/DragonBones.fire # assets/cases/spine/SpineMesh.fire # assets/cases/spine/SpineSkin.fire.meta # assets/main menu/back icon.png.meta # assets/main menu/eject_btn.png.meta # assets/main menu/help_btn.png.meta # assets/main menu/next_scene.png.meta # assets/main menu/prev_scene.png.meta # assets/main menu/search_btn.png.meta # assets/res/atlas/emoji.png.meta # assets/res/atlas/sheep.png.meta # assets/res/atlas/ui.png.meta # assets/res/imported/barriers.png.meta # assets/res/imported/ground.png.meta # assets/res/imported/hexa.png.meta # assets/res/imported/iso-test.png.meta # assets/res/imported/particle/smoke.png.meta # assets/res/subpackage/First/gold.png.meta # assets/res/subpackage/Second/goldcoin.png.meta # assets/res/textures/bg.png.meta # assets/res/textures/close-icon.png.meta # assets/res/textures/cocos_creator.jpg.meta # assets/res/textures/cocos_creator_white.jpg.meta # assets/res/textures/compressed_texture.png.meta # assets/res/textures/content.png.meta # assets/res/textures/default_scrollbar_bg.png.meta # assets/res/textures/default_scrollbar_vertical_bg.png.meta # assets/res/textures/filled/filled_bg.png.meta # assets/res/textures/filled/filled_h_fg.png.meta # assets/res/textures/filled/filled_round_bg.png.meta # assets/res/textures/filled/filled_round_fg.png.meta # assets/res/textures/filled/filled_v_fg.png.meta # assets/res/textures/gold.png.meta # assets/res/textures/goldcoin.png.meta # assets/res/textures/monster-icon/BuleMonster.png.meta # assets/res/textures/monster-icon/GreenMonster.png.meta # assets/res/textures/monster-icon/PurpleMonster.png.meta # assets/res/textures/monster-icon/RedMonster.png.meta # assets/res/textures/monster-icon/YellowMonster.png.meta # assets/res/textures/new ui/btn_disabled.png.meta # assets/res/textures/new ui/btn_normal.png.meta # assets/res/textures/new ui/btn_pressed.png.meta # assets/res/textures/new ui/editbox_bg.png.meta # assets/res/textures/scrollbar.png.meta # assets/res/textures/scrollbarVertical.png.meta # assets/res/textures/scrollviewbg.png.meta # assets/res/textures/sheep/sheep_down_0.png.meta # assets/res/textures/sheep/sheep_down_1.png.meta # assets/res/textures/sheep/sheep_down_2.png.meta # assets/res/textures/sheep/sheep_jump_0.png.meta # assets/res/textures/sheep/sheep_jump_1.png.meta # assets/res/textures/sheep/sheep_jump_2.png.meta # assets/res/textures/sheep/sheep_jump_3.png.meta # assets/res/textures/sheep/sheep_jump_4.png.meta # assets/res/textures/sheep/sheep_run_0.png.meta # assets/res/textures/sheep/sheep_run_1.png.meta # assets/res/textures/sheep/sheep_run_2.png.meta # assets/res/textures/sheep/sheep_run_3.png.meta # assets/res/textures/sheep/sheep_touch_0.png.meta # assets/res/textures/singleColor.png.meta # assets/res/textures/sliced/button_empty.png.meta # assets/res/textures/sliced/button_green.png.meta # assets/res/textures/sliced/button_green_p2.png.meta # assets/res/textures/sliced/button_green_un2.png.meta # assets/res/textures/sliced/panel_bg.png.meta # assets/res/textures/sliced/panel_black.png.meta # assets/res/textures/sliced/panel_highlight.png.meta # assets/res/textures/sliced/ui_panel.png.meta # assets/res/textures/star.png.meta # assets/res/textures/star_slot.png.meta # assets/res/textures/tab-bg.png.meta # assets/res/textures/tiled/barBg.png.meta # assets/res/textures/tiled/barFg.png.meta # assets/res/textures/tiled/ground.png.meta # assets/res/textures/ui/style1/add.png.meta # assets/res/textures/ui/style1/attention.png.meta # assets/res/textures/ui/style1/attention_padded.png.meta # assets/res/textures/ui/style1/btnDisabled.png.meta # assets/res/textures/ui/style1/btnHover.png.meta # assets/res/textures/ui/style1/btnNormal.png.meta # assets/res/textures/ui/style1/btnPressed.png.meta # assets/res/textures/ui/style1/btn_options.png.meta # assets/res/textures/ui/style1/btn_play.png.meta # assets/res/textures/ui/style1/cancel.png.meta # assets/res/textures/ui/style1/panelBG.png.meta # assets/res/textures/ui/style1/question.png.meta # assets/res/textures/ui/style1/restart.png.meta # assets/res/textures/ui/style1/setup.png.meta # assets/res/textures/ui/style2/bg.png.meta # assets/res/textures/ui/style2/btn_normal.png.meta # assets/res/textures/ui/style2/btn_pressed.png.meta # assets/res/textures/ui/style2/scrollview_bar.png.meta # assets/res/textures/ui/style2/scrollview_bg.png.meta # assets/res/textures/ui/ui.png.meta # assets/res/textures/ui/videplayIcon.jpg.meta # assets/res/textures/webp/Lenna.webp.meta # assets/resources/dragonBones/texture.png.meta # assets/resources/font/enligsh-chinese.png.meta # assets/resources/font/mikado_outline_shadow.png.meta # assets/resources/font/shuzibiaoqian03.png.meta # assets/resources/font/tuffy_bold_italic-charmap.png.meta # assets/resources/font/xmlBMFont.png.meta # assets/resources/goblins/goblins-pma.png.meta # assets/resources/loadSpine/alien.png.meta # assets/resources/loadingBar/enligsh-chinese.png.meta # assets/resources/loadingBar/font.png.meta # assets/resources/loadingBar/mikado_outline_shadow.png.meta # assets/resources/motionStreak/streak.png.meta # assets/resources/spineRaptor/raptor.png.meta # assets/resources/spineboy/spineboy.png.meta # assets/resources/test_assets/PurpleMonster.png.meta # assets/resources/test_assets/atlas.png.meta # assets/resources/test_assets/font.png.meta # assets/resources/test_assets/image.png.meta # assets/resources/tilemap/tile_iso_offset.png.meta # assets/resources/tilemap/tile_iso_offset_with_tsx1.png.meta # assets/resources/tilemap/tile_iso_offset_with_tsx2.png.meta # assets/resources/tips/corner_mark.png.meta
Merge commit v2.1.3 into v2.2.0-release
refine example
…elease # Conflicts: # assets/cases/3d/raycast.fire
Merge commit v2.1.3-release into v2.2.0-release
add missing texture
improve Subpackages examples
# Conflicts: # assets/cases/3d/screen-to-world-point.fire # assets/cases/subpackage/Subpackages.fire # assets/resources/goblins/goblins-pma.png.meta # settings/project.json
Merge commit '2.1.4-release' into v2.2.0-release …
* change some url to https * change some url to https 2
* Fix custom trail material. * modify custom particle
* add wechat pc * update videoplayer
* adapter asset-manager * enable autoReleaseAssets * support asset manager * refine
* Resave the preloaded test scene. * commit meta
* Add TTF test cases * fix assets/cases/02_ui/02_label.meta
* don't show asset bundle in preview * refine
* add preloadscene * refine format * refine format
* add tips for multiTouch scene (#842) * add tips for multiTouch scene * correction code * Add an example case for curve animation. (#843) * Upgrade to 2.4 (#845) Co-authored-by: zhefeng.zhang <[email protected]> Co-authored-by: cary <[email protected]> Co-authored-by: kenshin <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
ssssssssssss