Commit Graph

1174 Commits

Author SHA1 Message Date
minggo 54962ee509 LayerRadialGradient works on mac and iOS (#17826)
* 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
2017-05-22 13:42:00 +08:00
Vladimir Perminov 52b35acf95 [Win32,WinRT] Fix listFiles and listFilesRecursively use unicode. (#17813)
* [Win32,WinRT] Fix listFiles and listFilesRecursively use unicode.

1. Incorrect convertation to unicode
if (length != fullpath.size()) correct only ASCII char.
2. For convert unicode exist api, to avoid errors.
3. Equal first char on '.' - error
Need check full name file on "." and "..", otherwise exclude file and
folder begin '.'

Now not use macro UNICODE, for easy use unicode convert api(Otherwise,
you need to connect different versions WinRT and Win32).

* Fix minggo remark.

* Move to specific platform section.
2017-05-18 09:18:18 +08:00
子龙山人 48f6d1c0e5 Refactoring editbox and system label on win32 platform (#17828)
* refactoring windows editbox

* refactoring win32 system label

* fix jenkins ci issue

* remove unneeded function call
2017-05-17 16:20:21 +08:00
Vladimir Perminov 6753c6e98b [WinRT] Fix removeDirectory unicode. (#17812)
CCFileUtilsWinRT::removeDirectory need ut8 string.
temp is wstring(unicode).
2017-05-15 17:10:36 +08:00
zilongshanren 7695269e44 fix invisible issue 2017-05-10 17:32:58 +08:00
zilongshanren ad614a2952 remove unused variable declare 2017-05-10 16:54:09 +08:00
zilongshanren c609aec95d fix editbox invisible on some Android devices 2017-05-10 15:51:29 +08:00
子龙山人 6e718caa29 Merge pull request #17796 from mxenabled/saumya/android_edit_box_fixes
[Android] Fix edit box font size and alignment
2017-05-10 15:24:16 +08:00
Saumya Mukul 96ae677bb9 Missed padding for default vertical alignment 2017-05-09 09:38:01 -06:00
Saumya Mukul 11a43c0d91 Fixup 2017-05-09 09:36:16 -06:00
Saumya Mukul e24a8f1f8e Fix alignment flags 2017-05-08 16:55:44 -06:00
Saumya Mukul 662b98933c Fix edit box font size and padding 2017-05-08 16:30:46 -06:00
zilongshanren ae8e83b021 fix editbox textChanged call times on Android platform 2017-05-05 11:23:22 +08:00
minggo 6dcaa9fe3a do not use ES3 context if using multi sample (#17778)
multi sample in ES3 needs to use GLES3 function
2017-05-04 16:25:35 +08:00
子龙山人 55b14cbde5 Fix android edit box duplicated text (#17775)
* fix editbox textChanged event called after fragment loaded

* fix editbox duplicatd text when change text in textChanged callback

* revert changes of placeholder modification
2017-05-04 15:04:47 +08:00
Eric Zhong 59f9c35f34 fix downloader will not be conitnue (#17761)
if already has started six data task, then start 7th task will suspend, it will not be run
2017-05-03 10:57:42 +08:00
Aaron Baumbach 58b8e77d74 Moved CC_SYNTHESIZE and CC_PROPERTY macros onto a single line (#17765)
This permits comments to be visible in tooltips for the variable and it's associated accessor functions

e.g.
//The health of the entity, when this reaches zero the entity is dead
CC_SYNTHESIZE(float, m_health, Health)

Previously the above comment would only be displayed in the tooltip for the member variable
2017-05-03 10:12:31 +08:00
子龙山人 1f1f1d8f1a fix ios label shrink overflow clamp letters issue (#17737) 2017-04-25 09:04:00 +08:00
David DeSimone 246406bda1 Adding additional async functions to FileUtils (#17634)
* Adding async functions for FileUtils::listFiles and FileUtils::listFilesRecursively.

* Updating CCFileUtils::listFiles and CCFileUtils::listFilesRecursively to not expose their async version to
the JS and Lua scripting layers, due to a bug in the binding generator code.

* Updating comments in CCFileUtils.h to prevent improper JS bindings to be generated.

* Editing the cocos2dx.ini files, to prevent bindings for listFilesRecursivelyAsync and listFilesAsync to be generated.
2017-04-19 09:14:06 +08:00
James Chen 57170200dd fixed #17685: [android] Audio in game couldn't be mute while a ring or a call is coming (#17686)
* fixed #17685: [android] Audio in game couldn't be mute while a ring or a call is coming

* Updates comments in AudioEngine-inl.cpp and removes extra empty line in javaactivity-android.cpp

* Puts audio focus relative code to another java file named Cocos2dxAudioFocusManager.java
Renames setAudioFocusLost to setAudioFocus.

* Renames JNI function.

* Register audio focus in onResume and unregister it in onPause.
2017-04-13 10:44:08 +08:00
James Chen 56ae741124 fixed #17665: [android] Crash while launching on the devices only support OpenGL ES 2. (#17671)
* fixed #17665: [android] Crash while launching on the devices only support OpenGL ES 2.
Fixes that egl.eglCreateContext may return non-null but EGL10.EGL_NO_CONTEXT value.
It will cause create a EGL env with a EGL_NO_CONTEXT egl context which will cause crash.

* Don’t link with libGLESv1_CM.so
2017-04-10 11:49:33 +08:00
Andrey 1c697796ea Fixed FileUtils::getFileSize() on android platform (#17632) 2017-04-10 10:16:21 +08:00
Steve Tranby e3e00906e3 Fix can't open URLs that have '&' character. (#17633)
See discussion: http://discuss.cocos2d-x.org/t/small-fix-for-application-openurl-linux/35993
2017-04-10 10:15:29 +08:00
minggo ea8ffa3c1c Merge pull request #17630 from minggo/merge-v315
Merge v315
2017-04-05 15:42:53 +08:00
James Chen acc97516d8 Sensor timestamp fix, tizen uses micro-seconds as timestamp unit. (#17629) 2017-04-01 17:20:48 +08:00
minggo 9ed5127edc synchronize v3.15 2017-04-01 17:16:45 +08:00
James Chen a924e29c2c Adds libmd5-rfc third-party library for calculating MD5 since the functions in <openssl/md5.h> aren’t exported in win10, plus <openssl/md5.h> seems to be private header. (#17625)
* Adds libmd5-rfc library since the functions in <openssl/md5.h> aren’t exported in win10, plus <openssl/md5.h> seems to be private header.

* Adds libmd5-rfc library for win32 and win10.

* Removes json/msinttypes folder from xcode since it’s only needed for win32 | win10.
2017-04-01 11:43:17 +08:00
blackcruiser 1b46096b15 unify sensor timestamp units in Android / iOS / Tizen (#17532) 2017-03-23 10:04:18 +08:00
James Chen 85ded40a98 fixed #17497: Win32 performance is bad. (#17556)
* fixed #17497: Win32 performance is bad.
The 'Sleep(1)' in FPS controlling code isn't precise enough. Windows sets timer precision from 1ms to 15ms, we need to set the precision to the highest one (1ms). Although it's still not enough, we need to make some tricks in the FPS controlling code, that is, don't sleep if the interval is equal or less than 1 millisecond.

* Untabify code.
2017-03-22 15:03:00 +08:00
minggo b0179340be Gles3 support (#17537)
* ios supports gles 3.0

* android supports gles 3
2017-03-21 09:41:55 +08:00
Tyler Dauch 39f264d5c3 Update Cocos2dxDownloader.java (#17528) 2017-03-17 10:47:39 +08:00
mogemimi 8be22ce55c Fix typos in comments and strings (#17534) 2017-03-17 10:44:38 +08:00
pandamicro 68fc0dbfa9 Add utils::getMD5Hash (#17520)
* Add FileUtils::getMD5Hash

* Improve name
2017-03-16 13:47:45 +08:00
blackcruiser e8c752126d fix an Accelerometer second to microsecond convertion error in Android platform (#17519)
1 second = 1000000 microsecond
2017-03-16 12:00:58 +08:00
pandamicro 0eec73ba43 Bindings fix and assets manger ex fix (#17115)
* Fix custom event being discard during event emission

* Fix tilemap black line issue

* Fix auto bindings config

* Adapt websocket to new memory model

* Improve cocos2d_specifics code stability

* Fix issue with get_or_create_js_object function

* Improve memory usage in function wrapper invocation

* Use JS Function bind to avoid memory tracking issues

* Support size parameter to collect total byte size before update process

* Fix download resuming issue on Android

* Remove temporary assets when temporary manifest is invalid or out of date

* Use version compare handle to compare manifests versions

* Support max concurrent tasks setting & download verify callback

* Add Manifest::Asset conversion

* Avoid crash caused by wrappers

* Sync implementation of tested and published AssetsManagerEx from Cocos Creator

* Fix linux compilation issues
2017-03-15 16:09:02 +08:00
pyrosphere 18d2cdbc75 Fixes cocos2d build for tvOS. (#17498) 2017-03-15 10:01:38 +08:00
minggo 7d3b9de866 update gradle version and build tool version (#17496) 2017-03-14 18:13:47 +08:00
Bin Zhang 769f7830f0 Improve the AndroidStudio configurations of tests & templates (#17495)
* Improve the AndroidStudio configuration of test projects to fit the new implementation of cocos compile.

* Improve the AndroidStudio configuration of templates to fit the new implementation of cocos compile.
2017-03-14 13:41:28 +08:00
James Chen 90403fc632 Fixes memory issues catched by Xcode Analyze Tool. (#17489) 2017-03-14 11:09:31 +08:00
James Chen 47694b0b28 fixed #17474: [Android] It may trigger ConcurrentModificationException in Cocos2dxSound.java. (#17479) 2017-03-09 18:11:28 +08:00
James Chen bdcacd0031 Some fixes for search paths: (#17435)
* 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’.
2017-03-06 16:59:43 +08:00
Dale Stammen 13a438dbfd win10 uwp fix for new Mouse events (#17434) 2017-03-03 12:40:32 +08:00
radman0x c442275c8e 17357: Better encapsulate the definition of mouse buttons (#17358)
* 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
2017-03-02 13:39:33 +08:00
CocosRobot d07794052f Update license to 2017 (#17362)
* Typo: CopyRight -> Copyright

* Copyright update: chukong-inc.com -> Chukong Technologies Inc.

* [js files] Copyright update: 2014 -> 2014-2017

* [cpp files] Copyright update: 2014 -> 2014-2017

* Copyright update: 2015 -> 2015-2017

* [js files] Copyright update: 2014 -> 2014-2017

* Copyright update: 2016 -> 2016-2017

* Copyright update: 2013 -> 2013-2017

* Copyright update: 201?-201? -> 201?-2017

* License year fixes.

* Liscene year fix in CCRay.cpp

* Updates license years in CCGLProgramState.h & CCGLProgramStateCache.h
2017-02-14 14:36:57 +08:00
Wilson E. Alvarez b672b94edc Removed unnecessary assignments (#17328) 2017-02-09 10:57:01 +08:00
minggo 92704517bc remove unneeded assignment (#17320) 2017-02-08 13:58:11 +08:00
mogemimi 9820748184 Fix variable shadowing warnings (#17282) 2017-02-06 15:15:16 +08:00
Wilson E. Alvarez ca28af0113 Fixed variable order in initializer lists (#17274) 2017-02-04 10:33:58 +08:00
j-jorge c616d6d9ff Compilation fix (#17209)
* Fix various compilation issues.

Mostly errors on field initialization order but also missing files
in CMakeLists and missing include directives.

* Fix compilations issues with GCC 6.2

* Fix gitignore libs/ entry to not ignore the Android external libraries.
2017-02-04 09:46:32 +08:00
mogemimi 323838242f Fix implicit conversion warning (#17242) 2017-01-23 09:24:36 +08:00
James Chen b1f2a056b2 Refactor WebSocket to support SSL (wss) (#17172)
* Refactors WebSocket:
1. Supports wss protocol
2. Uses only one libwebsockets context, multiple wsi instances to avoid multi-thread issues
3. Uses lws_create_vhost to create multiple virtual host, different protocols works

* Adds openssl include path to xcode project configuration.

* mac doesn’t depend on curl

* ca file path should be full path.

* More bug fixes like which in https://github.com/cocos2d/cocos2d-x/pull/6986

* Remove curl dependence for mac

* Updates Andorid.mk

* [win32] Adds wss support for win32, and updates openssl, libcurl, libwebsockets libraries.

* Updates external/config.json to 118.

* [win32] Updates cocos/2d/libcocos2d.vcxproj to fix compilation error while building in release mode.

* Linux support websocket ssl connection.

* Updates external/config.json

* Updates install-deps-linux.sh

* Adds dependence of binutils, print ld version

* Updates travis scripts.

* Updates travis scripts.

* Updates travis script, don’t output log while extracting.

* update before-install.sh

* updates before-install.sh

* updates before-install.sh

* don’t output log for installing software.

* Updates config.json to 120.
2017-01-19 13:55:14 +08:00
David DeSimone c258b03f13 Adding async version of common CCFileUtil functions. This will allow engine users to interact with the file system, without blocking the main thread and disrupting rendering. (#17140) 2017-01-13 10:05:46 +08:00
minggo 9d3d869c9d make webview can clean cached data (#17130)
* make webview can clean cached data

* add implementatoin
2017-01-10 11:30:11 +08:00
子龙山人 8e21738634 fix text input auto correction type (#17085) 2017-01-04 12:00:18 +08:00
minggo f63fad3e27 Merge branch 'v3.14' into merge-v314 2017-01-04 09:49:22 +08:00
pandamicro a715e3169f Sync issue fixes from creator (#17041)
* Add EventDispatcher#hasEventListener (sync from creator)

* Fix function wrapper using js object during its gc

* Support more system languages

* Direct log/error for better understanding problems & add sys.now

* Synchronize Editbox APIs

* Synchronize Scheduler.PRIORITY_NON_SYSTEM const

* Upgrade web engine

* Upgrade test cases

* Manually bind EventDispatcher::addCustomEventListener to avoid memory issue

* Manual bind EventListeners’ create to avoid memory issue

* Fix compilation issue when COCOS_DEBUG = 2

* Unify function name of Texture2D::releaseTexture

* Fix compilation issues and update web & bindings-generator

* Fix lua compilation issue

* Use %ld instead of %zd

* Separate FinalizeHook for ref objects and non ref objects

* Fix spine TrackEntry recursive conversion issue by using getter

* Fix crash during Wrappers deallocation (possible to have leak)

* Increase default JS heap to 32 mb

* Update engine version

* Add change log of web engine

* Improve cc.formatStr

* Fix chipmunk crash issues when using setDefaultCollisionHandler

* Add change log for JSB and update web engine ref
2016-12-21 13:39:34 +08:00
James Chen c0291afad7 Merge branch 'v3.14' into merge-v3.14 2016-12-14 17:03:58 +08:00
James Chen a2603d70ef [android] Catches ‘NumberFormatException’ while invoking Integer.parseInt. (#16988)
* [android] Catches ‘NumberFormatException’  while invoking Integer.parseInt.

* [android] Catches ‘NullPointerException’ while converting Integer to int in Cocos2dxActivity.hideVirtualButton.
2016-12-12 11:44:31 +08:00
minggo 3db39a27ea Vibrate test (#16966)
* only show vibrate test on iOS and Android device

* vibrate no matter it is silient or not
2016-12-07 11:12:38 +08:00
子龙山人 1b0a6c2c5c Sync editbox improvement from cocos creator (#16965)
* sync the changes from creator

* fix editbox vertical alignment

* improve android editbox multiline text vertical alignment
2016-12-07 09:21:17 +08:00
Dmitry 964b65e44e Linux Application::openURL return fixed (#16903) 2016-11-28 10:41:36 +08:00
minggo ba321e3ecc fix opengl context conflict when multiple contexts coexist (#16904) 2016-11-28 09:59:04 +08:00
minggo 7556b60103 check VAO with correct way (#16901) 2016-11-25 09:33:20 +08:00
Wilson E. Alvarez 3056269531 Various small performance tweaks (#16881)
* These variables can be accessed by reference

* Assign values in initialization list

* _range can also be in initialization list

* Prefixed ++ and added 'auto' to loops

Also removed extra whitespace

* Prefixed ++/--, and changed for-loop implementation to use 'auto' on some loops
2016-11-22 09:54:04 +08:00
yahont 0c664ebc99 some warnings fixed: unused variables, signed-unsigned comparison (#16878) 2016-11-21 15:03:41 +08:00
Wilson E. Alvarez 0d0dd05287 The return statement is not used in some cases (#16874) 2016-11-21 09:33:06 +08:00
Adrien de Sentenac 460c68125f Use resolved file name (through dictionary lookup) in font atlas creation (#16797)
* Use resolved file name (through dictionary lookup) in font atlas creation, to prevent creating multiple atlases for the same file.
Add font tests with and without font name replacement (through dictionary lookup).

* Fix cpp-tests xcode and cmake project

* Additional fix for cmake project
2016-11-18 09:23:44 +08:00
pyrosphere 663bb4d7ed No CC_UNUSED_PARAM (#16812)
* Added -Wno-unused-parameter and removed all uses of the CC_UNUSED_PARAM macro

* Commented unused parameter names in .cpp files which previously used CC_UNUSED_PARAM

* Reverted -Wno-unused-param flag.
Moved deprecated touch methods definitions to .cpp file.
Commented more unused parameter names.

* Fixed some errors and warnings caused by the previous commit.

* Commented remaining unused parameter names in .cpp files.

* Fixed unused parameter warnings in headers.

* Fixed some more unused parameter warnings.

* Fixed some more unused parameters warnings.

* Fixed mistake in previous commit, missing ComAudioReader:: in method. Other warnings.

* Fixed build errors.

* Added missing file to CMakeLists
2016-11-16 09:48:37 +08:00
pyrosphere ae48e0bf69 Android setMultipleTouchEnabled (#16830)
* Added method to switch between single and multitouch on Android.

* Moved variable definitions to the beginning of the class. Handle single touch for ACTION_MOVE and ACTION_CANCEL.

* Cleaner code by using if/else instead of break
2016-11-16 09:41:07 +08:00
Josh Bodily c3c6681b9e Add Horizontal Text Alignment to UIEditBox (#16772)
* Add Horizontal Text Alignment to UIEditBox

* Fix compile error

* Fix win32 compile
2016-11-09 10:38:00 +08:00
yahont e9b39a99e2 cocos2dInternal cleaned of some warnings (#16818)
* cocos2dInternal cleaned of some warnings: unused parameters and signed-unsigned comparisons

* -Werror removed

* tab fixed

* indent fixed

* more warnings fixed
2016-11-09 10:34:50 +08:00
Ce Zheng 4b3525f7a8 use STL emplace when possible (#16815)
* replaced some unordered_map::insert(std::make_pair(foo, bar)) with unordered_map::emplace(foo, bar)
* replaced some vector::push_back(std::make_pair(foo, bar)) with vector::emplace_back(foo, bar)

The old way will construct a std::pair first then call move constructor
when putting it into the container, while using emplace will construct
the pair in-place in the container. Also, the emplace way is shorter &
more concise.
2016-11-08 11:50:00 +08:00
Josh Bodily 9f31a1e43c Add reason for edit end to UIEditBoxDelegate (#16771)
* Add reason for edit end to UIEditBoxDelegate

* Adds "NEXT" action button for iOS and Android for easier form
* navigation

* Fix compile error
2016-11-03 14:02:53 +08:00
pyrosphere 1667a5c444 Toggle between windowed/fullscreen on desktop (#16762)
* GLViewImpl methods for desktop window management - toggle between fullscreen/windowed

* Window management tests (mac)

* Added window management tests to Win32 and Linux

* Added const keyword. Removed platform macros.
2016-10-31 14:02:02 +08:00
Wilson E. Alvarez c0e1e91373 Performance tweak: Use range-based for-loops and allocate std::vector size() and *end() on the stack where favorable. (#16716)
* Use range-based for-loops and allocate std::vector size(), end(), cend(), rend(), crend() on the stack where favorable.

Other minor trivial changes were applied.

* Fixed Android compilation error

* Fixed windows-universal compilation error
2016-10-27 15:10:24 +08:00
mogemimi fe52c5fa0a Fix typos in comments and strings (#16708) 2016-10-17 10:12:54 +08:00
QingliWang 7c1f88423b Fix bug when app paused the music is still resumed to play after interruption completed. (#16679)
* Support audio interruption and resume callback when change earphone status.

* Refactor keyevent callback and add makecurrent for compatible with different binary.

* Enable Tizen indicator.

* Remove the unnecessary evasobject in the window and refactor the function for glview mode.

* Fix the compatible issue between Tizen 2.3 and 2.4.

* Fix the wrong directory of script resources for HellLua template project.

* Create performance-test project for Tizen platform.
2016-10-12 15:48:27 +08:00
Wilson E. Alvarez cdee1e11de Performance tweak: use range-based for-loops instead of iterator-based for-loops. (#16642)
* Use ++ prefix instead for non-primitive data types in CCAutoPolygon.cpp

* Use ++ prefix instead for non-primitive data types in SimpleAudioEngine.cpp

* Use ++ prefix instead for non-primitive data types in CCNodeLoaderLibrary.cpp

* Use ++ prefix instead for non-primitive data types in CCActionManagerEx.cpp

* Use ++ prefix instead for non-primitive data types in CCDataReaderHelper.cpp

* Use ++ prefix instead for non-primitive data types in HttpClient-android.cpp

* Use ++ prefix instead for non-primitive data types in CCDevice-linux.cpp

* Use ++ prefix instead for non-primitive data types in ScriptingCore.cpp

* Switched implementation to range-based for loops

* Added readability, fixed loop in CCDataReaderHelper.cpp

Thanks to Dimon4eg for the code review.
2016-10-11 10:59:44 -07:00
zilongshanren 5b109854c3 fix mac system font creation with NSFont 2016-10-08 14:34:55 +08:00
Dmitry 771a69709f fix for #16589 (#16636) 2016-10-04 22:26:40 -07:00
minggo 5785c3fcdd use SharedPreferences.apply() instead (#16632) 2016-09-30 14:58:30 +08:00
mogemimi 8b703a8d12 Fix implicit conversion warning (#16598)
* Fix implicit conversion warning

* Change SAXParser::textHandler parameter type from int to size_t
2016-09-26 14:49:47 +08:00
Steve Tranby b22efc9115 Features: add events for window resize, focus, and unfocus (#16578)
* add events for window resize, focus, and unfocus

* fix typo
2016-09-20 20:32:33 -07:00
minggo 84a102edf8 merge v3.13.1 back to v3 2016-09-15 10:08:28 +08:00
mogemimi afe8b05da8 Remove semicolons before method bodies (#16566) 2016-09-14 10:44:00 -07:00
Jun Hyeon, Nam 4342aabe28 remove unnecessary comments (#16572) 2016-09-14 10:42:25 -07:00
minggo 3075108f1c get sdk version from java (#16546) 2016-09-12 09:49:39 +08:00
mogemimi 2b9ac2c950 Remove redundant semicolons (#16558) 2016-09-12 09:45:34 +08:00
mogemimi eca7b2392d Remove unnecessary inline keywords (#16562) 2016-09-12 09:44:21 +08:00
minggo 569681f6bd use api level 13 (#16538) 2016-09-07 14:50:03 +08:00
Ricardo Quesada 282959cc0f fix: uses correct design resolution (#16534)
fixes github issue #16485
2016-09-07 12:01:40 +08:00
Peter Siegmund 9449e687af fixed compile error for android-studio build (with-controller) (#16529) 2016-09-07 12:01:11 +08:00
Ricardo Quesada 2d1048bd00 fix: uses default designResolution if not set previosly (#16533)
fixes github issue #16485
and re fixes github issue #16003
2016-09-07 11:11:52 +08:00
Allen Lee 7c298bdcd7 misspelling check on cocos directory (#16522)
Misspelling fix on some comments,
cocos/editor-support/cocostudio/CSParseBinary_generated.h
fix misspelling postion -> position
2016-09-06 10:14:14 +08:00
minggo db21e5f349 [ci skip]Travis enable pull request (#16494)
* refactor travis and build pull request

* delete unneeded file
2016-09-01 16:25:47 +08:00
Renato Almeida 1c40d5e16d Fix MessageBox inverted params on Android (#16484) 2016-09-01 16:10:02 +08:00
子龙山人 0b1f61b8ce fix possible crash of label shrinked (#16456) 2016-08-29 15:23:01 +08:00
minggo df3b33cd59 Merge pull request #16457 from minggo/merge-v3.13
Update rapid json to version 1.1.0.
2016-08-29 15:22:01 +08:00
minggo 04fd2b16b2 merge v3.13 back to v3 2016-08-29 11:57:13 +08:00
mogemimi 86563af08a Add missing override keywords 2016-08-28 23:45:15 +09:00