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
|
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 |
Darragh Coy
|
50be1ca3ad
|
Fix win32 build
|
2014-04-08 22:47:08 -07:00 |
zhangbin
|
ddffa3b120
|
closed #4703, Solve the incorrect effect of test case : RenderTexture test issue 937.
|
2014-04-09 13:40:43 +08:00 |
Darragh Coy
|
d64603a856
|
Attempt to fix the linux build.
|
2014-04-08 22:29:40 -07: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 |
Darragh Coy
|
440a0adcde
|
Whoops... Shouldn't remove the test cpp.
|
2014-04-08 10:40:32 -07:00 |
Darragh Coy
|
a34b952e8d
|
Revert "Fix Android build for RefPtr addition."
This reverts commit 586383a05e .
|
2014-04-08 10:35:55 -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 |
minggo
|
7840a246b7
|
Merge pull request #6063 from koowolf/add_bg_wav
add background.wav to wp8 to play
|
2014-03-31 15:20:26 +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 |
koowolf
|
ce78b6369a
|
add background.wav to wp8 to play
|
2014-03-31 11:46:39 +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 |