update cocos console to fix compiling error with Android Studio projects #17129
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
minggo pushed a commit to minggo/cocos2d-x that referenced this pull request Jan 10, 2017
minggo pushed a commit to minggo/cocos2d-x that referenced this pull request Jan 10, 2017
minggo pushed a commit that referenced this pull request Jan 10, 2017
stevetranby added a commit to stevetranby/cocos2d-x that referenced this pull request Jan 14, 2017
…futurePRs * commit '628dae89c6069b6baf714d52cafefd0f817bf8d0': update version and release note (cocos2d#17170) Update web engine ref (cocos2d#17169) Glfw linux issue (cocos2d#17166) Fix scale9sprite polygon info (cocos2d#17161) doc: updates sprite doc better documentation tests cases fix issue cocos2d#17116 & cocos2d#17119 for v3.14.1 fix linking error with vs2015 (cocos2d#17146) fix crash if physics3d camera is not set (cocos2d#17139) (cocos2d#17144) update cocos console to fix compiling error with Android Studio projects (cocos2d#17129) (cocos2d#17145) # Conflicts: # cocos/2d/CCSprite.cpp # docs/RELEASE_NOTES.md # tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp # tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.h
minggo pushed a commit that referenced this pull request Jan 20, 2017
* update cocos console to fix compiling error with Android Studio projects (#17129) (#17145) * fix crash if physics3d camera is not set (#17139) (#17144) * fix linking error with vs2015 (#17146) * fix issue #17116 & #17119 for v3.14.1 * tests cases * better documentation * doc: updates sprite doc * Fix scale9sprite polygon info (#17161) * add guard code to Scale9Sprite * add new test code * Glfw linux issue (#17166) * purge glfw3 before installing glfw3.2 * purge glfw3 before installing glfw3.2 * Update web engine ref (#17169) * update version and release note (#17170) * issue ##17119 improved v3.14.1 (#17189) * update version (#17230)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
1 participant
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.