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

36540 Commits

Author SHA1 Message Date
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
子龙山人 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
Ole Herman Schumacher Elgesem e9fb405488 Added closeItem nullptr check in HelloWorld (#18057) 
Signed-off-by: Ole Herman Schumacher Elgesem <oleherman93@gmail.com>
 2017-07-13 09:53:03 +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
Ole Herman Schumacher Elgesem a7482b4bd1 Added error checking for missing files in HelloWorldScene (#18049) 
Signed-off-by: Ole Herman Schumacher Elgesem <oleherman93@gmail.com>
 2017-07-10 13:45:55 +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
Weilin Shi 4853c753b8 fix a typo in README.md (#18044) 2017-07-10 10:28:33 +08:00
minggo e7c69e253a fix invalid dt at start on iOS release mode (#18041) 2017-07-10 10:06:25 +08:00