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

4982 Commits

Author SHA1 Message Date
okamura d13d55c23f Fix CameraBackgroundColorBrush cannot use alpha (#18281) 2017-10-20 09:43:45 +08:00
Vladimir Perminov 849e72385b Add test case for TextFieldTTF::setCursorFromPoint (#18336) 
Test crash in https://github.com/cocos2d/cocos2d-x/pull/18159
 2017-10-17 00:48:38 -05:00
minggo 0b699e8f19 fix conflict 2017-10-09 10:23:13 +08:00
pandamicro 247921c08a [ci skip] update web ref and fix test case issues (#18310) 2017-09-22 10:54:53 +08:00
minggo b275a3e2f0 fix conflict 2017-09-20 09:11:35 +08:00
James Chen 0c5ba220b1 Supports full screen for iPhone X and uses Storyboard for launch screen. (#18276) 
* Supports full screen for iPhone X and uses Storyboard for launch screen.
cpp-empty-tests done.

* Supports full screen for iPhone X and uses Storyboard for launch screen.
cpp-tests, js-tests, lua-empty-test, lua-tests done.

* Removes unused UILaunchImages for test projects.

* Removes unused UILaunchImages for template projects.

* Adds LaunchScreen.storyboard / LaunchScreenBackground for template projects.

* Fixes lua template.
 2017-09-19 15:01:19 +08:00
minggo bbc3eaaa4d fix gravity direction (#18282) 2017-09-19 09:41:44 +08:00
minggo 186e05f7c5 adjust z order (#18284) 2017-09-18 17:18:20 +08:00
James Chen a73d5893b4 [android] Fixes AppAcitivity (Sub class of Cocos2dxActivity) is re-created which causes crash if launching app first time and re-opening from icon. (#18271) 
* [android] Fixes AppAcitivity (Sub class of Cocos2dxActivity) is re-created which causes crash if launching app first time and re-opening from icon.

* Update AppActivity.java

* Update AppActivity.java
 2017-09-18 15:12:30 +08:00
minggo c4042c220b [ci skip]fix issue that can not change position style, can not add new emitter (#18272) 2017-09-15 10:49:04 +08:00
minggo c66694cf20 adjust to make wrap mode take effect (#18259) 
* adjust to make wrap mode take effect

* make description more clear
 2017-09-15 09:01:56 +08:00
minggo 19962a3b59 [ci skip]don't clean layer when switch to another layer (#18267) 2017-09-14 17:42:56 +08:00
minggo dc8502edc1 make description more clear (#18263) 2017-09-14 09:26:04 +08:00
minggo 26272b2026 use update instead of run action because Sequence has issue when work with RepeatForever (#18257) 2017-09-13 15:36:11 +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 3468ff6c33 [js-tests] Fixes no image display in OpenGLTest (#18241) 2017-09-12 09:39:49 +08:00
pandamicro 402be527a7 Fix web test case issue in UIListView (#18245) 2017-09-12 09:39:33 +08:00
minggo afe4016618 fix crash of CaptureScreenTest (#18242) 2017-09-12 09:39:15 +08:00
James Chen ec83cc99cc [ci skip] [lua-tests] fix wrong position of 'save' button in renderTextureTest. (#18244) 2017-09-08 16:42:12 +08:00
pandamicro 3603ace449 Merge pull request #18240 from pandamicro/v3.16 
Fix Label cutting issue in web test case
 2017-09-08 16:39:28 +08:00
James Chen bcee395f6e [js-tests] Fixes UISceneManager.js:830:TypeError: test is undefined (#18243) 2017-09-08 15:34:54 +08:00
pandamicro 97325298c5 Fix Label cutting issue in web test case 2017-09-08 14:52:27 +08:00
James Chen d13c01230f Fixes ShaderRetroEffect crashes. (#18237) 2017-09-08 14:10:40 +08:00
minggo 2fe40dba68 make uifocustest the same behavior as cpp (#18238) 2017-09-08 10:35:15 +08:00
minggo ce1c207aee add LayerMultiplex::switch(int ,bool) (#18224) 2017-09-08 09:28:57 +08:00
minggo 85456fa1d5 fix local z order issue (#18232) 2017-09-08 09:28:35 +08:00
James Chen f0555f12a9 [android] Fixes ReflectionTest doesn't work while building with android studio. (#18229) 2017-09-07 16:27:06 +08:00
James Chen 339facb59a [ci skip]JSB LoaderTest fix. (#18231) 2017-09-07 15:22:05 +08:00
James Chen 5cf8db85d4 Fixes crash of lua particle test while building lua-tests in release mode. (#18221) 2017-09-06 15:06:21 +08:00
James Chen 30266b4ddd [ci skip]Fixes crash of lua particle test while building lua-tests in release mode. (#18222) 2017-09-06 15:05:47 +08:00
James Chen afe7ddcad3 Updates EventDispatcherTest for js-tests and lua-tests. (#18211) 
Fixes http://punchbox.info:3000/issues/26293
Uses removeFromParent(false) for not cleaning up EventListener associated with node.
 2017-09-06 15:05:03 +08:00
James Chen c6b87f2b09 More specific prompt for ETC1 test. (#18212) 2017-09-06 15:03:59 +08:00
minggo c89e35e22a Merge pull request #18216 from cocos2d/v3.16 
V3.16
 2017-09-06 14:59:36 +08:00
minggo 15b43659c2 update to use Android Studio 2.3.3 (#18214) 2017-09-01 17:46:26 +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
Carlos Madrazo aecc68d7b8 Add game-controller-test for win32 (#18164) 
compile from build/cocos2d-win32.sln
 2017-08-16 17:46:09 +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
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
子龙山人 ecea0f4951 update web engine submodule, improve editbox tests (#18032) 2017-07-06 10:27:52 +08: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
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
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
shintaro.tanikawa f9c8bd4bc1 Add padding options to ListView (#17587) 
* Add options to ListView for setting padding

* Add 'setPadding' method test cases.
 2017-06-15 14:56:54 +08:00
minggo 2b3baf4517 fix precision issue (#17908) 
* fix precision issue

* fix shader error on mac
 2017-06-12 08:57:40 +08:00
Satoshi 84463dbab4 fix CCLabel line height is reset (#17902) (#17903) 2017-06-07 16:56:02 +08:00
Undume 72ad341d24 Webview opacity and background transparency (#17831) 
* Added three new methods for UiWebView. SetOpacityWebView(float), getOpacityWebView(), setBackgroundTransparent() in IOS

* Implemented methods for UiWebView. SetOpacityWebView(float), getOpacityWebView(). They only work using android sdk +11.

* New methods not implemented for Tizen.

* Added new button for testing the opacity in the cocos2d-x test application.

* Added setBackgroundTransparent to android, and his UI-Test.

* Added setBackgroundTransparent to android, and his UI-Test.

* Added keyword const to the getters.

* Android sdk reflection. +11sdk for chaging the opacity.

* Reflection used for the webview.setLayerType, webview.setAlpha, webview.getAlpha

* Unified exceptions.
 2017-06-07 16:12:32 +08:00
minggo 8fcf0d7fd9 fix gradle setting (#17896) 2017-06-05 11:35:48 +08:00