leeda
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
CocosRobot
d07794052f
Update license to 2017 ( #17362 )
...
* Typo: CopyRight -> Copyright
* Copyright update: chukong-inc.com -> Chukong Technologies Inc.
* [js files] Copyright update: 2014 -> 2014-2017
* [cpp files] Copyright update: 2014 -> 2014-2017
* Copyright update: 2015 -> 2015-2017
* [js files] Copyright update: 2014 -> 2014-2017
* Copyright update: 2016 -> 2016-2017
* Copyright update: 2013 -> 2013-2017
* Copyright update: 201?-201? -> 201?-2017
* License year fixes.
* Liscene year fix in CCRay.cpp
* Updates license years in CCGLProgramState.h & CCGLProgramStateCache.h
2017-02-14 14:36:57 +08:00
Ricardo Quesada
2e0881e284
Scale9Sprite / Slider / LoadingBar fixes ( #16949 )
...
* WIP
* loadingbar issues fixed
* fixes clone in slider
* slider bug fixes
* slider: sets texturesize correclty before seting capsInsets
* sprite: scale9 avoid negativa values
* yeah! works!
* cloneIn -> copyTo
* restore xcode team: none
* fixes issue #16924
* correct issue number
* yeah! fixes issue #16928 and #16930
2016-12-03 07:35:22 -08:00
James Chen
b135d512d2
Update copyright to 2016. ( #16311 )
2016-08-05 09:42:15 +08:00
zilongshanren
2a2f184449
refine code with DRY.
2015-12-23 14:43:25 +08:00
zilongshanren
847094ec7d
ui::loadingBar -> add flip logic back
2015-12-23 14:34:36 +08:00
zilongshanren
ab77e8c520
Revert "loading bar use new scale9 feature"
...
This reverts commit a671bf7ce9
.
2015-12-22 19:53:24 +08:00
Liam
8bf7908e93
fix loadingbar direction changed error
2015-12-19 15:59:27 +08:00
zilongshanren
838bd242ce
fix #12249
2015-12-14 11:53:09 +08:00
zilongshanren
bb515dce58
fix issue 12249
2015-12-09 17:15:09 +08:00
zilongshanren
a671bf7ce9
loading bar use new scale9 feature
2015-12-09 10:41:31 +08:00
mogemimi
745f54b421
Replace 'ResouceData' with 'ResourceData'
2015-12-05 18:59:54 +09:00
XiaoFeng
6fb65b5610
Editing code as comment.
...
Move CocosStudioExtension path and update related files.
2015-12-04 10:43:39 +08:00
XiaoFeng
bb83fe4596
Combine Studio change for UI components
2015-11-18 13:38:29 +08:00
dimon4eg
ec20b48775
fix crash in LoadingBar
2015-09-30 13:04:13 +03:00
andyque
1954f6c55c
fix enum class wrong indentation
2015-06-05 17:23:32 +08:00
andyque
6390f063fe
optimize UILoadingBar memory usage
2015-06-05 15:57:39 +08:00
andyque
0e67cfcbff
improve loading Bar Test
2015-01-26 14:39:44 +08:00
andyque
fdbf84a118
add uploading switch scale9 tests
2015-01-26 13:49:54 +08:00
Liam
902fba0638
fix slider and loadingbar scale9 error
2015-01-20 20:57:54 +08:00
Liam
a42d213d16
update for ui object scale9 state refresh
2015-01-20 17:24:04 +08:00
andyque
b11e3d74cc
restrict capInsets of ui::ImageView, ui::Slider and ui::LoadinbBar
2014-12-17 16:46:48 +08:00
minggo
d9953d4aac
Merge pull request #9519 from andyque/addNewRequirements
...
refactor Button restrict capInsetSize logic and cleanup ui coding style
2014-12-17 09:53:31 +08:00
andyque
16cf396ed7
refactor Button restrict capInsetSize logic and cleanup ui coding style
2014-12-16 16:44:04 +08:00
andyque
989c05cd2d
add TextureResType to LoadingBar
2014-12-10 10:21:17 +08:00
andyque
1bb60ab4bb
add null pointer check, make code more robust
2014-11-27 18:25:13 +08:00
Haneol Park
a6e4b31b0d
Additional unnecessary set dirty of ui widgets
2014-11-25 20:42:03 +09:00
Haneol Park
d25fdca4af
Unnecessary set dirty of ui widget
2014-11-25 17:50:46 +09:00
andyque
5483bc834d
fix scale9sprite flip issue
2014-11-07 11:09:22 +08:00
pipu
29eb552d00
1. Modifying ButtonReader
...
2. Modifying UILoadingBar
3. Reverting UIScale9Sprite
2014-10-11 15:35:09 +08:00
pipu
752eb839c7
Add protocolbuf.a
2014-10-09 18:28:09 +08:00
andyque
294271682b
change return const value to value
2014-09-12 14:39:22 +08:00
andyque
ed22792a72
fix text only button issue
2014-09-12 13:50:13 +08:00
minggo
6a8270f33b
Merge pull request #7900 from minggo/setposition-optimize
...
not create Vec as possible for setting position
2014-08-28 14:31:54 +08:00
minggo
9fb977ff99
not create Vec as possible for setting position
2014-08-28 11:41:18 +08:00
Ricardo Quesada
3dda35b4ef
Adds `std::nothrow` to `new`
...
Since cocos2d-x doesn't support exceptions, it is important to add
`std::nothrow` to all the `new` statements
2014-08-27 16:31:57 -07:00
andyque
cdb2b9f59f
fixed Widget's Children reload textures change RGBA issue
2014-08-11 15:04:00 +08:00
andyque
d00e3349a3
fixed loadingBar change direction affect position issue
2014-08-08 11:17:17 +08:00
andyque
7bcb31f225
refactor loadingBar
2014-07-30 16:08:29 +08:00
andyque
1daaea1410
remove extension::Scale9Sprite dependency
2014-07-29 16:24:27 +08:00
andyque
2a2184331e
fix opacity issue when replace Widget textures
2014-07-08 11:30:27 +08:00
andyque
585ccf2c71
issue #5161 , replace all _size to _contentSize
2014-06-20 10:40:16 +08:00
andyque
3c80fe53d3
refactor LoadingBar setColor & setOpacity
2014-06-06 16:03:59 +08:00
andyque
38e274de73
refact ui header file include
2014-06-04 14:56:33 +08:00
andyque
78ac4b4d86
add constness to UILoadingBar
2014-05-27 11:30:35 +08:00
Ricardo Quesada
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
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:05:30 2014 -0700
Merge branch 'v3' into v3_renameMathClassName
Conflicts:
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.cpp
commit 1978d2d174877172ccddc083020a1bbf43ad3b39
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 08:51:45 2014 -0700
rename vector2 in tests/cpp-empty-test folder
commit d4e0ff13dcce62724d2fece656543f26aa28e467
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:58:23 2014 -0700
rename vector2 in tests/cpp-tests cpp files
commit be50ca2ec75e0fd32a6fcdaa15fe1ebb4cafe79f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:52:57 2014 -0700
rename vector2 in tests/cpp-tests head files
commit 6daef564400d4e28c4ce20859a68e0f583fed125
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:49:48 2014 -0700
rename vector2 in extension folder
commit 8f3f0f65ceea92c9e7a0d87ab54e62220c5572e2
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:47:22 2014 -0700
rename vector2 in cocos/2d cpp files
commit e1f3105aae06d595661a3030f519f7cc13aefbed
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:44:39 2014 -0700
rename vector2 in cocos/2d head files
commit 6708d890bfe486109120c3cd4b9fe5c078b7108f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:40:59 2014 -0700
rename vector2 in cocos/base folder
commit d3978fa5447c31ea2f3ece5469b7e746dfba4248
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:40:43 2014 -0700
rename vector2 in cocos/deprecated folder
commit 4bff45139363d6b9706edbbcf9f322d48b4fd019
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:40:26 2014 -0700
rename vector2 in cocos/editor-support folder
commit 353d244c995f8b5d14f635c52aed8bc5e5fc1a6f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:36:48 2014 -0700
rename vector2 in cocos/ui folder
commit 758b8f4d513084b9922d7242e9b8f2c7f316de6c
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:32:39 2014 -0700
rename vector2 in cocos/renderer folder
commit 0bd2710dd8714cecb993880bc37affd9ecb05c27
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:32:15 2014 -0700
rename vector2 in cocos/physics folder
commit b7f0581c4587348bdbc1478d5374c2325735f21d
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:25:01 2014 -0700
rename vector2 in cocos/math folder
commit a8631a8e1a4e2740807ccd9be9d70de6ecaad7dd
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:16:55 2014 -0700
rename Vector2 to Vec2
deprecate typedef Vector2
2014-05-14 10:07:09 -07:00
andyque
6cb3b47488
closed #5110 , refactor
2014-05-14 17:07:24 +08:00
andyque
08801c035e
issue #5110 . refactor UILoadingBar, remove unneeded deprecats
2014-05-14 10:48:16 +08:00
andyque
7049fd253d
closed #5121 , add const to getPercent method
2014-05-13 12:06:28 +08:00
andyque
7db02fc0e9
closed #5121 , change percentage from int to float
2014-05-13 10:34:08 +08:00