Huabing.Xu
071cbc7565
migrate setPosition to Vector2
2014-04-15 16:16:14 +08:00
Huabing.Xu
ec5398e7c6
Merge branch 'develop' into develop_migrate_math_lib_merge
...
Conflicts:
tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.h
2014-04-14 14:08:19 +08:00
James Chen
b715a87791
Memory leak fix in macro IMPLEMENT_CLASS_INFO
2014-04-12 12:58:00 +08:00
Huabing.Xu
866c4ad735
remove kmMat4 in Armature
2014-04-11 17:25:28 +08:00
Huabing.Xu
1670e07300
Merge branch 'develop' into develop_migrate_math_lib_merge
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
build/cocos2d_tests.xcodeproj/project.pbxproj
2014-04-11 11:18:13 +08:00
James Chen
443195df40
Merge pull request #6123 from ololomax/patch-1
...
set _node to null in createNodeWithSceneFile
2014-04-10 17:05:45 +08:00
James Chen
efb443dea0
Merge pull request #6200 from dumganhar/iss4729-deprecated-folder
...
issue #4729 : Move deprecated stuff to deprecated folder
2014-04-10 11:17:21 +08:00
Huabing.Xu
231cdcb906
adjust comment message
2014-04-10 11:14:46 +08:00
Dhilan007
390685ae93
Label:Change setter of system font name.
2014-04-10 10:23:00 +08:00
James Chen
364fc4722a
issue #4729 : Updates CCInputDelegate.h
2014-04-10 00:52:41 +08:00
James Chen
5615717617
issue #4729 : NULL -> nullptr in constructor or setXXX(NULL)
2014-04-10 00:36:43 +08:00
James Chen
377086d67a
issue #4729 : don't use 'using namespace std;'
2014-04-10 00:36:42 +08:00
Dhilan007
05b8123803
Label:Makes the create functions of Label just do one thing.
2014-04-09 23:31:05 +08:00
Dhilan007
67652357e1
1.Makes the create functions of Label clear.
2014-04-09 21:35:08 +08:00
Huabing.Xu
a269ac2864
remove kmMat4 interface in cocostudio and UI
2014-04-09 14:44:54 +08:00
Huabing.Xu
409b696bab
remove kmMat4 interface in class Node
2014-04-08 23:05:33 +08:00
Huabing.Xu
3837c23ebe
draw() using Matrix instead of kmMat4
2014-04-08 22:07:35 +08:00
Huabing.Xu
b9af100493
visit() using Matrix instead of kmMat4
2014-04-08 21:45:54 +08:00
Huabing.Xu
29c345bd02
Merge branch 'develop' into develop_migrate_math_lib_merge
2014-04-04 18:45:21 +08:00
Huabing.Xu
5d70170a4b
getNodetoParentTransform getNodeToWorldTransform return Matrix instead of kmMat4
2014-04-04 18:41:29 +08:00
James Chen
541d4dea0c
Merge pull request #6105 from andyque/feature3636
...
Added create functions with parameters for all ui controls
2014-04-04 18:34:59 +08:00
Huabing.Xu
6b4451482f
remove matrixToKmMat4 function
2014-04-04 18:13:10 +08:00
andyque
e346ed3559
closed #4636 . done
2014-04-04 17:38:58 +08:00
andyque
e20b3d8eb8
issue #4636 . refactor SliderReader
2014-04-04 17:35:15 +08:00
Huabing.Xu
f1b1678900
Director::getMatrix returns Matrix instead of kmMat4
2014-04-04 17:31:21 +08:00
andyque
af5fe04480
issue #4636 . refactor LoadingBarReader
2014-04-04 17:25:20 +08:00
andyque
a4e0c1a6e2
issue #4636 . refactor LayoutReader
2014-04-04 17:21:23 +08:00
andyque
3482815e69
issue #4636 . refactor ImageViewReader
2014-04-04 17:18:24 +08:00
andyque
c252aa5a55
issue #4636 . refactor CheckBoxReader
2014-04-04 17:12:47 +08:00
andyque
77aee27f05
issue #4636 . refactor ButtonReader
2014-04-04 16:51:07 +08:00
andyque
51404500b7
issue #4636 . fixed WidgetReader error
2014-04-04 16:24:54 +08:00
andyque
ec83b3db04
issue #4636 . fix ButtonReader
2014-04-04 15:21:28 +08:00
Huabing.Xu
f9405e0ea9
Merge branch 'develop' into develop_migrate_math_lib_merge
2014-04-03 17:47:16 +08:00
Huabing.Xu
67e62ce73d
readied director::getMatrix again. remove kmGLgetMatrix
2014-04-03 17:26:06 +08:00
yinkaile
66e37cf481
remove cc prefix
2014-04-03 16:19:49 +08:00
Huabing.Xu
960ac300d5
migrate cocostudio to director matrix stack
2014-04-03 14:55:55 +08:00
yinkaile
eda2d0927c
Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop
2014-04-03 10:37:13 +08:00
yinkaile
7177866331
fixed set blend func
2014-04-03 10:34:20 +08:00
ololomax
e03ef10809
set _node to null in createNodeWithSceneFile
...
_node was being set to null only in constructor, so when we call method createNodeWithSceneFile with path to existing file and then call it again with path to missing file (not calling destroyInstance method), it returns a pointer to previously created node, what may lead to a crash.
2014-04-03 03:06:08 +03:00
Huabing.Xu
49de7511f5
migrate Vertex3f to Vector3
2014-04-02 15:06:16 +08:00
minggo
98ed579b34
Merge pull request #6052 from pipu/develop_pipu_fixedbugsforeditor_1301
...
Fixed bugs for Editor
2014-03-31 15:37:45 +08:00
Dale Stammen
31150ce189
added wp8 support files and projects
2014-03-28 12:55:40 -07:00
pipu
733b364b51
Fixed bugs for Editor
2014-03-28 18:54:06 +08:00
Dhilan007
fd5a4acddb
Remove the old implementation of LabelBMFont.
2014-03-28 10:28:44 +08:00
zhangcheng
f564c4e34a
1. Spirte -> Sprite.
...
2. _EMPTYNODE -> EMPTY_NODE.
2014-03-26 17:55:35 +08:00
zhangcheng
c1ff610277
use capital letters for enum.
2014-03-26 17:21:09 +08:00
zhangcheng
1e6b9f7d9f
remove isRenderer.
2014-03-26 17:02:37 +08:00
zhangcheng
58a61d94fb
add use CCComRender as parent for attaching component
2014-03-26 16:39:32 +08:00
minggo
a374241f65
Merge pull request #5924 from MSOpenTech/wp8-3.0-cocos2d-changes
...
Windows Phone 8,0 cocos2d-x 3.0 changes
2014-03-26 13:58:46 +08:00
James Chen
f6c6d428ad
Merge pull request #5926 from andyque/fix_tests_warnings
...
issue #4401 , remove warnings under win32
2014-03-25 18:17:42 +08:00