Commit Graph

163 Commits

Author SHA1 Message Date
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 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
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
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
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
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
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
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
James Chen 7b4a1308ea Adds `Renderer::clean`, and fixes crash in `PerformanceTest/Node
children Test`.
2014-04-04 12:48:16 +08:00
andyque c501aa2dec issue #4636. replace __String with StringUtils::format 2014-04-03 17:42:04 +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