e933dea96a
Let ScrollView swallow touch events variable. ( #18126 )
2017-08-07 11:20:35 +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
3aa03b2fc6
correct windows ci build status ( #18111 )
2017-07-28 11:10:55 +08:00
b87ee867d3
Update submodule: cocos2d-console ( #18103 )
2017-07-28 09:55:15 +08:00
39ec33022a
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #18097 )
2017-07-28 09:52:45 +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
4f81d827eb
Removed extra parens ( #18075 )
2017-07-17 15:53:57 +08:00
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
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
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
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
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
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
4853c753b8
fix a typo in README.md ( #18044 )
2017-07-10 10:28:33 +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
ecea0f4951
update web engine submodule, improve editbox tests ( #18032 )
2017-07-06 10:27:52 +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
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
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
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
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
jtkjp