Dhilan007
|
6cff8cb564
|
fixed warn and replace NULL with nullptr.
|
2014-07-10 00:45:27 +08:00 |
zhangcheng
|
02c7c93e43
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into OpBinaryParse
|
2014-07-01 16:36:37 +08:00 |
zhangcheng
|
4b8f818a1d
|
1、Update binary parse lib.
|
2014-07-01 16:31:17 +08:00 |
andyque
|
d06ca0e75d
|
fix gui reader
|
2014-06-26 17:29:07 +08:00 |
andyque
|
8a463e7964
|
remove Hungry style
|
2014-06-23 10:02:09 +08:00 |
andyque
|
5624da5448
|
Merge branch 'v3' into cleanupBinaryLoader
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/editor-support/cocostudio/CCSGUIReader.h
cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.filters
|
2014-06-23 09:37:39 +08:00 |
andyque
|
9398395de8
|
fix custom property
|
2014-06-18 16:19:24 +08:00 |
andyque
|
1533374bd1
|
add ui animation for binary parsing
|
2014-06-18 15:55:01 +08:00 |
andyque
|
aa5df68b96
|
Merge branch 'v3' into cleanupBinaryLoader
Conflicts:
cocos/3d/CCAnimationCurve.h
cocos/3d/CCAnimationCurve.inl
|
2014-06-18 15:13:34 +08:00 |
2youyou2
|
aa06fab776
|
support relative path for reading json
|
2014-06-11 21:11:22 +08:00 |
andyque
|
5515c43bb2
|
improve lasers
|
2014-06-11 15:16:08 +08:00 |
andyque
|
f50263402a
|
improve parser
|
2014-06-11 14:56:12 +08:00 |
andyque
|
2f6f1b7151
|
improve binary format
|
2014-06-11 14:45:35 +08:00 |
andyque
|
7a8f27ee0b
|
remove unused parser code
|
2014-06-11 14:15:34 +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 |
andyque
|
54e93f6c41
|
fix ObjectFactory refactor issue
|
2014-06-04 14:56:34 +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
|
437b30487c
|
issue #5110, refactor UITextBMFont
|
2014-05-14 16:02:31 +08:00 |
andyque
|
e6889dca36
|
issue #5110, refactor UIText
|
2014-05-14 15:26:14 +08:00 |
andyque
|
08801c035e
|
issue #5110. refactor UILoadingBar, remove unneeded deprecats
|
2014-05-14 10:48:16 +08:00 |
andyque
|
c2f7c10f1c
|
closed #5118, refactor, improving variable name
|
2014-05-13 09:56:10 +08:00 |
andyque
|
ebffc66a83
|
closed #5118, fix CCSGUIReader setAnchorPoint
|
2014-05-12 18:07:13 +08:00 |
andyque
|
a0a4df5ac5
|
closed #5118, remove WidgetType and refactor LayoutType to Type
|
2014-05-12 18:00:54 +08:00 |
andyque
|
74ac5d1d5a
|
issue #5057, refactor UIScrollView
|
2014-05-12 11:08:10 +08:00 |
andyque
|
77a463bac3
|
issue #5057, refactor UIPageView
|
2014-05-12 10:31:52 +08:00 |
andyque
|
43eb75fb1a
|
issue #5057, refactor Listview
|
2014-05-12 09:51:23 +08:00 |
andyque
|
e1fe26543d
|
issue #5057, refactor & remove deprecated warnings
|
2014-05-09 18:37:22 +08:00 |
andyque
|
264769f814
|
issue #5057, refactor LinearGravity
|
2014-05-09 17:54:25 +08:00 |
andyque
|
09a53e7b03
|
issue #5057, refactor BackGroundColorType
|
2014-05-09 17:05:36 +08:00 |
andyque
|
c5a505ec4c
|
issue #5057, Merge branch 'v3' into refactor5057
Conflicts:
cocos/ui/CocosGUI.h
|
2014-05-09 15:39:02 +08:00 |
andyque
|
762e8d9249
|
issue #5057, refactor WidgetType to strong typed enum
|
2014-05-09 15:16:33 +08:00 |
andyque
|
1d7726133c
|
issue #5057, refactor enum SizeType to strong typed enum
|
2014-05-09 09:37:51 +08:00 |
andyque
|
3ef1facfb0
|
issue #5057, replace deprecated enum with strong typed enum
|
2014-05-09 09:29:07 +08:00 |
andyque
|
fd362d2ace
|
issue #5057. deprcated PositionType and make a new enum class instead
|
2014-05-08 18:25:49 +08:00 |
CaiWenzhi
|
a562f19880
|
Fixed bug of guireader
|
2014-05-08 15:15:09 +08:00 |
Huabing.Xu
|
adcacbf5eb
|
Merge branch 'develop' into develop_migrate_math_lib_merge
Conflicts:
cocos/2d/CCLabelAtlas.cpp
cocos/2d/CCLabelAtlas.h
cocos/2d/CCLabelBMFont.cpp
cocos/2d/CCLabelBMFont.h
cocos/editor-support/cocostudio/CCSGUIReader.cpp
|
2014-04-24 16:58:46 +08:00 |
CaiWenzhi
|
4750e8b417
|
Fixed bug of gui reader
|
2014-04-23 15:02:35 +08:00 |
Huabing.Xu
|
e74f8719cf
|
fix warning in compiling
|
2014-04-21 09:52:59 +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
|
63b52dd287
|
replace Point with Vector2 in cocos folder cpp file
|
2014-04-15 18:13:57 +08:00 |
James Chen
|
177bf4df9d
|
Some warning fixes.
|
2014-03-14 15:38:43 +08:00 |
CaiWenzhi
|
4d99736e4a
|
Merge branch 'develop' into develop_nutty_modify_framework_for315CrashFixed
|
2014-03-12 17:06:48 +08:00 |
CaiWenzhi
|
f2c483876a
|
Fixed bug of guireader
|
2014-03-12 10:07:55 +08:00 |
andyque
|
cbcc1bbbcf
|
let ios project compile correct
|
2014-03-11 18:48:26 +08:00 |
CaiWenzhi
|
ab47cafb31
|
Merge branch 'develop' into develop_nutty_modify_framework_for315
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/gui/UIButton.cpp
cocos/gui/UIButton.h
cocos/gui/UIWidget.h
|
2014-03-05 16:52:31 +08:00 |
James Chen
|
8e28400725
|
Some warning fixes in cpp-tests.
|
2014-03-05 15:04:47 +08:00 |
CaiWenzhi
|
4a2dc4a607
|
Add custom widget and reader
|
2014-03-04 16:51:35 +08:00 |