fix issue #18423 #18451
Merged
fix issue #18423 #18451
Conversation
This file contains 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
stevetranby
added a commit
to stevetranby/cocos2d-x
that referenced
this pull request
Nov 19, 2017
* commit 'bceb242ebd9c0bf60fdf1cfcf671efc47f07e1ee': (28 commits) no message (cocos2d#18460) Added missing #include statement (cocos2d#18452) Fix cocos2d::log va_list re-use bug (cocos2d#18426) Improve StringUtils::format implementation. (cocos2d#18425) RichText improvements (cocos2d#18447) Update CCTableView.cpp (cocos2d#18451) Update UIWebViewImpl-ios.mm (cocos2d#18448) Reverts add search path logic in PR cocos2d#17435 . (cocos2d#18419) Fix 60 fps for android (cocos2d#18445) set texture anti-alias by deault in RenderTexture (cocos2d#18442) fix typos (cocos2d#18444) [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (cocos2d#18440) Spine update (cocos2d#18438) remove vs2013 libs (cocos2d#18439) Revert cocos2d#18327 (cocos2d#18436) [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (cocos2d#18435) update glfw to 3.2.1 (cocos2d#18434) Editbox init member variable (cocos2d#18432) [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (cocos2d#18431) Update spine (cocos2d#18427) ... # Conflicts: # build/cocos2d_libs.xcodeproj/project.pbxproj # cocos/Android.mk # cocos/base/CCConsole.cpp # cocos/editor-support/spine/Android.mk # cocos/editor-support/spine/Animation.c # cocos/editor-support/spine/Animation.h # cocos/editor-support/spine/AnimationState.c # cocos/editor-support/spine/AnimationState.h # cocos/editor-support/spine/AnimationStateData.h # cocos/editor-support/spine/Atlas.c # cocos/editor-support/spine/Atlas.h # cocos/editor-support/spine/AtlasAttachmentLoader.c # cocos/editor-support/spine/AtlasAttachmentLoader.h # cocos/editor-support/spine/Attachment.h # cocos/editor-support/spine/AttachmentLoader.h # cocos/editor-support/spine/Bone.c # cocos/editor-support/spine/Bone.h # cocos/editor-support/spine/BoneData.h # cocos/editor-support/spine/BoundingBoxAttachment.c # cocos/editor-support/spine/BoundingBoxAttachment.h # cocos/editor-support/spine/CMakeLists.txt # cocos/editor-support/spine/Event.h # cocos/editor-support/spine/EventData.h # cocos/editor-support/spine/IkConstraint.c # cocos/editor-support/spine/IkConstraint.h # cocos/editor-support/spine/IkConstraintData.h # cocos/editor-support/spine/MeshAttachment.c # cocos/editor-support/spine/MeshAttachment.h # cocos/editor-support/spine/PathAttachment.c # cocos/editor-support/spine/PathAttachment.h # cocos/editor-support/spine/PathConstraint.c # cocos/editor-support/spine/PathConstraint.h # cocos/editor-support/spine/PathConstraintData.h # cocos/editor-support/spine/RegionAttachment.c # cocos/editor-support/spine/RegionAttachment.h # cocos/editor-support/spine/Skeleton.c # cocos/editor-support/spine/Skeleton.h # cocos/editor-support/spine/SkeletonAnimation.cpp # cocos/editor-support/spine/SkeletonAnimation.h # cocos/editor-support/spine/SkeletonBatch.cpp # cocos/editor-support/spine/SkeletonBatch.h # cocos/editor-support/spine/SkeletonBinary.c # cocos/editor-support/spine/SkeletonBinary.h # cocos/editor-support/spine/SkeletonBounds.c # cocos/editor-support/spine/SkeletonBounds.h # cocos/editor-support/spine/SkeletonData.h # cocos/editor-support/spine/SkeletonJson.c # cocos/editor-support/spine/SkeletonJson.h # cocos/editor-support/spine/SkeletonRenderer.cpp # cocos/editor-support/spine/SkeletonRenderer.h # cocos/editor-support/spine/Skin.h # cocos/editor-support/spine/Slot.c # cocos/editor-support/spine/Slot.h # cocos/editor-support/spine/SlotData.c # cocos/editor-support/spine/SlotData.h # cocos/editor-support/spine/TransformConstraint.c # cocos/editor-support/spine/TransformConstraint.h # cocos/editor-support/spine/TransformConstraintData.h # cocos/editor-support/spine/VertexAttachment.c # cocos/editor-support/spine/VertexAttachment.h # cocos/editor-support/spine/extension.c # cocos/editor-support/spine/extension.h # cocos/editor-support/spine/kvec.h # cocos/editor-support/spine/proj.win32/libSpine.vcxproj # cocos/editor-support/spine/proj.win32/libSpine.vcxproj.filters # cocos/editor-support/spine/spine.h # cocos/ui/UIRichText.h # plugin # tools/cocos2d-console
stevetranby
added a commit
to stevetranby/cocos2d-x
that referenced
this pull request
Nov 21, 2017
* commit 'a88ad877314a7b27cd16b33368862f1a3bdc95bd': Bug in mp3reader.cpp (cocos2d#18476) Uses Images.xcassets instead of several icon png files. (cocos2d#18485) fix comments for JniHelper.h (cocos2d#18481) Fixing crash in Allocator if there are no allocated pages (cocos2d#12908) Unregister spine event lua event handler should set listener to null. (cocos2d#12845) --force-yes => --allow, -y (cocos2d#18464) Add Comments for JniHelper.h (cocos2d#18477) no message (cocos2d#18460) Added missing #include statement (cocos2d#18452) Fix cocos2d::log va_list re-use bug (cocos2d#18426) Improve StringUtils::format implementation. (cocos2d#18425) RichText improvements (cocos2d#18447) Update CCTableView.cpp (cocos2d#18451) Update UIWebViewImpl-ios.mm (cocos2d#18448) # Conflicts: # cocos/base/CCConsole.cpp
JasonMrQ
pushed a commit
to JasonMrQ/cocos2d-x
that referenced
this pull request
Feb 13, 2018
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.
#18423