Commit Graph

36328 Commits

Author SHA1 Message Date
CocosRobot e7a2708812 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#18021) 2017-07-03 15:21:55 +08:00
minggo 84ccbde845 Sequence issue (#18009)
* fix SequenceWithFinalInstant test issue

* fix the issue that sequence will not finish for ever
2017-07-03 09:15:53 +08:00
halx99 795538ad9f Fix sourcePosition bug for ParticleSystem. (#18002) 2017-06-30 09:20:43 +08:00
minggo 4b61ea1f1e use travis to build iOS and mac (#17999) 2017-06-29 16:41:06 +08:00
Wu Zheng 41ef696019 luaoc static function return type fix (#17956)
* update remote repo

* Revert "update remote repo"

This reverts commit c92200d0ac4203c32048ea902e92535dcb4d0935.

* returnType BOOL

* luaoc return type encode
2017-06-26 14:04:55 +08:00
Wilson E. Alvarez eb85f190bd Add CCGLProgramStateCache header to cocos2d.h (#17976) 2017-06-26 13:53:17 +08:00
Wilson E. Alvarez 90af809b89 No need to get the Configuration and Director instances more than once in CCRenderer.cpp (#17978) 2017-06-26 13:52:49 +08:00
minggo 3208120ff9 fix warnings (#17971) 2017-06-23 17:47:20 +08:00
minggo 61839e7a5b fix warnings (#17970) 2017-06-23 17:46:37 +08:00
minggo 0e26309602 remove bullet project (#17961) 2017-06-21 17:15:09 +08:00
minggo 77d8b0a52b fix compiling issue on android (#17960) 2017-06-21 16:43:40 +08:00
CocosRobot aa89054f8e [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17959) 2017-06-21 16:35:47 +08:00
minggo 029dabc4d5 Template issue (#17958)
* add search path

* do not ignore release/debug folder
VS out put folder name is debug/release.win32
and there may have debug/release folder name in 3rd party library

* don not ignore debug folder
2017-06-21 16:18:55 +08:00
CocosRobot 320bf97066 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17957) 2017-06-21 14:34:55 +08:00
minggo 4ce443bac2 use prebuilt version of bullet (#17950)
* use prebuilt bullet

* prebuilt bullet work ok on linux

* update search path

* update search path

* fix compiling issue for lua/jsb projects

* prebuilt bullet work on windows

* update 3rd party lib version

* add bullet search path

* fix script bindings issue

* fix scripting binding
2017-06-21 13:39:38 +08:00
Wilson E. Alvarez 61815f57c0 Fixed Director memory leak (#17952) 2017-06-21 09:45:53 +08:00
Wilson E. Alvarez 0f75d3ac5a Added missing header for NDK v15 (#17943) 2017-06-20 09:04:51 +08:00
James Chen 567fa5b0a7 fixed #17800: [iOS] Streaming audio (normally a background music) maybe cut and may not be looped. (#17947)
* fixed #17800: [iOS] Streaming audio (normally a background music) may be cut and may not be looped.

* Updates including.
2017-06-20 09:04:04 +08:00
Wilson E. Alvarez a23924c95b Use const reference where possible. Dropped unnecessary namespace specifier (#17941) 2017-06-20 09:03:35 +08:00
Y-way 7894c5c4a3 Setting new texture for Sprite will reset the program state that is changed (#17938)
In my project:
1.set default texture.
2.set mine shader program
3.set new texture.

then, the sprite will reset my shader program.
2017-06-20 09:02:58 +08:00
Y-way e6210874dd Processing Lua file(UTF8+BOM) that is encrypted will crash,when free the buffer pointer that is changed pointer address. (#17937) 2017-06-20 09:02:40 +08:00
minggo 3e912ffee3 add a macro to stip fps related data and functions (#17934) 2017-06-20 09:02:13 +08:00
CocosRobot 78d5a809c8 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17933) 2017-06-20 09:01:57 +08:00
CocosRobot 204a08d4fd [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17932) 2017-06-15 14:57:33 +08:00
shintaro.tanikawa f9c8bd4bc1 Add padding options to ListView (#17587)
* Add options to ListView for setting padding

* Add 'setPadding' method test cases.
2017-06-15 14:56:54 +08:00
minggo f79a138c2b revert updating flatbuffers (#17930)
* revert updating flatbuffers

* update external version
2017-06-15 13:42:50 +08:00
minggo 48c44d6a1a remove "system" usage (#17921)
* remove "system" usage
"system" is removed in iOS 11

* android uses old method
2017-06-15 11:07:08 +08:00
pyrosphere 5ce38d14fe On XCode projects, removed specific SDK versions from framework paths. (#17929) 2017-06-15 09:53:32 +08:00
James Chen 5620e30f32 fixed #17922: [android] AudioEngine may crash while audio's over and stop state is triggered at the same time. (#17923)
* fixed #17922: [android] AudioEngine may crash while audio's over and stop state is triggered at the same time.
The Pull Request #17748 didn't resolve the issue since _track->getPrevState will be wrong while in scheduler callback. We need to capture it in lambda.
My Pull Request also merges PR #17716 to make filePath captured by lambda.

* Adds missing log tag in AudioEngine-inl.cpp
2017-06-13 17:44:04 +08:00
minggo 44d49d7fab environment path variable can include blank space (#17919) 2017-06-12 14:13:07 +08:00
minggo 5c9ac37f50 initialize callback functions (#17918) 2017-06-12 10:43:45 +08:00
minggo 2b3baf4517 fix precision issue (#17908)
* fix precision issue

* fix shader error on mac
2017-06-12 08:57:40 +08:00
CocosRobot 992ac34a2d [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17913) 2017-06-09 09:54:03 +08:00
minggo f263a43336 Spawn issue (#17911)
* fix isDone() in spawn

* remove unneeded void keyword
2017-06-08 17:07:43 +08:00
minggo c4173dff3e update console to fix crash when compiling ios (#17912) 2017-06-08 17:07:06 +08:00
James Chen 845e177885 Uses better configuration for huawei optimization and remove rapidjson dependence in EngineDataManager (#17909)
* Uses better configuration for huawei optimization (#17838)

* Uses better configuration for huawei optimization

* Updates jar file and uncomment fps controlling code

* Sync code from 2.x
2017-06-08 17:06:46 +08:00
CocosRobot 7230593be0 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17910) 2017-06-08 17:06:05 +08:00
minggo 61386b0a40 fix the issue the sequence action will not be invoked (#17906)
* fix the issue the sequence action will not be invoked

* add comment

* update _done in update() function
2017-06-08 14:52:36 +08:00
Satoshi 84463dbab4 fix CCLabel line height is reset (#17902) (#17903) 2017-06-07 16:56:02 +08:00
CocosRobot 12db177f5c [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17905) 2017-06-07 16:54:36 +08:00
Undume 72ad341d24 Webview opacity and background transparency (#17831)
* Added three new methods for UiWebView. SetOpacityWebView(float), getOpacityWebView(), setBackgroundTransparent() in IOS

* Implemented methods for UiWebView. SetOpacityWebView(float), getOpacityWebView(). They only work using android sdk +11.

* New methods not implemented for Tizen.

* Added new button for testing the opacity in the cocos2d-x test application.

* Added setBackgroundTransparent to android, and his UI-Test.

* Added setBackgroundTransparent to android, and his UI-Test.

* Added keyword const to the getters.

* Android sdk reflection. +11sdk for chaging the opacity.

* Reflection used for the webview.setLayerType, webview.setAlpha, webview.getAlpha

* Unified exceptions.
2017-06-07 16:12:32 +08:00
CocosRobot 421bd16cb7 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17904) 2017-06-07 13:44:00 +08:00
minggo c7899de857 only create gles 2 context (#17901) 2017-06-07 13:34:07 +08:00
minggo 4ca29ac1cf Merge v3.15.1 (#17897)
* remove APP_SHORT_COMMANDS setting (#17722)

some developers report it will cause error on Windows though i can not reproduce it. It is strange, the setting is used to resolve command length limitation on Windows.

* Particle font size should be a const value (#17676)

* Particle font size should be a const value

* Minor fix: CCStencilStateManager.hpp -> CCStencilStateManager.h in xcode project.

* JSB SocketIO.connect supports to pass a CA cert file (#17736)

* JSB SocketIO.connect supports to pass a CA cert file

* The second parameter of SocketIO.connect function is probably a `option` object. JSB just ignores it.

* The optimization for huawei. (#17832)

* The optimization for huawei.

* setAnimationInterval fix for all platforms.

* disable debug

* include fix.

* Uses better configuration for huawei optimization (#17838)

* Uses better configuration for huawei optimization

* Updates jar file and uncomment fps controlling code

* [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17840)

* update release not and version (#17845)

* [android] Removes an unused variable sRegistered in Cocos2dxActvity.java. (#17861)

* Updates jar to resolve warning while packaging APK file. (#17863)

* update release date (#17870)

* fix compiling error
2017-06-05 13:37:50 +08:00
minggo 8fcf0d7fd9 fix gradle setting (#17896) 2017-06-05 11:35:48 +08:00
Wilson E. Alvarez 41cafe836e Calling PhysicsWorld::setDebugDrawMask(false) will no longer crash when DebugDrawMask was already set to false (#17875) 2017-06-05 10:56:52 +08:00
Miigon fc541e706a Fix a typo in README.md (#17872) 2017-06-05 10:39:48 +08:00
Tyler Dauch 01714514fa Update CCNode.cpp (#17890) 2017-06-05 10:39:25 +08:00
saumyamukul 0a69031db3 [Windows]Fix edit box spacing and alignment (#17807)
* Fix windows edit box crash, spacing, and alignment

Signed-off-by: saumya.mukul <saumya.mukul@mx.com>

* Cleanup

* Reset file attributes
2017-05-31 08:57:11 +08:00
newnon 639737286f before draw event (#17669) 2017-05-26 11:09:24 +08:00