James Chen
9862fab58f
Comments fix in CCRenderTexture.h
2014-05-07 16:37:21 +08:00
andyque
1282252c25
closed #4861 , refactor
2014-05-07 14:06:44 +08:00
andyque
ef44b2687b
closed #4861 , finished focus
2014-05-07 11:40:01 +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
62a66872aa
issue #4861 , fixed some boundary conditions
2014-05-07 10:05:20 +08:00
Ricardo Quesada
db759005e0
Improvements for Attributes and Uniform API
2014-05-06 17:58:14 -07:00
Ricardo Quesada
21dd6fef69
Improves code a little bit
2014-05-06 12:46:35 -07:00
Trace
cf9e8ff0bd
Merge branch 'newV3' into improved_glprogram
...
Conflicts:
cocos/2d/CCGLProgram.cpp
cocos/2d/CCGLProgram.h
2014-05-06 12:07:42 -07:00
Trace
69fd841b30
fix the include error
2014-05-06 11:19:51 -07:00
andyque
9d71ae29b9
issue #4861 . fixed all widget focus diabled bug
2014-05-06 17:28:12 +08:00
andyque
51a704dcc8
issue #4861 , refactor improve nested focus test
2014-05-06 15:11:55 +08:00
andyque
29c57568bf
issue #4861 , add nested focus test
2014-05-06 14:38:45 +08:00
andyque
e52370e1c2
issue #4861 , refactor UIFocusTest, simplify code
2014-05-06 14:20:01 +08:00
andyque
ad4e1f1e2c
issue #4861 , improve UIFocusTest, add click event to ImageView
2014-05-06 14:14:22 +08:00
samuele3hu
0ce2a38f17
Update bindings-generator and `MAX_SUB_TEST_NUMS` for SpritePerformance Test
2014-05-06 13:59:16 +08:00
andyque
cb5b2a4f85
issue #4861 , Merge branch 'v3' into focus3861
...
Conflicts:
build/cocos2d_tests.xcodeproj/project.pbxproj
2014-05-05 17:40:28 +08:00
James Chen
67b2fbf14b
Updates xcode project, add ccs-res folder to Resources folder
2014-05-05 15:24:33 +08:00
andyque
2d0de93baf
issue #4861 , fixed a widget bug and add VBox test
2014-05-05 11:37:40 +08:00
andyque
852191a928
issue #4861 , improve the horizontal layout test
2014-05-05 11:37:39 +08:00
andyque
a7fbd590dc
issue #4861 . add a horizontal focus test
2014-05-05 11:37:39 +08:00
James Chen
8cbcf17163
issue #4674 : Re-added deleted source files.
2014-05-04 14:37:55 +08:00
James Chen
3b3c1c4dbb
issue #4674 : Removed large files and updated .gitignore
2014-05-04 14:36:16 +08:00
Ricardo Quesada
207e67318d
rolling back tests
2014-05-01 16:55:28 -07:00
Ricardo Quesada
b5f513ce16
Merge branch 'v3' into improved_directory_structure
2014-04-30 13:15:10 -07:00
Huabing.Xu
16105df503
getNormalize->getNormalized
2014-05-01 01:10:18 +08:00
Huabing.Xu
c722b74e36
Merge branch 'v3' into v3_refactor_normalize
2014-04-30 20:08:37 +08:00
Huabing.Xu
ea4fee2c31
refactor normalize in Vector2
2014-04-30 18:07:05 +08:00
Ricardo Quesada
8bb8416c26
Improved directory structure
2014-04-29 17:37:36 -07:00
Huabing.Xu
bd93a5cb76
fix bug for renderTexture created which is bigger than screen size
2014-04-29 15:08:44 +08:00
Ricardo Quesada
81c2d92355
yeah... love in includes
...
<3
2014-04-26 10:35:57 -07:00
Ricardo Quesada
9b118e5e96
Squashed commit of the following:
...
commit 519fcd7f68e3586c376fd5e8d4a0ee220a48d225
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 10:10:06 2014 -0700
Updates templates files
commit 2b07843ebe592f56b2abc544ccf66d441bb19fc5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 10:08:19 2014 -0700
compiles on Windows
commit b175522ef7205eaab3bd3f26c27c5d6514cbe2a4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:55:30 2014 -0700
adds cocos2d.h
commit 4c3d14f929bac017b93ca843b4f149d352264a30
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:54:24 2014 -0700
re-adds missing files
commit f729181728959260d14c4152555534f5beec8e05
Merge: 148da79 2adac67
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:51:12 2014 -0700
Merge branch 'includes_fixes' of github.com:ricardoquesada/cocos2d-x into includes_fixes
commit 148da79010c5dffeab885933624cffaf3d588852
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:49:12 2014 -0700
Adds SimpleAudioEngine
commit 2adac67019180ec82b7bd03f0b67c12f62e29e77
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:47:45 2014 -0700
Compiles for Android
commit 4a300d1b9225fa5708f25a69a50bb531f0ac1a32
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:13:35 2014 -0700
Fixes the includes
2014-04-26 10:11:22 -07:00
Huabing.Xu
feec24e3ef
Merge branch 'v3' into develop_migrate_math_lib_merge
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/2d/CCNode.cpp
cocos/2d/CCRenderTexture.cpp
cocos/2d/platform/wp8/CCGLView.h
cocos/physics/CCPhysicsBody.cpp
extensions/physics-nodes/CCPhysicsSprite.cpp
extensions/physics-nodes/CCPhysicsSprite.h
tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp
2014-04-25 16:20:24 +08:00
James Chen
828401a23d
Merge pull request #6302 from zifter/FixParticle
...
closed #4880 : Particle systems loading incorrectly in CocosBuilder
2014-04-25 14:15:44 +08:00
James Chen
06d9187783
Merge pull request #6270 from andyque/feature4783
...
closed #4783 , add outline shader files
2014-04-25 13:50:44 +08:00
James Chen
037c57ef96
Merge branch 'develop' into perf-callback
...
Conflicts:
build/cocos2d_tests.xcodeproj/project.pbxproj
2014-04-25 12:07:48 +08:00
James Chen
cd6fe294b8
Merge pull request #6288 from boyu0/bug4771_move_physicsworld_2_layer
...
closed #4771 : Move PhysicsWorld to Layer
2014-04-25 11:52:32 +08:00
James Chen
328408d792
Merge pull request #6263 from Mazyod/develop-cpp11-http-client
...
closed #4702 : Update HTTPClient to use C++11 callbacks
2014-04-25 11:06:06 +08:00
James Chen
477fc9f0e0
Merge commit 'refs/pull/6012/head' of git://github.com/cocos2d/cocos2d-x into pull/6012
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-04-25 10:59:11 +08:00
James Chen
7beb8b78fe
Merge pull request #6325 from MSOpenTech/wp8-3.0-update
...
Wp8 3.0 update:
Background texture is now correctly oriented in Transition Effects
Accelerometer now works for WP8. Refactor of InputEvents was required to support adding Accelerometer event to rendering queue.
Console support for WP8.
Fixed cpp template for WP8. Added missing projects. Fixed property sheets.
Updates precompiled shaders
2014-04-25 10:41:58 +08:00
Huabing.Xu
c2da6727be
fix compile warning after merge
2014-04-24 17:00:28 +08:00
Huabing.Xu
f65973d9f0
Merge branch 'develop' into develop_migrate_math_lib_merge
...
Conflicts:
cocos/2d/CCActionInterval.cpp
cocos/2d/CCLabelAtlas.cpp
cocos/2d/CCLabelBMFont.cpp
tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.cpp
2014-04-23 14:46:14 +08:00
Huabing.Xu
560d24545a
3.0hotfix: Node: Clipping->RawStencilTest4-6
2014-04-22 10:58:42 +08:00
Huabing.Xu
7a38050e09
Merge branch 'develop' into develop_migrate_math_lib_merge
2014-04-21 17:47:34 +08:00
zhangbin
440702aa06
Enable depth test in test case : TilemapTest->TMXOrthoVertexZ.
2014-04-21 15:26:57 +08:00
boyu0
710fe9d940
closed #4771 : modify test.
2014-04-21 13:32:47 +08:00
James Chen
a75432ec35
Merge pull request #6262 from Mazyod/develop-editbox-mac-enhancements
...
Mac Editbox Text Font and Placeholder features
2014-04-21 11:18:07 +08:00
Dale Stammen
467ededeff
enabled console for wp8
2014-04-19 10:08:01 -07: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
minggo
d8d847bd65
Merge pull request #6319 from boyu0/bug4903_build_libcurl_with_openssl
...
closed #4903 : Build libcurl.a with openssl
2014-04-18 17:10:53 +08:00
boyu0
9756709473
closed #4903 : change HttpClientTest get test 3 to https protocol.
2014-04-18 17:03:06 +08:00
CaiWenzhi
ed4fcd5d1a
Merge branch 'develop' into develop_nutty_modifylayout_add_Boxes
2014-04-17 14:23:08 +08:00
CaiWenzhi
19f6526ef8
Widget supports contentsize
2014-04-17 14:08:25 +08:00
zifter
08d975268d
Fix for issue http://www.cocos2d-x.org/issues/4880 .
2014-04-17 03:15:43 +03:00
Huabing.Xu
718f3b3a57
remove warning message---continue
2014-04-16 10:47:29 +08:00
James Chen
60c1ed28dc
Removes unused enum in PerformaceCallbackTest
2014-04-16 10:41:42 +08:00
James Chen
ec40dda7f3
Adds performance test for callbacks: 1) std::function,
...
2) (target->*selector)(), 3) simulate new api of Scheduler
2014-04-16 10:35:58 +08:00
Huabing.Xu
95cb7721f6
Merge branch 'develop' into develop_migrate_math_lib_merge
...
Conflicts:
cocos/2d/CCSprite.cpp
tests/cpp-tests/Classes/NewRendererTest/NewRendererTest.cpp
2014-04-15 22:21:04 +08:00
Huabing.Xu
7f61639541
replace Point with Vector2 in tests, extension folder
2014-04-15 18:23:40 +08:00
Huabing.Xu
5303f50904
Migrate to Vector2 in DrawPrimitive.h
2014-04-15 17:29:23 +08:00
Huabing.Xu
6686b657a4
Migrate getPostion and correspondent member variable to Vector2
2014-04-15 16:28:59 +08:00
Huabing.Xu
071cbc7565
migrate setPosition to Vector2
2014-04-15 16:16:14 +08:00
boyu0
b53961b78d
issue $4771: fix lua test and fix some bugs
2014-04-15 13:40:44 +08:00
Ricardo Quesada
584ccf65e4
Culling working again
2014-04-14 16:46:19 -07:00
boyu0
c98f50026f
issue $4771: move PhysicsWorld to layer.
2014-04-15 03:21:18 +08:00
Huabing.Xu
a5e900a86b
manually enable depth test in test case TMXIsoVertexZ
2014-04-14 17:06:35 +08:00
minggo
bb15d0ecf9
Merge pull request #6267 from dabingnn/develop_add_culling_enabled_option
...
Add interface setCullingEnabled(), culling is disabled by default
2014-04-14 14:50:11 +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
andyque
87b437dd3a
closed #4783 . replace deprecated function call
2014-04-14 13:48:17 +08:00
andyque
00d2bd833f
closed #4783 . finish the shading effects
2014-04-14 12:03:37 +08:00
andyque
2c1f5da69c
issue #4783 , add outline shader files
2014-04-14 11:52:17 +08:00
Huabing.Xu
d2dd57d412
change indention to space and remove comment code
2014-04-14 11:45:06 +08:00
Huabing.Xu
9935e8ddfb
setCullingEnabled set to public access
...
changed renderer->culling test case
2014-04-14 11:33:40 +08:00
Mazyad Alabduljaleel
40e6288ac7
[NEW]: update HTTPClient to use C++11 callbacks
...
[NEW]: updated tests to use the new API
[DEP]: deprecated old target/selector API
2014-04-13 01:06:04 +04:00
Mazyad Alabduljaleel
8919931a50
small indentation fix
2014-04-13 00:26:38 +04:00
Mazyad Alabduljaleel
b369c24f01
+ [NEW]: setting the font for Editbox text
...
+ [NEW]: setting the font for Editbox placeholder
+ [NEW]: setting the color for Editbox placeholder
+ [NEW]: updated test cases to show the new functionality
2014-04-13 00:19:14 +04:00
James Chen
043f86cd6b
Memory leak fix in SchedulerTest
2014-04-12 12:59:28 +08:00
zhangbin
d611cfb49f
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2014-04-11 20:03:24 +08:00
zhangbin
0eee9bc288
Solve the incorrect effect of some transition test case in lua-tests.
2014-04-11 20:02:11 +08:00
Huabing.Xu
1aa909371d
remove kmMat4 in Cpp-tests
2014-04-11 18:03:07 +08:00
James Chen
b40773f6d0
Merge pull request #6240 from dabingnn/develop_add_rendererAssert
...
Trigger an assert if a command is added while render is rendering.
2014-04-11 17:37:02 +08:00
andyque
280c2755b3
closed #4761 . fix a compile error
2014-04-11 16:47:35 +08:00
andyque
83664e2322
closed #4761 . fix a improve super class function call
2014-04-11 16:34:26 +08:00
andyque
4be149e492
closed #4761 , fix zfighting between tests
2014-04-11 16:30:25 +08:00
Huabing.Xu
51289e8a4c
1. add assert condition of rendering when adding command
...
2. fix bug: renderTexture->SpriteRenderTextureBug
2014-04-11 16:05:22 +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
heliclei
157fce785c
fix CCConsole linux crash
2014-04-10 18:31:28 +08:00
James Chen
5d882cea23
Merge pull request #6213 from koowolf/wp8_fix
...
fix compiler error in wp8
2014-04-10 17:10:08 +08:00
James Chen
9c07ca5722
Merge pull request #6220 from Dhilan007/develop
...
Fixed logical error in TestChangeAnimationInternal::onExit.
2014-04-10 16:54:38 +08:00
koowolf
b5433f05c1
replace LabelTTF with Label
2014-04-10 16:51:25 +08:00
Dhilan007
d583dcc0f0
Fixed logical error in TestChangeAnimationInternal::onExit.
2014-04-10 16:48:51 +08:00
James Chen
8fcf687452
Merge pull request #6216 from Dhilan007/develop
...
Fixed logical error in CameraCenterTest::onExit.
2014-04-10 16:17:10 +08:00
Dhilan007
fce85e08f9
Fixed logical error in CameraCenterTest::onExit.
2014-04-10 16:13:07 +08:00
James Chen
8a66f43f30
closed #4744 : Adds test for issue4744.
2014-04-10 15:31:53 +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
James Chen
ba1f535201
Merge pull request #6199 from Dhilan007/develop_label
...
closed #4743 : Label:Makes the create functions of Label clearer.
2014-04-10 11:15:56 +08:00
Huabing.Xu
5475a0fc02
fix compile error after merge
2014-04-10 10:58:43 +08:00
Huabing.Xu
07ac817a7c
Merge branch 'develop' into develop_migrate_math_lib_merge
2014-04-10 10:52:15 +08:00
Huabing.Xu
d865341694
remove kmMat4 interface in cpp-tests
2014-04-10 10:16:16 +08:00
James Chen
890dd64d38
issue #4729 : some warning fixes and compilation error fixes on win32.
2014-04-10 01:29:13 +08:00
James Chen
5615717617
issue #4729 : NULL -> nullptr in constructor or setXXX(NULL)
2014-04-10 00:36:43 +08:00
minggo
2beed5d398
Merge pull request #6166 from dabingnn/develop_fix_rendererBug
...
Develop fix renderer bug
2014-04-10 00:27:33 +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
zhangbin
43eaccca09
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into issue4703
2014-04-09 13:47:18 +08:00
zhangbin
ddffa3b120
closed #4703 , Solve the incorrect effect of test case : RenderTexture test issue 937.
2014-04-09 13:40:43 +08:00
James Chen
8e428d7321
Merge pull request #6163 from heliclei/fix-autotest
...
fix autotest touch hang:run test scene constructor in cocos thread
2014-04-09 13:28:30 +08:00
Darragh Coy
14b210a082
RefPtr<T> - add move semantics
...
Add support for move semantics to the RefPtr<T> class. Implement a move constructor and a move assignment operator.
2014-04-08 11:34:27 -07: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
e8596094a4
Merge branch 'develop' into develop_migrate_math_lib_merge
2014-04-08 16:58:51 +08:00
shujunqiao
fb777b1a1d
[ci skip], delete ShaderFail sample in ShaderTest.cpp.
2014-04-08 14:52:17 +08:00
shujunqiao
fae742c0b8
modify ShaderTest.cpp not crah to autotest.
2014-04-08 14:32:25 +08:00
heliclei
798708f775
fix autotest touch hang:run test scene constructor in cocos thread
2014-04-08 11:29:42 +08:00
Darragh Coy
bb85df66b1
Add an event dispatcher test
...
Add an event dispatcher test to help reproduce crashes fixed by the previous commit and to verify that the fix still works.
2014-04-07 16:46:03 -07:00
Huabing.Xu
1b0c55ef15
issue #4629 : test case add a spriteInGroup instead of sprite, the sprite can not be seen now
2014-04-07 22:31:24 +08:00
Huabing.Xu
beda294be1
issue #4629 : add test case for group command
2014-04-07 22:02:43 +08:00
Ricardo Quesada
f1a2db9006
Merge pull request #6140 from dumganhar/render-clean
...
Adds `Renderer::clean`, and fixes crash in `PerformanceTest/Node children Test`.
2014-04-04 13:34:29 -07:00
Huabing.Xu
29c345bd02
Merge branch 'develop' into develop_migrate_math_lib_merge
2014-04-04 18:45:21 +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
Huabing.Xu
f1b1678900
Director::getMatrix returns Matrix instead of kmMat4
2014-04-04 17:31:21 +08:00
James Chen
7b4a1308ea
Adds `Renderer::clean`, and fixes crash in `PerformanceTest/Node
...
children Test`.
2014-04-04 12:48:16 +08:00
Huabing.Xu
f9405e0ea9
Merge branch 'develop' into develop_migrate_math_lib_merge
2014-04-03 17:47:16 +08:00
andyque
c501aa2dec
issue #4636 . replace __String with StringUtils::format
2014-04-03 17:42:04 +08:00
Huabing.Xu
67e62ce73d
readied director::getMatrix again. remove kmGLgetMatrix
2014-04-03 17:26:06 +08:00
Huabing.Xu
5e76c6713d
migrate cpp-tests to director matrix stack
2014-04-03 15:59:55 +08:00
andyque
0875b4e51f
closed #4636 . Done
2014-04-03 15:56:45 +08:00
andyque
8996ab1956
issue #4636 , finish refactorying UITextFieldTest
2014-04-03 15:52:42 +08:00
andyque
ed2c38eb98
issue #4636 , finish UITextBMFont
2014-04-03 15:45:06 +08:00
andyque
08bf6c27f4
issue #4636 . finish UITextAtlasTest
2014-04-03 15:38:52 +08:00
andyque
b59beab61a
issue #4636 , finish UISlider
2014-04-03 15:33:57 +08:00
James Chen
f6859a3ca9
closed #4557 : Adds `EventListener::setEnabled/isEnabled`.
2014-04-03 15:32:16 +08:00
andyque
a7a1a6b05b
issue #4636 , finish UIRichTextTest and UIScrollViewTest
2014-04-03 15:22:23 +08:00
andyque
8b9af0e94c
issue #4636 . finish UIPageViewTest
2014-04-03 11:52:35 +08:00
andyque
48429f5738
issue #4636 . finish UILoadingBar
2014-04-03 11:34:06 +08:00
andyque
278e2c3e3b
issue #4636 . finish UIListViewTest
2014-04-03 11:23:12 +08:00
andyque
fe33588038
issue #4636 . finish UILayout
2014-04-03 11:14:35 +08:00
andyque
1a97ebdcb0
issue #4636 . finish UIImageView
2014-04-03 10:42:30 +08:00
andyque
52bdb840ee
issue #4636 . finish UICheckBox
2014-04-03 10:34:20 +08:00
andyque
10134ccc65
issue #4636 . finish button
2014-04-03 10:31:10 +08:00
andyque
0a6b0a4389
issue #4636 . refactor Scale9Sprite
2014-04-03 10:07:47 +08:00
andyque
b27fe6ecc2
issue #4636 . add parameter create method to UITextBMFont
2014-04-03 10:07:46 +08:00
andyque
0b5c10a0fb
issue #4636 . add parameter create method to UITextAtlas
2014-04-03 10:07:46 +08:00
andyque
a03dc76f7d
issue #4636 , add parameter create method for UILoadingBar
2014-04-03 10:07:46 +08:00
andyque
92945715eb
issue #4636 . add parameter create function for UIText
2014-04-03 10:07:46 +08:00
andyque
558abf1a6b
issue #4636 , add parameter create method to UIImageView
2014-04-03 10:07:46 +08:00
andyque
ba9a605568
issue #4636 , add parameter create method to UICheckBox
2014-04-03 10:07:46 +08:00
andyque
1b0583214b
issue #4636 , add parameter create method to UIButton
2014-04-03 10:07:46 +08:00
zhangbin
0e0000e6d5
The projection reset to DEFAULT when a test case onExit().
2014-04-02 17:12:09 +08:00
Huabing.Xu
45b0ba3871
migrate Vertex2f to Vector2(tests)
2014-04-02 15:25:50 +08:00
Huabing.Xu
56aa50617c
migrate Vertex3f to Vector3(Tests)
2014-04-02 15:25:19 +08:00
James Chen
944e752509
fonts/xxx.ttf -> Xxx for old LabelTTF test.
2014-04-01 14:49:02 +08:00
Dhilan007
eadbca8ee7
1.fixed logical error in Label::enableShadow.
...
2.Add test case for shadow and outline take effect at the same time.
2014-04-01 14:15:35 +08:00
minggo
7804fdf0a1
Merge pull request #6078 from boyu0/3.0rc1_test
...
1. Hide CameraTest2. 2. Correct the projection setting, fix camera cente...
2014-04-01 11:23:16 +08:00
boyu0
18b0c041b4
1. Hide CameraTest2. 2. Correct the projection setting, fix camera center test projection.
2014-03-31 18:17:00 +08:00
James Chen
bc5a2ff5db
Merge pull request #6075 from Dhilan007/develop_label
...
fixed warnings in LabelTest.
2014-03-31 17:40:30 +08:00
Dhilan007
687b2e9f87
update test case.
2014-03-31 17:38:54 +08:00
Dhilan007
51f3833a7e
fixed warn.
2014-03-31 17:31:04 +08:00
Dhilan007
72811d8869
fixed warn in test case.
2014-03-31 17:21:56 +08:00
James Chen
f4a7da8457
Merge pull request #6069 from Dhilan007/develop_label
...
fixed can't type chinese.
2014-03-31 16:46:43 +08:00
Dhilan007
6c99f992dc
fixed can't type chinese.
2014-03-31 16:18:45 +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
James Chen
313108af82
Merge pull request #6065 from boyu0/3.0rc1_test
...
fix box2dbed dynamic tree test draw.
2014-03-31 14:38:00 +08:00
boyu0
48854f4649
delete Time of Impact test which can not shown
2014-03-31 13:41:48 +08:00
boyu0
9b75fc5595
add box2dbed test keyboard event.
2014-03-31 12:07:21 +08:00
boyu0
4fa8d24561
fix some box2d test position
2014-03-31 11:26:11 +08:00
zhangbin
95ab15195c
Optimize the performance of BlurSpriteTest in Shader Sprite.
2014-03-31 10:44:48 +08:00
boyu0
530354ca67
fix box2d dynamic tree draws
2014-03-31 10:21:54 +08:00
minggo
f80bdfff76
Merge pull request #6055 from MSOpenTech/wp8-3.0
...
Cocos2d-x 3.0 Windows Phone 8 support
2014-03-29 23:21:34 +08:00
Dale Stammen
8bd5497ac6
use ResolutionPolicy::SHOW_ALL on WP8
2014-03-28 11:28:48 -07:00
zhangbin
6a1974a78a
Solve the error effect of BlurSpriteTest in Shader Sprite.
2014-03-28 20:53:14 +08:00
pipu
733b364b51
Fixed bugs for Editor
2014-03-28 18:54:06 +08:00
James Chen
fd9ab5c4d1
Merge pull request #6039 from Dhilan007/develop_label
...
LabelTTF and LabelBMFont tagged as deprecated
2014-03-28 14:31:11 +08:00
Dhilan007
898e2136b1
LabelTTF and LabelBMFont tagged as deprecated
2014-03-28 14:18:01 +08:00
James Chen
5c77b4d4b1
Merge pull request #6011 from DarraghCoy/event_listener_crash_fixes
...
closed #4586 : Fix crashes in event dispatch other related safety checks/fixes
2014-03-28 11:28:41 +08:00
minggo
b607172e57
Merge pull request #6035 from Dhilan007/develop_label
...
Remove the old implementation of LabelBMFont.
2014-03-28 10:32:04 +08:00
Dhilan007
fd5a4acddb
Remove the old implementation of LabelBMFont.
2014-03-28 10:28:44 +08:00
Darragh Coy
8ca3cf8a93
Update the test for dangling node pointers in the events system.
...
Should be run when the debug event listener verification for nodes is switched on.
2014-03-27 16:38:06 -07:00
Darragh Coy
ba450f786c
Fix the new test added to the event dispatcher tests
2014-03-27 16:16:27 -07:00
Darragh Coy
2b7116060d
Add a test for events being sent to destroyed nodes.
2014-03-27 16:00:21 -07:00
boyu0
9fbb45136a
closed #4573 : add ParticleVisibleTest.
2014-03-27 17:06:26 +08:00
James Chen
6f425c96cb
Merge pull request #6007 from Dhilan007/develop_testcase
...
Remove the old implementation of LabelTTF in test case.
2014-03-27 11:13:37 +08:00
pandamicro
87384d8ffa
Fixed #4566 : Move LayerGradient's init functions into CC_CONSTRUCTOR_ACCESS section
2014-03-27 10:55:41 +08:00
pandamicro
87f9eb3217
Fixed #4566 : Remove autorelease for create construct in LayerTest
2014-03-27 10:25:39 +08:00
pandamicro
413e0010f5
Fixed #4566 : Fix LayerTest bug
2014-03-27 10:22:04 +08:00
Darragh Coy
036dc5542c
Add cocos2d::RefPtr<T>
...
This class which acts a smart pointer type class for cocos2d::Ref objects. Can be used to help automate memory management and remove manual retain/release calls from code, resulting in less code and less chance of errors. Also useful to implement the RAII idiom in certain scenarios, ensuring that an object gets released upon exiting a scope.
2014-03-26 15:30:15 -07:00
Dhilan007
93511a878b
Remove the old implementation of LabelTTF in test case.
2014-03-26 23:33:58 +08:00
James Chen
849d7b9109
Merge pull request #5996 from chengstory/AddNewCreateNodeWay
...
Adding support of using CCComRender as parent for attached component
2014-03-26 18:20:34 +08:00
zhangcheng
58a61d94fb
add use CCComRender as parent for attaching component
2014-03-26 16:39:32 +08:00
James Chen
22fdbbb198
Merge pull request #5980 from Dhilan007/develop_label2
...
Refactor implementation of label's shadow and fixed stroke was not 'outside stroke' for Label generated by 'Font name'
2014-03-26 16:32:04 +08:00
andyque
876f643bc4
issue #4401 , fix a typo
2014-03-26 16:00:55 +08:00
James Chen
21ba509a35
Merge pull request #5989 from dumganhar/iss4559-ios-64bit
...
closed #4559 : Wrong behavior of multi-touch on iphone5s/ipadAir (arm64 arch)
2014-03-26 15:27:57 +08:00
James Chen
c1faad7e2c
Warning fixes in SocketIOTest.cpp/ FileUtilsTest.cpp.
2014-03-26 15:04:45 +08:00
andyque
57d8f155df
issue #4401 . resolve conflicts
2014-03-26 14:54:50 +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
7a8db8271f
Merge pull request #5930 from andyque/Branch_issue4429
...
closed #4429 : Boolean value could not be written to specified plist file
2014-03-26 11:46:56 +08:00
Dhilan007
1247760d95
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_label_fixs
...
Conflicts:
cocos/2d/CCLabel.cpp
2014-03-26 11:15:48 +08:00
Ricardo Quesada
473a6b19ee
Upgrades to Chipmunk 6.2.1
2014-03-25 10:37:35 -07: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
zhangbin
36892c3a98
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into issue2880
2014-03-25 16:21:41 +08:00