Skip to content

[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically #17857

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

Merged
merged 1 commit into from
May 23, 2017

Conversation

CocosRobot
Copy link
Contributor

No description provided.

@minggo minggo merged commit dd880ee into cocos2d:v3 May 23, 2017
stevetranby added a commit to stevetranby/cocos2d-x that referenced this pull request Jun 16, 2017
* commit '639737286f594f3e06c07b22b352dddb01858883':
  before draw event (cocos2d#17669)
  Handle auto layout with scaled widget (cocos2d#17822)
  fix to problem with updating APK in Google Play keeping old OBB (cocos2d#17689)
  update console to fix compiling issue on with Xcode 8.3+ (cocos2d#17862)
  Fix iskindof (cocos2d#17785)
  [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (cocos2d#17857)
  fix action running times for instant actions (cocos2d#17849)
  make fps stable on iOS (cocos2d#17852)
  [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (cocos2d#17848)
  LayerRadialGradient works on mac and iOS (cocos2d#17826)
  Fixing serious XMLHTTP leak when CC_ENABLE_GC_FOR_NATIVE_OBJECTS enabled (cocos2d#17844)
  Call 'update' method in 'stop/stopAll' to cleanup immediately (cocos2d#17846)
  Add const keyword to Node::isScheduled (cocos2d#17841)
  small BillBoard optimizations (cocos2d#17825)
  Allow visit Sprite without camera for render to texture (cocos2d#17824)

# Conflicts:
#	cocos/base/CCDirector.cpp
#	cocos/base/CCDirector.h
#	cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp
#	cocos/ui/UILayoutManager.cpp
#	tools/cocos2d-console
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants