make code more clean and make comment more clear #19155
Merged
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 11, 2018
STEVE: removed js/lua new files from merge * commit 'bb32eee94438f92b61799781211ddd3f5afd7736': make code more clean and make comment more clear (cocos2d#19155) [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (cocos2d#19152) prevent cmake in-source-build friendly (cocos2d#19151) UIButton fix setTitleLabel memleaks (cocos2d#19148) correct lua template cmake build (cocos2d#19149) modern cmake, cmake_cleanup_remove_unused_variables (cocos2d#19146) refine CCDevice-win32 BitmapDC (cocos2d#19144) modern cmake, improve cmake_compiler_flags (cocos2d#19145) add ui::LoadingBar support to Progress actions (cocos2d#18748) [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (cocos2d#19142) modern cmake, compile definitions improvement (cocos2d#19139) [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (cocos2d#19141) Add `GLView::setCursor` for desktop platforms (cocos2d#19129) add line spacing support for system font on iOS and Android (cocos2d#18993) Bugfix for aviod reading outside of the buffer. (cocos2d#19098) Fix bug: Not support sprite frame when ignoreContentAdaptWithSize is true (cocos2d#19107) iPhone X home indicator handling (cocos2d#19132) # Conflicts: # build/cocos2d_tests.xcodeproj/project.pbxproj # cocos/base/CCConsole.cpp # cocos/scripting/js-bindings/CMakeLists.txt # cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_auto_api.js # cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp # cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp # cocos/scripting/js-bindings/proj.android/CMakeLists.txt # cocos/scripting/lua-bindings/CMakeLists.txt # cocos/scripting/lua-bindings/auto/api/GLView.lua # cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp # cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp # templates/js-template-default/CMakeLists.txt # templates/js-template-default/frameworks/runtime-src/proj.android/app/build.gradle # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/RootViewController.mm # templates/lua-template-default/CMakeLists.txt # templates/lua-template-default/frameworks/runtime-src/proj.android/app/build.gradle # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/RootViewController.mm # tests/js-tests/project/CMakeLists.txt # tests/js-tests/project/proj.android/app/build.gradle # tests/lua-empty-test/project/CMakeLists.txt # tests/lua-empty-test/project/proj.android/app/build.gradle # tests/lua-tests/project/CMakeLists.txt # tests/lua-tests/project/proj.android/app/build.gradle
huangwei1024
pushed a commit
to huangwei1024/cocos2d-x
that referenced
this pull request
Jun 20, 2019
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.
No description provided.