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

1452 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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 8aa187d8dc Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-03-31 10:47:04 +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 6cc51a2cfc Merge pull request #6057 from samuele3hu/develop_socket 
Add the omitted socket script for lua-tests
 2014-03-31 10:15:38 +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
minggo a874ecf8b0 Merge pull request #6053 from natural-law/develop 
Solve the error effect of BlurSpriteTest in Shader Sprite.
 2014-03-29 21:42:54 +08:00
samuele3hu 056303ea35 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket 2014-03-29 14:58:45 +08:00
samuele3hu 219a91a641 Add the omitted socket script for lua-tests 2014-03-29 14:58:23 +08:00
samuele3hu 7127cb560e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_test 2014-03-29 10:36:15 +08:00
samuele3hu 403e96b943 Use the New Label in the Extension test case 2014-03-29 10:34:52 +08:00
Dale Stammen c739956582 added wp8 support files and projects 2014-03-28 15:54:36 -07:00
Dale Stammen 8d1f4188eb added wp8 support files and projects 2014-03-28 15:53:55 -07:00
Dale Stammen 8bd5497ac6 use ResolutionPolicy::SHOW_ALL on WP8 2014-03-28 11:28:48 -07:00
Dale Stammen 210f95c2d3 can't close app on WP8 2014-03-28 11:27:43 -07:00
samuele3hu a387f60f80 Update the font size for new label test display 2014-03-28 23:32:11 +08:00
zhangbin 77e0694883 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-03-28 20:55:12 +08: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 581ef454eb Merge pull request #6047 from samuele3hu/develop_test 
Replace `LabelTTF` and `LabelBMFont` with `Label` for cocosbuild proxy and fix the error that  ControlSwitch:create raised.
 2014-03-28 18:04:12 +08:00
zhangbin 338fd43beb Solve the error effect of clipping in cpp-tests & lua-tests. 2014-03-28 17:45:28 +08:00
samuele3hu 7ca207f993 Replace `LabelTTF` and `LabelBMFont` with `Label` for cocosbuild proxy and fix the error that ControlSwitch:create raised. 2014-03-28 17:18:41 +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