Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
18,351 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

1383 Commits

Author SHA1 Message Date
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
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
samuele3hu b68f6bf65e fix the error about `draw` of GLNode and modify the related test cases 2014-04-03 17:02:14 +08:00
andyque c35c006fbd Merge branch 'develop' into feature3636 2014-04-03 16:02:00 +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
samuele3hu bff1d6c2a6 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_label 2014-04-03 11:15:59 +08:00
andyque fe33588038 issue #4636. finish UILayout 2014-04-03 11:14:35 +08:00
samuele3hu b9ff51782f Synchronize LabelTest of cpp to lua to fix some bug and add more tests 2014-04-03 11:08:59 +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 f744ddc860 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-04-02 17:15:39 +08:00
zhangbin 0e0000e6d5 The projection reset to DEFAULT when a test case onExit(). 2014-04-02 17:12:09 +08:00
samuele3hu 0c93c6ae60 fix error that “lua-test/opengltest/shader retro effect” test case have no effect 2014-04-02 15:34:26 +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