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

36663 Commits

Author SHA1 Message Date
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
Tiago Martines 74a6fd3293 Do not define VERY_VERY_VERBOSE_LOGGING by default. (#18036) 2017-07-06 14:57:02 +08:00
子龙山人 ecea0f4951 update web engine submodule, improve editbox tests (#18032) 2017-07-06 10:27:52 +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
子龙山人 1ce88edd22 Merge pull request #18031 from CocosRobot/update_lua_bindings_1499218342 
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
 2017-07-05 15:35:24 +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
minggo 6d9bd1bf65 fix stats of seconds per frame on iOS (#18025) 2017-07-04 13:38:03 +08:00
Julio Montes 69a37a763e cmake: use *-2015 libs when msvc is greater than 1900 (#18007) 
This patch adds support for newer versions of visual studio

fixes: #18006

Signed-off-by: Julio Montes <imc.coder@gmail.com>
 2017-07-03 17:20:25 +08:00
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