James Chen
|
b71e1c1570
|
Merge pull request #6250 from natural-law/develop
fix the error effect of ` FontTest` in lua-tests.
|
2014-04-11 20:26:30 +08:00 |
James Chen
|
350f61c4da
|
Merge pull request #5921 from koowolf/Branch_cocos2d-x-3.0rc0
closed #4497: use /z7 to build without .pdb
|
2014-04-11 20:20:47 +08:00 |
zhangbin
|
99766cdd03
|
fix the error show of ` FontTest`
|
2014-04-11 20:17:34 +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 |
James Chen
|
bf2450ad54
|
Merge pull request #6242 from andyque/fix_zfighting
fix a compile error
|
2014-04-11 16:49:21 +08:00 |
andyque
|
280c2755b3
|
closed #4761. fix a compile error
|
2014-04-11 16:47:35 +08:00 |
James Chen
|
96ce8cb8cb
|
Merge pull request #6241 from andyque/fix_zfighting
closed #4761, fix zfighting between tests
|
2014-04-11 16:41:39 +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 |
boyu0
|
b69b14382e
|
Rename lua cc.Label:create to cc.Label:createWithTTF and cc.Label.createWithSystemFont
|
2014-04-11 15:25:18 +08:00 |
samuele3hu
|
70dec15e76
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_fix
|
2014-04-10 23:38:57 +08:00 |
samuele3hu
|
c687b97c6e
|
fix the crash invoked by deprecated `create` function of `Label`
|
2014-04-10 23:36:25 +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
|
428cea061c
|
Merge pull request #6214 from dumganhar/iss4744-set-dirty-for-node
closed #4744: EventDispatcher::setDirtyForNode doesn't consider node's children
|
2014-04-10 15:35:29 +08:00 |
James Chen
|
8a66f43f30
|
closed #4744: Adds test for issue4744.
|
2014-04-10 15:31:53 +08:00 |
samuele3hu
|
2800133c99
|
Add deprecated support for `Label::create` and new lua binding for `Label:createWithTTF`
|
2014-04-10 14:54:14 +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 |
samuele3hu
|
b6579aa322
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_label
|
2014-04-09 16:25:44 +08:00 |
samuele3hu
|
7de6552f54
|
Update the NewEventDispatcherTest
|
2014-04-09 16:22:03 +08:00 |
samuele3hu
|
1c124f52ad
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_label
|
2014-04-09 14:29:04 +08:00 |
samuele3hu
|
dbd01051d8
|
close #4721:clone for EventListeners of lua didn't clone the related property
|
2014-04-09 14:26:05 +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 |
James Chen
|
1ec3f014e8
|
Merge pull request #6130 from dumganhar/iss4557-set-enabled-listener
closed #4557: Adds `EventListener::setEnabled/isEnabled`.
|
2014-04-03 18:02:44 +08:00 |
andyque
|
c501aa2dec
|
issue #4636. replace __String with StringUtils::format
|
2014-04-03 17:42:04 +08:00 |