86f5d4cff8
fix comments for JniHelper.h ( #18481 )
...
update #18477
2017-11-21 11:36:10 +08:00
ff8d2cc20f
Fixing crash in Allocator if there are no allocated pages ( #12908 )
2017-11-21 10:56:29 +08:00
a8b6e33d9c
Unregister spine event lua event handler should set listener to null. ( #12845 )
2017-11-21 10:55:55 +08:00
fd8658e22f
Add Comments for JniHelper.h ( #18477 )
...
* Add Comments for JniHelper.h
* Update JniHelper.h
2017-11-20 10:41:56 +08:00
bceb242ebd
no message ( #18460 )
2017-11-10 15:05:21 +08:00
ed647fbe79
Added missing #include statement ( #18452 )
2017-11-09 10:04:45 +08:00
9b8fbf708d
Fix cocos2d::log va_list re-use bug ( #18426 )
2017-11-08 14:07:59 +08:00
a35c3200a8
Improve StringUtils::format implementation. ( #18425 )
2017-11-08 14:05:03 +08:00
b7bb03a061
RichText improvements ( #18447 )
...
* RichText improvements
* add support for continuous \n
* update UIRichText.cpp
* fix issue out of bounds
* Update UIRichText.cpp
* replace defaultHeights with lineHeights
* Update UIRichText.cpp
2017-11-08 13:59:57 +08:00
540980ab24
Update UIWebViewImpl-ios.mm ( #18448 )
2017-11-07 09:18:33 +08:00
db11024924
Reverts add search path logic in PR #17435 . ( #18419 )
...
If the last search path is _defaultResRootPath, addSearchPath(path) should not force that the last path is still default resource root path.
I made this mistake and broke the compatibiliy, since I thought resource root path definitely is low priority while search in most case. However, I should not make this assumption.
Anyway, dear developers, thanks for all of you review cocos2d-x source code. I accept any suggestion, any blame. I think everyone makes mistake more or less.
The key point is that `PLEASE DON'T MAKE THE SAME MISTAKE SECOND TIME, THIRD TIME`.
So please don't blame our developers who makes mistakes. We need to work together with all our developers to make our engine better and better.
And in fact, I never think that I deal with cocos2d-x source code as my 'own branch' although I contributed lots of code to it. I didn't push any code to repo directly since I sent Pull Requests. Every one could review code and comment in pull request. We encourage more communication with our developers in github or the forum. You could say GOOD , BAD or SHIT, but please do your best to respect every developer who made a contribution.
Thanks all of you. Good luck!
2017-11-06 10:41:01 +08:00
527dfd4579
Fix 60 fps for android ( #18445 )
2017-11-06 10:30:52 +08:00
ce5f37c7f5
set texture anti-alias by deault in RenderTexture ( #18442 )
...
fix issue #12459
2017-11-06 10:28:36 +08:00
0051c21be6
fix typos ( #18444 )
2017-11-06 10:28:11 +08:00
19bd8e3835
Spine update ( #18438 )
...
* update spine runtime and resource license
* apply patch to fix crash
* fix python path
2017-11-03 13:44:13 +08:00
1d356a160a
remove vs2013 libs ( #18439 )
2017-11-03 10:53:14 +08:00
28b1953411
Revert #18327 ( #18436 )
2017-11-03 10:02:50 +08:00
56baabfe50
update glfw to 3.2.1 ( #18434 )
2017-11-02 15:25:12 +08:00
8e2ad2fd12
Editbox init member variable ( #18432 )
...
* initialize _adjustHeight
* remove unneeded void
2017-11-02 13:57:11 +08:00
d42098e2c4
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #18431 )
2017-11-02 11:17:04 +08:00
cfaa77be28
Update spine ( #18427 )
2017-11-02 09:06:13 +08:00
d651298d3e
Fix bug of returning UNKNOWN event for return type key SEARCH/SEND in EditBox for Android and SEARCH for iOS. ( #18192 )
2017-11-01 17:33:31 +08:00
b53eb25200
use prebuilt version of Box2D ( #18422 )
2017-10-31 14:31:23 +08:00
496de07633
don't have to set NDK_MODULE_PATH manually
2017-10-26 13:40:27 +08:00
6cd2c0c340
Fix for issue #18409 ( #18410 )
...
Remove unnecessary PLTE chunk from png.
2017-10-26 11:39:50 +08:00
33135d0d14
remove unneeded log ( #18406 )
2017-10-26 10:12:53 +08:00
0f9a9c55d1
Fix status check in AudioDecoder.mm ( #18374 )
2017-10-25 10:48:45 +08:00
76ba85adfb
Make cocos' Android.mk self containing ( #18392 ) ( #18393 )
...
PROBLEM
-------
cocos makefile is not self-containing.
From the perspective of a developer that link his target with
`cocos2dx_static` library, it should specify in his `Android.mk` only
a path to a makefile that defines that module, by
a) using `import-add-path` and `import-module`
$(call import-add-path, <path-to-cocos-root>)
$(call import-module, cocos)
or ...
b) using directly an `include` command
include <path-to-cocos-root>/cocos/Android.mk
Unfortunately the current configuration of cocos' Android.mk doesn't
specify (using `import-add-path`) locations of modules that it uses.
In result, every dev that uses cocos to create Android app has to
populate NDK_MODULE_PATH at his Android.mk files by adding two lines:
$(call import-add-path, <path-to-cocos-root>/cocos)
$(call import-add-path, <path-to-cocos-root>/external)
Those lines have to be placed at cocos/Android.mk file.
The current configuration of build script breaks a good practice of
hiding internal details from clients of library or component. In fact
the script exposes internal dependencies and require from a dev to make
them out.
---
SOLUTION
This commit adds corresponding `import-add-path` commands to Android.mk
files.
---
HOW TO TEST
1. Create cocos2d-x app.
2. Import in your Android.mk file a `cocos` module using one of
aforementioned approaches.
3. The app should compile without a error message like the one below:
Android NDK: jni/../../cocos2d/cocos/Android.mk: Cannot find module with tag 'freetype2/prebuilt/android' in import path
Android NDK: Are you sure your NDK_MODULE_PATH variable is properly defined ?
Issue: https://github.com/cocos2d/cocos2d-x/issues/18392
2017-10-24 09:20:54 +08:00
bf67850710
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #18397 )
2017-10-23 11:58:20 +08:00
f0be714c0d
Fix for Non-TTF Label Shadow, it makes it follow label opacity ( #18324 )
2017-10-23 11:57:43 +08:00
9e3cc37a0c
Remove autorelease mark from UIWebViewWrapper and manage memory manually ( #18391 )
2017-10-23 11:40:52 +08:00
4726fa3b3d
Corrected bugs with cursor in TextField ( #18371 )
...
* No need to update password text in ccui TextFiled, because it's handled in TextFiledTTF
* Do not update visual state of Label if placeholder set when keyboard is attached
2017-10-23 11:37:07 +08:00
d06c082bf2
Fix Windows 10 compilation ( #18394 )
2017-10-23 11:18:14 +08:00
79b97e9992
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #18385 )
2017-10-20 10:06:21 +08:00
09d73ae238
Fix accelerometer on android when screen is rotated on reverse landscape or reverse portrait. ( #18317 )
2017-10-20 10:05:07 +08:00
d13d55c23f
Fix CameraBackgroundColorBrush cannot use alpha ( #18281 )
2017-10-20 09:43:45 +08:00
19ea797593
Fix crash TextFieldTTF::setCursorFromPoint ( #18159 )
...
A similar problem of
https://github.com/cocos2d/cocos2d-x/issues/15926
2017-10-16 22:58:51 -05:00
40ec511f48
improvements for StringUtils::StringUTF8 ( #18356 )
...
* 1. add 'const'
2. add range support for 'getAsCharSequence'
* remove default arguments
* use another variable to make it more clear
* rename isAnsi-> isASCII
2017-10-16 22:03:32 -05:00
25c240391c
fix crash ( #18375 )
2017-10-16 22:01:59 -05:00
617009f1cf
fix CCTextureCache addImageAsync race condition ( #18366 )
2017-10-16 00:58:29 -05:00
6e535f40e3
fix memory leak ( #18351 )
...
fix memory leak in `UserDefault::deleteValueForKey` when `key` not found
2017-10-15 21:56:41 -05:00
37d05d3ca0
wrong code committed, forgot to put :: operator. ( #18372 )
2017-10-15 21:37:01 -05:00
d32233d787
Fix "Possible misuse of comma operator here" ( #18350 )
2017-10-12 23:00:04 -05:00
10acb5a045
update version ( #18367 )
2017-10-12 22:58:43 -05:00
2132e48cd2
fix Memory Leak: ObjectFactory destroyInstance ( #18352 )
...
`ObjectFactory destroyInstance` function not called
2017-10-12 22:55:37 -05:00
809cfe3558
[ci skip]Fix endian detection macro. ( #18354 )
2017-10-10 09:01:19 +08:00
0d37220beb
[ci skip]EditBox::setText() may crash on some Android devices
2017-09-28 10:59:03 +08:00
78a167fec1
[ci skip]when keyboard is popup, engine should not continue to handle touch events
2017-09-28 10:25:25 +08:00
f2db054edb
[ci skip]fix android violation ( #18309 )
2017-09-25 09:28:03 +08:00
e5d19429b8
[ci skip]Make the sort behavior is same on 32bit and 64bit ( #18301 )
...
* Make the sort behavior is same on 32bit and 64bit
* Update CCNode.h
* Update CCNode.cpp
* Update ccMacros.h
* Use std::int32_t to for zOrder
* Update CCNode.cpp
2017-09-25 09:27:33 +08:00
b633260020
Should use setTextColor for editbox placeholder. ( #18311 )
2017-09-22 16:06:13 +08:00
bd59575468
fix #18296 ( #18299 )
...
fix #18296
2017-09-22 11:56:51 +08:00
a1ef303f47
Merge pull request #18294 from minggo/sync-v316
...
Sync v316
2017-09-21 11:07:20 +08:00
7350aeca8c
TMX: Added support for reading the object.rotation attribute ( #11540 )
...
Introduced with Tiled 0.10, this attribute stores the rotation of an
object in degrees clockwise.
Closes bjorn/tiled#921
2017-09-20 14:31:15 +08:00
b275a3e2f0
fix conflict
2017-09-20 09:11:35 +08:00
66471154b0
do not compile unneeded file ( #18290 )
2017-09-20 09:05:27 +08:00
a5374d0411
Fix minor typos ( #18289 )
2017-09-20 09:05:00 +08:00
edd81d3528
use error macro to replace constant value 1410L ( #18264 )
2017-09-19 10:05:46 +08:00
bb21a206a9
update vertex buffer to update color ( #18283 )
2017-09-19 09:41:10 +08:00
99f5fbb63f
Fix VAO in CameraBackgroundBrush ( #18278 ) ( #18279 )
2017-09-18 15:47:50 +08:00
80c9292969
Fix VAO in CameraBackgroundBrush ( #18278 )
2017-09-18 10:50:00 +08:00
36f7f3c37e
Merge branch 'v3.16' of github.com:cocos2d/cocos2d-x into syn-v316
2017-09-13 11:18:39 +08:00
2fbb6fe32a
[ci skip][lua] Bug fix in xhr:getResponseHeader("xxx") and better coding particle. ( #18252 )
...
* [lua] Bug fix in xhr:getResponseHeader("xxx") and better coding particle.
* More const auto &.
2017-09-13 10:54:35 +08:00
1929265a7c
[ci skip] Fix web engine issues for 3.16 QA ( #18251 )
...
* Fix web test case issue in UIListView
* imgLoader callback use texture instead of image
* Update web ref
2017-09-11 21:03:22 -05:00
6318324f4d
[android] Fixes Cocos2dxActivity is re-created which causes crash if launching app first time and re-opening from icon ( #18247 )
2017-09-12 09:38:54 +08:00
46e70d3c71
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #18236 )
2017-09-08 10:49:17 +08:00
ddb3c49eec
Workaround for getting AL_STOPPTED state after alSourcePlay(sourceId). ( #18228 )
2017-09-08 09:29:39 +08:00
ce1c207aee
add LayerMultiplex::switch(int ,bool) ( #18224 )
2017-09-08 09:28:57 +08:00
5d2c3f5d43
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #18234 )
2017-09-08 09:28:16 +08:00
557a6c0bf4
Add sourcePosition compatible support. ( #18230 )
2017-09-07 17:16:46 +08:00
aca7c86739
set default search path to the path the same as .exe file ( #18226 )
2017-09-07 11:22:00 +08:00
e161b613a4
make jnihelper thread safe ( #18189 )
2017-09-06 15:07:01 +08:00
c89e35e22a
Merge pull request #18216 from cocos2d/v3.16
...
V3.16
2017-09-06 14:59:36 +08:00
7a65363208
Changes JS version to 3.16. ( #18210 )
2017-09-06 09:10:14 +08:00
1fed9ae33b
[ci skip]fix android AudioEngine Crash ( #18124 ) ( #18209 )
...
* *fix android AudioEngine Crash
switch to background when sound effect is about to end, it's maybe crashed when switch to foreground again
* use "emplace" instead of "insert"
2017-09-01 11:30:10 +08:00
7cd828119d
[ci skip]fix android AudioEngine Crash ( #18124 )
...
* *fix android AudioEngine Crash
switch to background when sound effect is about to end, it's maybe crashed when switch to foreground again
* use "emplace" instead of "insert"
2017-09-01 10:16:04 +08:00
03635ecc4a
Improved Cocos2dxLuaLoader.cpp ( #18171 )
...
* Improved Cocos2dxLuaLoader.cpp
* Added testcase for new LuaLoader
2017-08-25 09:32:02 +08:00
d11674fd9c
[ci skip]implementation conversion lua table to ObjC Dictionary ( #18134 )
2017-08-24 14:17:21 +08:00
1360c2860a
Fixes compilation errors for android audio module while building with x86 arch. ( #18150 )
...
* Fixes compilation errors for android audio module while building with x86 arch.
* Update bitops.h
2017-08-22 15:13:08 +08:00
6e013b5a8a
fixed GLViewImpl::getMonitorSize() for desktop platforms ( #18141 )
2017-08-22 14:06:53 +08:00
b274322961
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #18183 )
2017-08-22 10:06:38 +08:00
9815ccba62
Fix android problem ( #18142 )
2017-08-22 09:52:28 +08:00
70ea1fc4d1
fix for ios audio engine ( #18146 )
2017-08-22 09:46:15 +08:00
a8026b0136
fix android problem with 24 bit depth buffer on some devices ( #18148 )
2017-08-22 09:43:07 +08:00
04b2dbbcdb
Blend function for UIImageView ( #18149 )
2017-08-22 09:40:37 +08:00
0bebd83f6b
Fix alpha blending during the animation of TransitionCrossFade. ( #18175 )
2017-08-22 09:33:37 +08:00
8adf780a3c
fixed #17989 : touch stops responding on android devices. ( #18165 )
...
It's caused by `FileUtils::getContents` is invoked in different threads and we use EventDispatcher::dispatchCustomEvent in `FileUtilsAndroid::getContents` to send an event to EngineDataManager.
Since EngineDataManager class is only for internal use and EventDispatcher isn't thread-safe, we make `EngineDataManager::onBeforeReadFile` public and invoke it `FileUtilsAndroid::getContents`.
2017-08-21 23:28:59 +08:00
a6a5426986
[ci skip]update version and readme ( #18169 )
2017-08-17 14:34:22 +08:00
afbf26ea3c
fix FontAtlas crash on some Android devices ( #18145 )
2017-08-17 00:06:01 +08:00
9f98e4cf83
less warnings ( #18144 )
2017-08-14 22:31:31 +08:00
a7d7aaa368
Update AudioCache.h ( #18136 )
2017-08-10 17:40:24 +08:00
1fa0f3d237
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #18129 )
2017-08-07 17:01:27 +08:00
5a3244511a
use correct selector to fix crash ( #18132 )
2017-08-07 17:00:35 +08:00
efe95fd899
[ci skip]Add Chipmunk JS binding for segmentQuery ( #18107 )
2017-08-07 11:57:45 +08:00
dc9abcc669
FontAtlas::prepareLetterDefinitions's memory leak. ( #18114 )
2017-08-07 11:13:56 +08:00
b5d871d53c
Hide virtual button by user control. ( #18100 )
...
* Hide virtual button by user control.
It want a lot of people, including me.
http://discuss.cocos2d-x.org/t/solved-android-navigation-bar/31760/3
http://discuss.cocos2d-x.org/t/android-cocos2d-v3-12-about-virtual-button/30811/5
http://joyplot.com/documents/2016/09/27/cocos2d-x-navigation-bar/
http://falstar.hateblo.jp/entry/2016/07/10/180112
* I also added the lua/js template.
Thank you for your work :)
2017-08-07 11:12:26 +08:00
4be6eb5325
correct usage of reference count of LabelAtlas ( #18117 )
2017-07-31 09:05:55 +08:00
b9cd599657
fix crash because of error offset ( #18108 )
2017-07-28 09:09:41 +08:00
db79a5ea6f
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #18102 )
2017-07-26 17:03:19 +08:00
12fc75790b
Fix pageview iterator invalidation ( #18091 )
...
* allow setting and getting of pageview indicator opacity. fix some documentation comments
* don't draw the indicator the selected indicator is currently overlapping
* add a tweaked opacity to one of the test cases
* remove unused variable
* convert tabs to whitespace
* change constexpr to static const
* fix iterator invalidation when adding or removing pages from the pageview
2017-07-25 20:11:02 +08:00
b77c29f750
make RichText supports img tag with Sprite Frame name ( #18087 )
2017-07-24 10:35:52 +08:00
681e9aa752
Fix polygon sprite bug of resetting flip and color information in setSpriteFrame. ( #18085 )
2017-07-19 11:08:12 +08:00
cdac595a68
fix iOS deltatime ( #18084 )
...
* fix ios delta time when resumes from background
* remove debug codes
2017-07-18 14:01:53 +08:00
78818ca275
Fix AudioEngine thread concurrency crash between myAlSourceNotificationCallback and _play2d iterating over _audioPlayers. ( #18083 )
2017-07-18 11:12:20 +08:00
a6773f408a
fix crash if there are more than 10 touches ( #18082 )
2017-07-18 09:47:12 +08:00
54586d06a4
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #18081 )
2017-07-17 16:51:50 +08:00
d42d969b46
Allow customizing opacity of PageView indicator nodes ( #18059 )
...
* allow setting and getting of pageview indicator opacity. fix some documentation comments
* don't draw the indicator the selected indicator is currently overlapping
* add a tweaked opacity to one of the test cases
* remove unused variable
* convert tabs to whitespace
* change constexpr to static const
2017-07-17 15:55:43 +08:00
0b99ba35f2
Fix ui slice issue ( #18065 )
...
* add tests to reproduce sprite slice issue
* fix scale9sprite change texture losing slice info
* fix tilemap crash issue
2017-07-17 15:52:01 +08:00
7da188734d
use VAO/VBO to improve performance ( #18066 )
2017-07-17 15:16:42 +08:00
bdfb71b05b
Moved GLFWEventHandler to its corresponding header ( #18063 )
2017-07-13 17:34:28 +08:00
717bd1c248
Fixed typo. Added comments about GLFW 3.3 controller support. ( #18064 )
2017-07-13 17:29:54 +08:00
78e2bf5f93
do not use custom EGLContextFactory ( #18062 )
...
it will crash on some devices
2017-07-13 17:21:25 +08:00
17f2a12a28
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #18061 )
2017-07-13 11:13:38 +08:00
876e4222a9
More useful events and getters in UIScrollView ( #18054 )
...
* add begin and end events to UIScrollView
* add new state to copySpecialProperties
* functions to find what percent scrolled in a scrollview we are
2017-07-13 10:35:29 +08:00
f4bf68610c
fixed #18055 : [android] urlConnection.getResponseCode may trigger exception which needs to be handled. ( #18056 )
2017-07-13 09:53:54 +08:00
2fbbdef58d
do not initialize VBO with big size for performance issue on some Android devices ( #18060 )
2017-07-13 09:52:07 +08:00
81d70adece
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #18052 )
2017-07-12 09:50:15 +08:00
18f173e3e6
Fixed vsnprintf compatibility with vc12 and vc14 ( #18040 )
...
* Fixed vsnprintf compatibility with vc12 and vc14
see reference: https://github.com/halx99/cocos2d-x/pull/30
* Update CCConsole.cpp
* Add comment.
2017-07-10 10:30:49 +08:00
5dd81e758a
Add controller support for Linux and Win32 ( #17990 )
...
* Add controller support for Linux and Win32
* Fix iOS and Mac linker issue
* Fixed documentation. Removed unnecessary whitespace.
2017-07-10 10:30:04 +08:00
1c55ad104d
Use cocos2d::Rect to avoid ambiguity ( #18048 )
...
Signed-off-by: Ole Herman Schumacher Elgesem <oleherman93@gmail.com>
2017-07-10 10:29:30 +08:00
e7c69e253a
fix invalid dt at start on iOS release mode ( #18041 )
2017-07-10 10:06:25 +08:00
74a6fd3293
Do not define VERY_VERY_VERBOSE_LOGGING by default. ( #18036 )
2017-07-06 14:57:02 +08:00
78e0cbfc5f
Use CurrentDirectory as defaultSearchRoot on Win32 ( #18017 )
...
Default, CurrentDirectory equals to ExeDir, but it's more flexible, and will not break compatible.
2017-07-06 10:24:18 +08:00
012e9982d8
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
2017-07-05 01:32:25 +00:00
d3eb857482
horizontal alignment support in RichText ( #18027 )
...
* horizontal alignment support in RichText
* split lambda into separate function
* tweak shadow test's content size so horizontal aligment doesn't give the illusion of behaving incorrectly
* fix alignment when the last char of a line is whitespace
* fix errors from merge
* fix bug in setting of size of image elements. scaling was applied effectively twice.
* removed debugging code. whoops
2017-07-05 09:25:12 +08:00
c8fc2dc3ef
arithmetic operators for Color4F ( #18028 )
...
* arithmetic operators for Color4F
* remove template functions
2017-07-05 09:05:03 +08:00
f2e9785132
Export cocos2d::utils::findChild to lua-bindings ( #18013 )
2017-07-04 14:37:44 +08:00
bbe84f8d7a
Remove unnecessary dynamic allocation ( #18014 )
...
* don't dynamically allocate PointArray's internal vector. take advantage of move semantics where possible.
* don't dynamically allocate RichText's _elementRenders vectors
2017-07-04 14:31:29 +08:00
fec74ac549
CCImage.cpp misuse CC_USE_PNG ( #18015 )
2017-07-04 14:17:17 +08:00
6d9bd1bf65
fix stats of seconds per frame on iOS ( #18025 )
2017-07-04 13:38:03 +08:00
e7a2708812
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #18021 )
2017-07-03 15:21:55 +08:00
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
795538ad9f
Fix sourcePosition bug for ParticleSystem. ( #18002 )
2017-06-30 09:20:43 +08:00
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
eb85f190bd
Add CCGLProgramStateCache header to cocos2d.h ( #17976 )
2017-06-26 13:53:17 +08:00
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
3208120ff9
fix warnings ( #17971 )
2017-06-23 17:47:20 +08:00
61839e7a5b
fix warnings ( #17970 )
2017-06-23 17:46:37 +08:00
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
61815f57c0
Fixed Director memory leak ( #17952 )
2017-06-21 09:45:53 +08:00
0f75d3ac5a
Added missing header for NDK v15 ( #17943 )
2017-06-20 09:04:51 +08:00
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
a23924c95b
Use const reference where possible. Dropped unnecessary namespace specifier ( #17941 )
2017-06-20 09:03:35 +08:00
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
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
3e912ffee3
add a macro to stip fps related data and functions ( #17934 )
2017-06-20 09:02:13 +08:00
78d5a809c8
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17933 )
2017-06-20 09:01:57 +08:00
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
f79a138c2b
revert updating flatbuffers ( #17930 )
...
* revert updating flatbuffers
* update external version
2017-06-15 13:42:50 +08:00
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
mschoi17