minggo
c89e35e22a
Merge pull request #18216 from cocos2d/v3.16
...
V3.16
2017-09-06 14:59:36 +08:00
James Chen
7a65363208
Changes JS version to 3.16. ( #18210 )
2017-09-06 09:10:14 +08:00
CocosRobot
925432deb1
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #18215 )
2017-09-06 09:09:26 +08:00
minggo
15b43659c2
update to use Android Studio 2.3.3 ( #18214 )
2017-09-01 17:46:26 +08:00
minggo
71f28a78df
update cocos console to fix iOS compiling isue ( #18208 )
2017-09-01 16:03:01 +08:00
James Chen
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
zoxin
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
minggo
e1c6590c66
Update config.json
2017-08-28 14:46:38 +08:00
minggo
18709f38d1
Update config.json
2017-08-28 14:45:09 +08:00
minggo
4a0b9b1fd3
[ci skip]remove tizen projects ( #18196 )
2017-08-28 14:33:01 +08:00
Valera
03635ecc4a
Improved Cocos2dxLuaLoader.cpp ( #18171 )
...
* Improved Cocos2dxLuaLoader.cpp
* Added testcase for new LuaLoader
2017-08-25 09:32:02 +08:00
jett_yu
d11674fd9c
[ci skip]implementation conversion lua table to ObjC Dictionary ( #18134 )
2017-08-24 14:17:21 +08:00
Dmitry
e79f21cec0
add new CMakeLists.txt to cpp-template-default ( https://gist.github.com/MrCapone/ccdc1826cb7362086107e8096bfe6f90 ) ( #18167 )
2017-08-22 15:44:45 +08:00
James Chen
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
Dmitry
6e013b5a8a
fixed GLViewImpl::getMonitorSize() for desktop platforms ( #18141 )
2017-08-22 14:06:53 +08:00
CocosRobot
b274322961
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #18183 )
2017-08-22 10:06:38 +08:00
newnon
9815ccba62
Fix android problem ( #18142 )
2017-08-22 09:52:28 +08:00
newnon
70ea1fc4d1
fix for ios audio engine ( #18146 )
2017-08-22 09:46:15 +08:00
newnon
a8026b0136
fix android problem with 24 bit depth buffer on some devices ( #18148 )
2017-08-22 09:43:07 +08:00
newnon
04b2dbbcdb
Blend function for UIImageView ( #18149 )
2017-08-22 09:40:37 +08:00
pyrosphere
0bebd83f6b
Fix alpha blending during the animation of TransitionCrossFade. ( #18175 )
2017-08-22 09:33:37 +08:00
James Chen
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
minggo
a6a5426986
[ci skip]update version and readme ( #18169 )
2017-08-17 14:34:22 +08:00
newnon
afbf26ea3c
fix FontAtlas crash on some Android devices ( #18145 )
2017-08-17 00:06:01 +08:00
Carlos Madrazo
aecc68d7b8
Add game-controller-test for win32 ( #18164 )
...
compile from build/cocos2d-win32.sln
2017-08-16 17:46:09 +08:00
Jie Meng
9c35c90614
Fix android compile fail bug ( #18166 )
2017-08-16 17:44:11 +08:00
newnon
9f98e4cf83
less warnings ( #18144 )
2017-08-14 22:31:31 +08:00
Tyler Dauch
a7d7aaa368
Update AudioCache.h ( #18136 )
2017-08-10 17:40:24 +08:00
CocosRobot
1fa0f3d237
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #18129 )
2017-08-07 17:01:27 +08:00
minggo
5a3244511a
use correct selector to fix crash ( #18132 )
2017-08-07 17:00:35 +08:00
Joel Besada
efe95fd899
[ci skip]Add Chipmunk JS binding for segmentQuery ( #18107 )
2017-08-07 11:57:45 +08:00
jtkjp
e933dea96a
Let ScrollView swallow touch events variable. ( #18126 )
2017-08-07 11:20:35 +08:00
ggggamer
dc9abcc669
FontAtlas::prepareLetterDefinitions's memory leak. ( #18114 )
2017-08-07 11:13:56 +08:00
bulzipke
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
minggo
4be6eb5325
correct usage of reference count of LabelAtlas ( #18117 )
2017-07-31 09:05:55 +08:00
minggo
3aa03b2fc6
correct windows ci build status ( #18111 )
2017-07-28 11:10:55 +08:00
kazsango
b87ee867d3
Update submodule: cocos2d-console ( #18103 )
2017-07-28 09:55:15 +08:00
CocosRobot
39ec33022a
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #18097 )
2017-07-28 09:52:45 +08:00
minggo
b9cd599657
fix crash because of error offset ( #18108 )
2017-07-28 09:09:41 +08:00
CocosRobot
db79a5ea6f
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #18102 )
2017-07-26 17:03:19 +08:00
kepler-5
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
minggo
b77c29f750
make RichText supports img tag with Sprite Frame name ( #18087 )
2017-07-24 10:35:52 +08:00
Felippe Durán
681e9aa752
Fix polygon sprite bug of resetting flip and color information in setSpriteFrame. ( #18085 )
2017-07-19 11:08:12 +08:00
minggo
cdac595a68
fix iOS deltatime ( #18084 )
...
* fix ios delta time when resumes from background
* remove debug codes
2017-07-18 14:01:53 +08:00
Felippe Durán
78818ca275
Fix AudioEngine thread concurrency crash between myAlSourceNotificationCallback and _play2d iterating over _audioPlayers. ( #18083 )
2017-07-18 11:12:20 +08:00
minggo
a6773f408a
fix crash if there are more than 10 touches ( #18082 )
2017-07-18 09:47:12 +08:00
CocosRobot
54586d06a4
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #18081 )
2017-07-17 16:51:50 +08:00
kepler-5
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
Norbu Tsering
4f81d827eb
Removed extra parens ( #18075 )
2017-07-17 15:53:57 +08:00
minggo
31cf7bc625
add windows ci ( #18077 )
2017-07-17 15:52:44 +08:00