Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
36,562 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

12977 Commits

Author SHA1 Message Date
SBJoker f0be714c0d Fix for Non-TTF Label Shadow, it makes it follow label opacity (#18324) 2017-10-23 11:57:43 +08:00
Vladyslav Kaplun 9e3cc37a0c Remove autorelease mark from UIWebViewWrapper and manage memory manually (#18391) 2017-10-23 11:40:52 +08:00
Nikita 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
crazyhappygame d06c082bf2 Fix Windows 10 compilation (#18394) 2017-10-23 11:18:14 +08:00
CocosRobot 79b97e9992 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#18385) 2017-10-20 10:06:21 +08:00
pyrosphere 09d73ae238 Fix accelerometer on android when screen is rotated on reverse landscape or reverse portrait. (#18317) 2017-10-20 10:05:07 +08:00
okamura d13d55c23f Fix CameraBackgroundColorBrush cannot use alpha (#18281) 2017-10-20 09:43:45 +08:00
Vladimir Perminov 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
Jeff Wang 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
minggo 25c240391c fix crash (#18375) 2017-10-16 22:01:59 -05:00
xiaoyur347 617009f1cf fix CCTextureCache addImageAsync race condition (#18366) 2017-10-16 00:58:29 -05:00
Jeff Wang 6e535f40e3 fix memory leak (#18351) 
fix memory leak in `UserDefault::deleteValueForKey` when `key` not found
 2017-10-15 21:56:41 -05:00
Saber Haj Rabiee 37d05d3ca0 wrong code committed, forgot to put :: operator. (#18372) 2017-10-15 21:37:01 -05:00
Greg Rynkowski d32233d787 Fix "Possible misuse of comma operator here" (#18350) 2017-10-12 23:00:04 -05:00
minggo 10acb5a045 update version (#18367) 2017-10-12 22:58:43 -05:00
Jeff Wang 2132e48cd2 fix Memory Leak: ObjectFactory destroyInstance (#18352) 
`ObjectFactory destroyInstance` function not called
 2017-10-12 22:55:37 -05:00
halx99 809cfe3558 [ci skip]Fix endian detection macro. (#18354) 2017-10-10 09:01:19 +08:00
Knox 0d37220beb [ci skip]EditBox::setText() may crash on some Android devices 2017-09-28 10:59:03 +08:00
Knox 78a167fec1 [ci skip]when keyboard is popup, engine should not continue to handle touch events 2017-09-28 10:25:25 +08:00
minggo f2db054edb [ci skip]fix android violation (#18309) 2017-09-25 09:28:03 +08:00
halx99 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
James Chen b633260020 Should use setTextColor for editbox placeholder. (#18311) 2017-09-22 16:06:13 +08:00
Jeff Wang bd59575468 fix #18296 (#18299) 
fix #18296
 2017-09-22 11:56:51 +08:00
minggo a1ef303f47 Merge pull request #18294 from minggo/sync-v316 
Sync v316
 2017-09-21 11:07:20 +08:00
Thorbjørn Lindeijer 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
minggo b275a3e2f0 fix conflict 2017-09-20 09:11:35 +08:00
minggo 66471154b0 do not compile unneeded file (#18290) 2017-09-20 09:05:27 +08:00
mogemimi a5374d0411 Fix minor typos (#18289) 2017-09-20 09:05:00 +08:00
yycmmc edd81d3528 use error macro to replace constant value 1410L (#18264) 2017-09-19 10:05:46 +08:00
minggo bb21a206a9 update vertex buffer to update color (#18283) 2017-09-19 09:41:10 +08:00
minggo 99f5fbb63f Fix VAO in CameraBackgroundBrush (#18278) (#18279) 2017-09-18 15:47:50 +08:00
pyrosphere 80c9292969 Fix VAO in CameraBackgroundBrush (#18278) 2017-09-18 10:50:00 +08:00
minggo 36f7f3c37e Merge branch 'v3.16' of github.com:cocos2d/cocos2d-x into syn-v316 2017-09-13 11:18:39 +08:00
James Chen 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
pandamicro 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
James Chen 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
CocosRobot 46e70d3c71 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#18236) 2017-09-08 10:49:17 +08:00
James Chen ddb3c49eec Workaround for getting AL_STOPPTED state after alSourcePlay(sourceId). (#18228) 2017-09-08 09:29:39 +08:00
minggo ce1c207aee add LayerMultiplex::switch(int ,bool) (#18224) 2017-09-08 09:28:57 +08:00
CocosRobot 5d2c3f5d43 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#18234) 2017-09-08 09:28:16 +08:00
halx99 557a6c0bf4 Add sourcePosition compatible support. (#18230) 2017-09-07 17:16:46 +08:00
minggo aca7c86739 set default search path to the path the same as .exe file (#18226) 2017-09-07 11:22:00 +08:00
minggo e161b613a4 make jnihelper thread safe (#18189) 2017-09-06 15:07:01 +08:00
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
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
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
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
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
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 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
子龙山人 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
minggo 7da188734d use VAO/VBO to improve performance (#18066) 2017-07-17 15:16:42 +08:00
Wilson E. Alvarez bdfb71b05b Moved GLFWEventHandler to its corresponding header (#18063) 2017-07-13 17:34:28 +08:00
Wilson E. Alvarez 717bd1c248 Fixed typo. Added comments about GLFW 3.3 controller support. (#18064) 2017-07-13 17:29:54 +08:00
minggo 78e2bf5f93 do not use custom EGLContextFactory (#18062) 
it will crash on some devices
 2017-07-13 17:21:25 +08:00
CocosRobot 17f2a12a28 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#18061) 2017-07-13 11:13:38 +08:00
kepler-5 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
James Chen f4bf68610c fixed #18055: [android] urlConnection.getResponseCode may trigger exception which needs to be handled. (#18056) 2017-07-13 09:53:54 +08:00
minggo 2fbbdef58d do not initialize VBO with big size for performance issue on some Android devices (#18060) 2017-07-13 09:52:07 +08:00
CocosRobot 81d70adece [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#18052) 2017-07-12 09:50:15 +08:00
halx99 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
Wilson E. Alvarez 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
Ole Herman Schumacher Elgesem 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
minggo e7c69e253a fix invalid dt at start on iOS release mode (#18041) 2017-07-10 10:06:25 +08:00
Tiago Martines 74a6fd3293 Do not define VERY_VERY_VERBOSE_LOGGING by default. (#18036) 2017-07-06 14:57:02 +08:00
halx99 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
CocosRobot#Set 012e9982d8 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically 2017-07-05 01:32:25 +00:00
kepler-5 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
kepler-5 c8fc2dc3ef arithmetic operators for Color4F (#18028) 
* arithmetic operators for Color4F

* remove template functions
 2017-07-05 09:05:03 +08:00
halx99 f2e9785132 Export cocos2d::utils::findChild to lua-bindings (#18013) 2017-07-04 14:37:44 +08:00
kepler-5 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
afpro fec74ac549 CCImage.cpp misuse CC_USE_PNG (#18015) 2017-07-04 14:17:17 +08:00