i want to merge v3quick to cocos2d-x trunk #442
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
…cocos2d#17381) * [WebSocket] Adds support for getting url and server selected protocol * Adds const keyword for getter methods, and make LOGE also works in release mode.
* Use ndk-build integration in Android Studio. * Update build.gradle * Update build.gradle * Update build.gradle
…17389) * make all tests and template support Android Studio * use grable 2.2.3
Fix the problem: Spine event callbacks are not work.
Changed: Add argument "--agreement" for skip the shown of agreement.
…econds if preload is too fast. (cocos2d#17414)
Changed: Improve the logic of gen-libs with external libraries tremolo & pvmp3dec.
) * 17357: Better encapsulate the definition of mouse buttons Move definition of buttons from a list of #define's to an enum class and make appropriate updates for successful compilation. * 17357: Better encapsulate the definition of mouse buttons Updates from code review: * Removed changes to automatically generated files * Removed std::ostream& convenience operator * 17357: Fix mouse tests
Solve the error when using cocos command on Windows.
* Some fixes for search paths: 1. Adds ‘_originalSearchPaths’ variable, ’getSearchPaths’ returns the original values set by ‘setSearchPaths’ or ‘addSearchPath’. 2. Adds a getter function ‘getDefaultResourceRootPath’. 3. ‘setDefaultResourceRootPath’ should also update search paths and remove file path cache internally. 4. ‘setSearchPaths’ supports to pass self (_originalSearchPath), could be used in ‘setDefaultResourceRootPath’ to update the final ’_searchPathArray’ for searching full path. 5. ‘addSearchPath’ fix, the default resource root path should be the last element in ‘_searchPathArray’. * Checks whether the parameter ‘searchResolutionOrder’ passed in is the same as ‘_searchResolutionsOrderArray’. * Don’t break the compatibility, add a new method called ‘FileUtils::getOriginalSearchPaths’.
* Websocket bug fix after PR#17440 was merged. * typo fix
Sync the runtime to the state of this commit (both js & cpp runtime): EsotericSoftware/spine-runtimes@3ced1e1
…2d#17454) repeat is a keyword in lua.
…led (cocos2d#17844) * Fixing issue where XMLHttpRequests would not have their destructor fire if CC_ENABLE_GC_FOR_NATIVE_OBJECTS was set. This was due to mismanagement of JSHeap object tracing. * Removing unused variables in js_add_object_root.
* LayerRadialGradient works on mac and iOS * fix radius * finish LayerRadialGradient and add test case * use local coordinate in shader * adjust function attributes * implement getCenter() * add some comments
* Fix iskindof logic error * fix iskindof * No need to deal metatables in function iskindof_
…s2d#17689) * fix to problem with updating APK in Google Play keeping OBB from previous version This patch fixes the problem when we are unable to keep OBB from previous version when we are uploading new .apk to Google Play. It was discussed here: http://discuss.cocos2d-x.org/t/problem-with-updating-apk-in-google-play-keeping-obb-from-previous-version-because-versioncode-changes/36039 * check for null pointer added Found an issue which could lead to a crash because of null pointer exception. If pathToOBB doesn't exist then File.list will return null which will cause fileNames array be null. Now it is fixed.
* handle auto layout with scaled widget * add test for UILayout for Scaled Widget * add test for UILayout - Scaled Widget - JS
* Fix windows edit box crash, spacing, and alignment Signed-off-by: saumya.mukul <[email protected]> * Cleanup * Reset file attributes
2\add tojson to bundle3d, no tested.
|
这个 PR 有太多冲突，无法合并。你是想把 v3quick 合并到 cocos2d-x 的话，不用给 v3quick 提交 PR。 |
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.