andyque
|
5515c43bb2
|
improve lasers
|
2014-06-11 15:16:08 +08:00 |
|
andyque
|
b895018765
|
update parser
|
2014-06-11 09:35:24 +08:00 |
|
andyque
|
c96a6086c3
|
improve parsing code
|
2014-06-05 11:43:43 +08:00 |
|
andyque
|
8690122c96
|
add version 300 parsing code in widget reader
|
2014-06-05 10:25:08 +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
|
a0a4df5ac5
|
closed #5118, remove WidgetType and refactor LayoutType to Type
|
2014-05-12 18:00:54 +08:00 |
|
andyque
|
09a53e7b03
|
issue #5057, refactor BackGroundColorType
|
2014-05-09 17:05:36 +08:00 |
|
andyque
|
e8e0d007bd
|
issue #5057, refactor LayoutType
|
2014-05-09 16:49:00 +08:00 |
|
andyque
|
6a7277c38f
|
issue #5057, refactor TextureResType to strong typed enum
|
2014-05-09 14:56:05 +08:00 |
|
James Chen
|
aa04176d83
|
Merge pull request #6386 from pipu/fixed_bug_ui_layout_clip
fixed the clipping of ui layout read from CocoStudio could not work
|
2014-04-28 11:08:40 +08:00 |
|
pipu
|
c492f4d3c3
|
fixed ui layout clip
|
2014-04-28 10:06:11 +08:00 |
|
Huabing.Xu
|
63b52dd287
|
replace Point with Vector2 in cocos folder cpp file
|
2014-04-15 18:13:57 +08:00 |
|
andyque
|
a4e0c1a6e2
|
issue #4636. refactor LayoutReader
|
2014-04-04 17:21:23 +08:00 |
|
andyque
|
51404500b7
|
issue #4636. fixed WidgetReader error
|
2014-04-04 16:24:54 +08:00 |
|
pipu
|
733b364b51
|
Fixed bugs for Editor
|
2014-03-28 18:54:06 +08:00 |
|
andyque
|
cbcc1bbbcf
|
let ios project compile correct
|
2014-03-11 18:48:26 +08:00 |
|
CaiWenzhi
|
bd5c11b5ee
|
Modify mk file and solve warnings
|
2014-03-06 16:15:03 +08:00 |
|
CaiWenzhi
|
4a2dc4a607
|
Add custom widget and reader
|
2014-03-04 16:51:35 +08:00 |