Commit Graph

2747 Commits

Author SHA1 Message Date
leeda ca46b062fd spine res name update, because files name changed before (#18586) 2017-12-26 09:10:24 +08:00
Jeff Wang 01ee30a023 improvements for EditBox-win32 (#18579)
* improvements for EditBox-win32

* add test case

* Update UIEditBoxImpl-win32.cpp
2017-12-22 09:14:27 +08:00
AIGRIND 45992aa80e ScrollView API to stop overall scroll (#18552)
* ScrollView API to stop overall scroll

* ScrollView API to stop overall scroll

* ScrollView API to stop overall scroll

Cancel current touch handling after stopScroll() is called

* New test for scrolling stop in UIScrollView

* New test for scrolling stop in UIScrollView
2017-12-14 13:38:03 +08:00
James Chen 89781a44df Fixes ResizableBufferAdapter<Data>::resize doesn't consider the situation of new size which is lower than old size. (#18553) 2017-12-12 17:49:11 +08:00
minggo 5151dfd6f9
Remove ant projects (#18532)
* remove proj.android

* remove ant building and rename proj.android-studio to proj.android

* not pass --android-studio
2017-12-04 18:00:45 +08:00
minggo 9c67dcab9d
remove proj.android (#18529) 2017-12-04 11:26:43 +08:00
minggo a7a61e6a83
travis build android studio projects (#18515) 2017-12-01 17:29:34 +08:00
crazyhappygame 03066ff47d Windows 10 update compiler to Visual Studio 10 PlatformToolset v141 (#18511) 2017-11-27 17:10:52 +08:00
James Chen b191318e15 Auto hide home indicator for iPhoneX. (#18514) 2017-11-27 17:08:34 +08:00
minggo dacd8e664f
fix issue that can not generate archieve file with Xcode9 (#18498) 2017-11-24 10:38:41 +08:00
Mozart Louis bb479e4f6d Android Studio 3.0 + Switching to libc++ (c++_static) + Simplify PROP_* values + Adding default Proguard Config for cocos (#18470)
* Updated android build process to use c++_static

* Comment out org.gradle.jvmargs

* Updated all project in test directory

* Update C++ Template

* Update js and lua projects

* Update Proguard + Lower minSdkVersion to 14

* Added All PROP_* values + updated build.gradle

* Updated versions
2017-11-23 09:08:50 +08:00
James Chen 69e5a056e6 Uses Images.xcassets instead of several icon png files. (#18485)
* Uses Images.xcassets instead of several icon png files.

* Renames AppIcon.

* Sets AppIcon from Images.xcassets

* Uses Images.xcassets instead of several icon png files for template projects.

* Modify permission to 644
2017-11-21 15:31:29 +08:00
minggo 19bd8e3835
Spine update (#18438)
* update spine runtime and resource license

* apply patch to fix crash

* fix python path
2017-11-03 13:44:13 +08:00
minggo cfaa77be28
Update spine (#18427) 2017-11-02 09:06:13 +08:00
minggo b53eb25200
use prebuilt version of Box2D (#18422) 2017-10-31 14:31:23 +08:00
minggo 496de07633 don't have to set NDK_MODULE_PATH manually 2017-10-26 13:40:27 +08:00
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 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
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 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 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 afe4016618 fix crash of CaptureScreenTest (#18242) 2017-09-12 09:39:15 +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 c6b87f2b09 More specific prompt for ETC1 test. (#18212) 2017-09-06 15:03:59 +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
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
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
saumyamukul 0a69031db3 [Windows]Fix edit box spacing and alignment (#17807)
* Fix windows edit box crash, spacing, and alignment

Signed-off-by: saumya.mukul <saumya.mukul@mx.com>

* Cleanup

* Reset file attributes
2017-05-31 08:57:11 +08:00
Nick Dong afcffc7b3a Handle auto layout with scaled widget (#17822)
* handle auto layout with scaled widget

* add test for UILayout for Scaled Widget

* add test for UILayout - Scaled Widget - JS
2017-05-26 10:09:57 +08:00
minggo 54962ee509 LayerRadialGradient works on mac and iOS (#17826)
* LayerRadialGradient works on mac and iOS

* fix radius

* finish LayerRadialGradient and add test case

* use local coordinate in shader

* adjust function attributes

* implement getCenter()

* add some comments
2017-05-22 13:42:00 +08:00
James Chen 95baff7086 fixed #17835: pauseEventListenersForTarget doesn't work correctly while in dispatching event (#17836)
* add test.

* fixed #17835: pauseEventListenersForTarget doesn't work correctly while in dispatching event

* remove a unneeded check
2017-05-19 14:03:51 +08:00
Dimon4eg a3cb7de101 Fix reschedule issue with same key (#17706)
* fix reschedule issue

* correct code formatting

* Fix isScheduled

* improve a bit performance of executing functions in cocos thread

* added test to verify reschedule issue

* re-init timer in schedule if timer exists and alive
2017-05-04 16:24:20 +08:00
子龙山人 55b14cbde5 Fix android edit box duplicated text (#17775)
* fix editbox textChanged event called after fragment loaded

* fix editbox duplicatd text when change text in textChanged callback

* revert changes of placeholder modification
2017-05-04 15:04:47 +08:00