Commit Graph

5003 Commits

Author SHA1 Message Date
Ruud Arentsen ea22822875 Added support for BMFont in TextField (#18587)
* Added support for BMFont in TextField

* Added cursor support for BMFont in TextFieldTTF
Made BMFont detection case insensitive and a bit more fool proof

* Added TextField::createWithBMFont, so that the font size is determined internally.

* Revert "Added TextField::createWithBMFont, so that the font size is determined internally."

This reverts commit 46b4e72ba44979b012ffa52bb78ea0a8493f7869.

* fix BMFont Cursor scale

* remove error add subproject
2017-12-29 11:24:02 +08:00
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
TheLonelyShepherd e127c353f6 bugfix (#18547) 2017-12-12 17:50:22 +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
James Chen d21af3b981 Some fixes after using ndk r16 clang to build android projects (#18531)
* [android] Fixes warning in UrlAudioPlayer.cpp and CCUserDefault-android.cpp

* Don't write 'using namespace std;' in header files.

* Uses std::unordered_map instead of std::map for Particle3D module.

* Updates external/config.json to v3-deps-141

* Continue to replace `gnustl_static` to `c++_static` for templates and test projects.

* Updates CCConsole.h/.cpp to resolve the following issue on Android:

jni/../../../../../cocos/base/CCConsole.cpp:321:28:   required from here
/Users/james/Software/android/android-sdk/ndk-bundle/sources/cxx-stl/llvm-libc++/include/utility:506:63: error: incomplete type 'std::__ndk1::is_move_assignable<cocos2d::Console::Command>' used in nested name specifier
                         is_move_assignable<first_type>::value &&
                                                               ^
make: *** [obj/local/arm64-v8a/objs-debug/cocos2dx_internal_static/base/CCConsole.o] Error 1

* Fixes a memory leak while addCommand and other minor changes.

* Updates tolua/cocos2dx.ini, don't bind Console::Command

* Adds CC_DLL for Console::Command

* Reverts tolua/cocos2dx.ini and ignore Console::[add Command addSubCommand getSubCommand delSubCommand].

* Ignores Console::getCommand.
2017-12-05 13:35:16 +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
Sun 685a5441c0 Modified annotations (#18521)
Only some of sentences are start with capitalize the first letter of them. So it's not  regular.
2017-11-29 09:20:15 +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
James Chen 14bca227e8 fixed #18474: Provides an interface for getting SafeArea (#18489)
* fixed #18474: Provides an interface for getting SafeArea

* Adds getSafeAreaRect test demo in cpp-empty-test.

* @available(iOS 11.0, *) isn't supported in Xcode8. So we use the old way.
2017-11-23 09:34:23 +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 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