18a6d8241d
update Copyright. might need manual fix later ( #18659 )
...
* Copyright use python script updated. might be fix by manual later
* Revert "Copyright use python script updated. might be fix by manual later"
This reverts commit 49e99418e4da1fd02afda448ddeb16210f5e8c71.
* re modify copyright, consider utf-8-sig encoding
* another situation, add Copyright before "Permission is hereby granted"
* Revert "another situation, add Copyright before "Permission is hereby granted""
This reverts commit ee82591d32353c7ce2e146fe51ef447433b47571.
* another situation, add Copyright before Permission is hereby granted
* change "Copyright (c) 2016-2016 Chukong Technologies Inc." to " Copyright (c) 2016 Chukong Technologies Inc."
* script modify copyright, consider is cocos copyright or not
* change "Copyright (c) 2017 Chukong Technologies Inc." to "Copyright (c) 2016 Chukong Technologies Inc."
* manual fix, not fix audio related
* change "2016-2016" to "2016"
2018-01-29 16:25:32 +08:00
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
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
3937b4d631
Fix minor typos in UI test cases ( #17400 )
2017-02-23 16:14:39 +08:00
79126ea72a
make ListView::setGlobalZOrder() work ( #17098 )
...
* make ListView::setGlobalZOrder() work
* revert modification of UIButton
* reset background color
* change global z order to test
2017-01-04 11:06:44 +08:00
8068c51d94
remove studio related test cases and resources ( #15574 )
...
* remove studio related test cases and resources
* remove unneeded files
2016-05-06 13:38:19 +08:00
f9f751834a
Add missing float suffix to avoid warning C4305
2016-04-20 03:54:47 +09:00
c566dce581
fix: compile cpp-tests in release mode
...
replace some deprecated functions
use `log` instead of `CCLOG` in order to avoid Warnings when not using
some variables
2016-03-29 18:09:58 -07:00
7ec4450fc0
add js ListView item reuse tests
2016-03-01 15:22:32 +08:00
552d7d0132
add vertical list cell reuse tests
2016-03-01 13:44:42 +08:00
b3b08271e6
improve Listview item demo
2016-03-01 10:37:48 +08:00
a839d5818e
add horizontal cell reuse ListView
2016-03-01 00:07:49 +08:00
9c2130e88a
fix Layout and ClippingNode nested rendering issue
2015-11-24 18:01:50 +08:00
4b83240bed
Fix bug: in ui::Widget::isClippingParentContainsPoint, _hittedByCamera may be null.
2015-09-17 11:20:36 +08:00
3fff195c20
Override 'jumpToSomewhere' functions in list view to recalculate inner container's size if necessary.
2015-09-13 22:32:22 +09:00
22b2f8b7b3
ListView - Change the order of test cases and fix for windows builds.
2015-09-11 16:00:53 +09:00
e58c073186
ListView - Apply magnetic to inertia scroll.
2015-09-09 10:29:18 +09:00
ca3ea53ffd
ListView - Add enum for magnetic type and test cases for magnetic scroll.
2015-09-09 10:29:18 +09:00
d8fc04d109
ListView - Add 'scrollToItem' method and its test cases.
2015-09-09 10:29:18 +09:00
2599271410
ListView - Add APIs which return the closest item in specific position in current view.
2015-09-09 10:29:17 +09:00
211dde38e9
Fix improper touch intercept event propagation.
...
When the container widget is disabled, it shouldn't intercept touch.
https://github.com/cocos2d/cocos2d-x/issues/8316
2015-08-06 22:50:53 +08:00
e1d4d22353
Fixed #12692 : UILayout viewing area cutting position calculation error
2015-07-29 18:43:11 +08:00
e4cad50c2f
fix tons of warnings
2015-07-15 12:04:48 +08:00
3ab4285960
Refactor code
2015-07-04 16:06:05 +09:00
60190a1be6
changed csb names in ccs-res to shorter
2015-05-14 18:08:37 +08:00
23b0d4d2f6
more fixes with the namespaces
2015-04-08 21:23:47 -07:00
51374eb822
tests compiles on xcode 6.3
...
no more USING_NS in the header files.
it creates conflict with xcode 6.3
2015-04-08 17:37:30 -07:00
0d51c13743
Make all test cases work fine with new test framework.
2015-04-03 14:31:03 +08:00
7426a32d9f
1. ListView demo compeleted.
...
2. Optimized ListViewReader format.
2014-12-08 19:00:12 +08:00
0dc7bbe861
fix long file path on WP8
2014-10-18 14:48:27 +08:00
ee624e47cc
1. Modifying UIScale9Sprite
...
2. Updating UI Test
3. Updatding resource of ActionTimeline
2014-10-10 10:44:16 +08:00
6cff8cb564
fixed warn and replace NULL with nullptr.
2014-07-10 00:45:27 +08:00
21b11cc3c6
add switch method to LoadingBar, ListView , pageView and scrollView
2014-07-02 10:00:34 +08:00
a4bd3879ac
fix ListView addChild problem
2014-06-25 16:17:16 +08:00
199ad9c623
issue #5161 , replace deprecated methods
2014-06-24 10:18:01 +08:00
312ab4f396
Merge branch 'v3' into feature5161
...
Conflicts:
cocos/editor-support/cocostudio/CCSGUIReader.cpp
cocos/editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.cpp
cocos/editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.cpp
cocos/editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.cpp
cocos/editor-support/cocostudio/WidgetReader/WidgetReader.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp
2014-06-24 09:51:18 +08:00
7eae7625c1
Merge branch 'v3' into cleanupBinaryLoader
2014-06-23 18:30:03 +08:00
e72d89ba2f
fix windows tests compile error
2014-06-23 15:21:25 +08:00
c9bcbfb265
fix addEventListener hidden problem
2014-06-23 12:09:49 +08:00
5f5b705bee
refactor setSize to setContentSize and deprecated the old interface
2014-06-20 14:03:33 +08:00
4ca184b58a
issue #5161 , deprecated getSize
2014-06-20 11:18:53 +08:00
f614e9a89b
fix tests
2014-06-18 15:06:45 +08:00
3dc6e86c25
add binary file parsing into ui tests
2014-06-05 10:25:45 +08:00
1165ba8bc3
issue #5176 , readd addChild methods into UIListView
2014-05-22 17:49:19 +08:00
dc711643cd
Squashed commit of the following:
...
commit a9572b8913f3a38b59adbd7b4017ab9848a6b2b5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed May 14 10:03:44 2014 -0700
math renames
`Vector2` -> `Vec2`
`Vector3` -> `Vec3`
`Vector4` -> `Vec4`
`Matrix` -> `Mat4`
commit 4e107f4bd854c26bfceb52b063d6bd9cea02d6a3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:24:28 2014 -0700
raw version of rename Vector3
commit 1d115573ebe96a5fc815fa44fbe6417ea7dba841
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:07:14 2014 -0700
rename Vector2 after merge
commit ab2ed58c129dbc30a4c0970ed94568c5d271657b
Merge: 1978d2d 86fb75a
2014-05-14 10:07:09 -07:00
74ac5d1d5a
issue #5057 , refactor UIScrollView
2014-05-12 11:08:10 +08:00
7f15a14d55
issue #5057 , refactor LoadingBar
2014-05-12 10:12:22 +08:00
43eb75fb1a
issue #5057 , refactor Listview
2014-05-12 09:51:23 +08:00
57ce0ee2cf
issue #5057 , refactor addTouchEventListener to std::function<>
2014-05-09 14:30:39 +08:00
898a66131a
issue #5056 . move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
leeda