andyque
|
cfa0342618
|
Merge branch 'v3' into issue5005
Conflicts:
cocos/ui/UIWidget.cpp
|
2014-05-15 11:03:03 +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
|
09fce798f0
|
closed #5110, add const reference to typedef
|
2014-05-14 16:14:28 +08:00 |
andyque
|
df86b07f15
|
closed #5005, refactor
|
2014-05-14 09:23:56 +08:00 |
andyque
|
2d88c8ea92
|
closed #5005, fix visible and enable issue
|
2014-05-13 16:37:41 +08:00 |
andyque
|
1c47c833c6
|
issue #5005, fixed widget visit method
|
2014-05-13 14:56:44 +08:00 |
andyque
|
810c25b85e
|
Merge branch 'v3' into issue5005
|
2014-05-13 14:52:49 +08:00 |
andyque
|
1a319b3f12
|
issue #5005, deprecated setTouchEnabled
|
2014-05-13 14:52:27 +08:00 |
minggo
|
ccb55448da
|
Merge pull request #6685 from andyque/refactor5118
closed #5118, remove WidgetType and refactor LayoutType to Type
|
2014-05-13 11:35:36 +08:00 |
andyque
|
5e01c61d8b
|
closed #5118, fix indent
|
2014-05-13 10:15:29 +08:00 |
Dale Stammen
|
bad71e38d0
|
fixed for ABSOLUTE and RELATIVE winrt compiler reserved words
|
2014-05-12 09:26:39 -07:00 |
andyque
|
a0a4df5ac5
|
closed #5118, remove WidgetType and refactor LayoutType to Type
|
2014-05-12 18:00:54 +08:00 |
andyque
|
da3e794631
|
issue #5057, convert const char* to std::string&
|
2014-05-12 14:59:00 +08:00 |
andyque
|
e1fe26543d
|
issue #5057, refactor & remove deprecated warnings
|
2014-05-09 18:37:22 +08:00 |
andyque
|
0c0f18e7f3
|
issue #5047, refactor LayoutParameterType
|
2014-05-09 17:38:05 +08:00 |
andyque
|
d12a71f738
|
issue #5057, refactor UILayoutDefine
|
2014-05-09 17:16:11 +08:00 |
andyque
|
f070fc335f
|
issue #5057, refactor BrightStyle to strong typed enum
|
2014-05-09 15:23:34 +08:00 |
andyque
|
762e8d9249
|
issue #5057, refactor WidgetType to strong typed enum
|
2014-05-09 15:16:33 +08:00 |
andyque
|
6a7277c38f
|
issue #5057, refactor TextureResType to strong typed enum
|
2014-05-09 14:56:05 +08:00 |
andyque
|
21e4d05e6e
|
issue #5057, refactor SEL_TouchEvent to std::function
|
2014-05-09 11:28:36 +08:00 |
andyque
|
1d7726133c
|
issue #5057, refactor enum SizeType to strong typed enum
|
2014-05-09 09:37:51 +08:00 |
andyque
|
fd362d2ace
|
issue #5057. deprcated PositionType and make a new enum class instead
|
2014-05-08 18:25:49 +08:00 |
andyque
|
0c2fd977ea
|
issue #5057. add UIDeprecated.h and refactor FocusDirection to inner class of
Widget and also simplify the enum value
|
2014-05-08 18:10:21 +08:00 |
andyque
|
05b7d274c8
|
issue #4861. fix distance calculation
|
2014-05-07 18:27:05 +08:00 |
andyque
|
def0505ba7
|
closed #4861, refactor
|
2014-05-07 14:26:41 +08:00 |
andyque
|
1282252c25
|
closed #4861, refactor
|
2014-05-07 14:06:44 +08:00 |
andyque
|
ef70c684de
|
issue #4861, add requestFocus method and the layout current can get focus
|
2014-05-07 10:23:57 +08:00 |
andyque
|
a15dd55baa
|
closed #3861, fixed some typo and indent problem
|
2014-05-06 12:04:52 +08:00 |
andyque
|
9383900123
|
issue #4861. cleanup some code of UILayout and UIWidget
|
2014-05-05 11:37:39 +08:00 |
andyque
|
b35ddfe5b5
|
issue #4861, add focus functionality into Widget class
|
2014-05-05 11:37:38 +08:00 |
andyque
|
1dee81a166
|
issue #4861, refactor setFocused into setHilighted
|
2014-05-05 11:37:38 +08:00 |
Huabing.Xu
|
3b83d52f95
|
Merge branch 'develop' into develop_migrate_math_lib_merge
Conflicts:
cocos/ui/UIButton.cpp
cocos/ui/UIButton.h
cocos/ui/UICheckBox.cpp
cocos/ui/UICheckBox.h
cocos/ui/UIImageView.cpp
cocos/ui/UIImageView.h
cocos/ui/UILayout.cpp
cocos/ui/UILayout.h
cocos/ui/UILoadingBar.cpp
cocos/ui/UIRichText.h
cocos/ui/UISlider.cpp
cocos/ui/UIText.cpp
cocos/ui/UIText.h
cocos/ui/UITextAtlas.cpp
cocos/ui/UITextAtlas.h
cocos/ui/UITextBMFont.cpp
cocos/ui/UITextBMFont.h
cocos/ui/UITextField.cpp
cocos/ui/UITextField.h
cocos/ui/UIWidget.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp
|
2014-04-19 00:30:34 +08:00 |
CaiWenzhi
|
19f6526ef8
|
Widget supports contentsize
|
2014-04-17 14:08:25 +08:00 |
Huabing.Xu
|
e2a24dec84
|
replace Point with Vector2
|
2014-04-15 18:08:29 +08:00 |
Huabing.Xu
|
071cbc7565
|
migrate setPosition to Vector2
|
2014-04-15 16:16:14 +08:00 |
Huabing.Xu
|
b9af100493
|
visit() using Matrix instead of kmMat4
|
2014-04-08 21:45:54 +08:00 |
andyque
|
77aee27f05
|
issue #4636. refactor ButtonReader
|
2014-04-04 16:51:07 +08:00 |
CaiWenzhi
|
2dffcb9808
|
Add ProtectedNode and remove "addNode"
|
2014-03-25 14:28:58 +08:00 |
James Chen
|
f51c39c034
|
closed #3897 : Constructors should be protected, but should be a way to disable them, added CC_CONSTRUCTOR_ACCESS.
Thank @pandamicro.
|
2014-03-21 13:44:29 +08:00 |
CaiWenzhi
|
b8ce59962a
|
Fixed bug of ScrollView
|
2014-03-13 10:11:41 +08:00 |
andyque
|
cbcc1bbbcf
|
let ios project compile correct
|
2014-03-11 18:48:26 +08:00 |