Commit Graph

36139 Commits

Author SHA1 Message Date
James Chen 1eea499466 fixed #17603: Connection error in Console uploadFile test. (#17604)
* fixed #17603: Connection error in Console uploadFile test.

* tab -> spaces

* tab -> spaces

* tab -> spaces
2017-03-29 09:17:37 +08:00
pandamicro 87f8409375 Fix some web issues and update web engine (#17600) 2017-03-28 14:40:44 +08:00
pandamicro d25cd8ddf4 [ci skip] Fix QA issues (#17596)
* Fix RenderTexture#clear API inconsistency

* Improve js-tests desktop page

* Fix issues in js test cases
2017-03-27 18:03:20 +08:00
James Chen 6217d8c5ca fixed #17591: [ios, mac, win32] Audio could not be played in the callback of AudioEngine::setFinishedCallback (#17593)
* Moves the implementation of AudioEngine::AudioInfo to cpp file.

* fixed #17591: [ios, mac, win32] Audio could not be played in the callback of AudioEngine::setFinishedCallback

* fixed #17591: Adds test case.
2017-03-27 17:28:39 +08:00
minggo c8af3fe0bd fix crash in release mode (#17592) 2017-03-27 15:19:24 +08:00
pandamicro 5341f7517e Improve js template and test pages (#17575)
* Improve js template and test pages

* Update web ref
2017-03-27 11:03:51 +08:00
minggo a4c06670b1 make menu item don't overlap with other label (#17590) 2017-03-27 10:50:41 +08:00
minggo 39095ce804 make log more clear (#17589) 2017-03-27 09:56:17 +08:00
minggo 6b7e5d69bb correct module path (#17569) 2017-03-22 17:04:26 +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 db837ebdae remove unneeded test cases and fix parameter length limitation on windows
* delete unnneded test case on windows

* delete unneeded test cases

* avoid parameter length limit when building android on windows

* adjust project setting to delete unneeded test cases

* remove unneeded test cases for windows10

* remove unneeded test cases for tizen

* remove unnedded test case for android
2017-03-22 13:43:12 +08:00
minggo 1366ea1f97 change clear color in onEnter (#17564) 2017-03-22 11:51:06 +08:00
James Chen ab9104f3ce Updates templates for switching AudioEngine in AppDelegate.cpp. (#17555) 2017-03-22 11:19:25 +08:00
James Chen 3bd09ae286 [win32] Fixes cpp-tests/FileUtilsTest crash. (#17551) 2017-03-22 11:17:52 +08:00
Bin Zhang a493456770 Update submodule reference of cocos2d-console. (#17562)
Changed: Solve the error when build Android Studio project on Windows.
2017-03-22 10:26:06 +08:00
minggo 20c162fc0a make all mesh in view rect (#17558) 2017-03-22 09:21:59 +08:00
minggo 5fec861e27 use correctly '' (#17553) 2017-03-20 11:45:17 +08:00
James Chen 670a47c27f Fixes label cover (#17550) 2017-03-20 11:24:29 +08:00
CocosRobot 95921836ca [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17549) 2017-03-20 09:39:41 +08:00
minggo b5a1360a17 revert #17437 (#17545)
* revert #17437

* fix resource path
2017-03-20 09:28:12 +08:00
minggo d263f8e0f2 fix resource path (#17546) 2017-03-17 17:53:35 +08:00
minggo e8c0b04e24 fix crash (#17544) 2017-03-17 16:15:21 +08:00
minggo 3ff521505e use correct resource (#17543) 2017-03-17 15:02:47 +08:00
minggo ebdae8c2da use different separator on different platforms and make path length short (#17542) 2017-03-17 11:54:36 +08:00
James Chen 54285ac2bd Update README.md. (#17529)
remove useless v4 ci build status
2017-03-16 15:13:17 +08:00
CocosRobot a1772418b1 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17524) 2017-03-16 14:16:56 +08:00
minggo 8f66d5465a [ci skip]Update version (#17525)
* update version

* update readme

* update english release note

* add some information
2017-03-16 14:14:43 +08:00
pandamicro 0e0987d337 Support notify progression in XMLHTTPRequest (#17509)
* Support notify progression in XMLHTTPRequest

* Fix indent

* Fix issues

* fix issue
2017-03-16 14:09:51 +08:00
Bin Zhang 3ec14488fc Update submodule cocos2d-console. (#17523)
Changed: Disable the command `cocos gen-templates`.
2017-03-16 14:04:56 +08:00
rh101 27935acd64 VS and XCode project files have non-existent file references (#17512)
* [libcocos2d.vcxproj, libcocos2d.vcxproj.filters] Removed entries for non-existent files that were causing "Build is out of date" issues in Visual Studio
[project.pbxproj] Removed entries for non-existent file

* [libcocos2d.vcxproj.filters] Renamed CCStencilStateManager.h extension to .hpp.

* [libcocos2d.vcxproj, libcocos2d.vcxproj.filters] Removed entry for file CCDownloaderImpl.h which does not exist.

* Changed extension of CCStencilStateManager.hpp to .h
2017-03-16 13:54:50 +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
James Chen 1f8eb3b7f5 fixed #17494: Adds setTimeout to wrap NSTimer since ‘timerWithTimeInterval:repeats:block’ is only available from iOS 10, macOS 10.12. (#17518)
* fixed #17494: Adds setTimeout to wrap NSTimer since ‘timerWithTimeInterval:repeats:block’ is only available from iOS 10, macOS 10.12.

* Sets _timeoutCallback to nullptr if onTimeoutCallback is called.
2017-03-16 11:04:36 +08:00
pyrosphere e3bff6452d Support for the tvOS micro gamepad as a CCController (#17517)
* Fixes cocos2d build for tvOS.

* Support for the tvOS micro gamepad as a CCController.
2017-03-16 10:33:36 +08:00
pandamicro f0061c3ddc [ci skip] Improve js template and update web ref (#17510)
* Improve js templates

* Update web ref
2017-03-16 09:42:51 +08:00
pandamicro 75383bdcde Jsb improvements (#17513)
* Cleanup ScriptingCore code

* Add jsb.ENABLE_GC_FOR_NATIVE_OBJECTS to indicate the memory model

* Use incremental GC

* Improve ScriptingCore::executeFunctionWithOwner performance

* Support ScriptingCore::executeGlobalFunction

* Reuse js objects for get_or_create_weak_jsobject reduce memory usage

* Fix sequence / spawn js object lost issue

* Improve wrappers with cppOwner system
2017-03-16 09:42:16 +08:00
James Chen 8c542d711d issue #17503: Avoid crash if initializing audio fails. (#17505)
* issue #17503: Avoid crash if initializing audio fails.

* Corrects logic of checking the return value of decodeMP3.
2017-03-15 16:46:19 +08:00
CocosRobot 87b4d7d54d [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17507) 2017-03-15 16:23:50 +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
Bin Zhang 010a724149 Solve the error when building Android Studio project. (#17504) 2017-03-15 15:45:50 +08:00
mogemimi 0a35a8ca10 Fix spelling mistake in test case (#17502) 2017-03-15 13:51:37 +08:00
James Chen 16e1bf47ac fixed #17494: [iOS] CrashIfClientProvidedBogusAudioBufferList (#17500) 2017-03-15 13:50:56 +08:00
Bin Zhang ce40f13a74 Update the reference of submodule cocos2d-console. (#17501)
Changed:
1. Support VS2017 in cocos compile.
2. Solve the error that when building android project with Android SDK Tools 25.3.x.
2017-03-15 11:06:43 +08:00
pyrosphere 18d2cdbc75 Fixes cocos2d build for tvOS. (#17498) 2017-03-15 10:01:38 +08:00
minggo fd74e4d6aa update build tool version and gradle version (#17499)
after this PR, can see 3rd party cpp files in Android Studio
2017-03-15 09:56:20 +08:00
minggo 7d3b9de866 update gradle version and build tool version (#17496) 2017-03-14 18:13:47 +08:00
j-jorge e0918a85f4 Signal the scroll once the list is updated in cocos2d::extension::TableView. (#17295) 2017-03-14 13:58:11 +08:00
James Chen b842202541 fixed #17395: OpenAL A003 error if doing AL invocation before alcMakeContextCurrent(s_ALContext); (#17492)
Pause director if Audio Session is still in interrupted state, resume director in interrupted ended.
2017-03-14 13:56:12 +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 b8edb47abb [ci skip][win32] Updates lua template (#17493) 2017-03-14 11:57:41 +08:00