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

14976 Commits

Author SHA1 Message Date
CaiWenzhi 067af2fb93 optimize loop 2013-12-26 16:17:52 +08:00
James Chen 517f3991ef Merge pull request #4678 from dumganhar/compile-fix 
Compilation fixes after merge PR #4669
 2013-12-26 00:15:24 -08:00
Huabing.Xu 35fbbdaaf5 Merge branch 'develop' into develop_FixTestCase_labelTestNew 
* develop:
 2013-12-26 16:12:54 +08:00
Huabing.Xu 706d0e185a fix LabelTestNew 2013-12-26 16:11:06 +08:00
James Chen 5dfb7f321a Compilation fixes after merge PR #4669 https://github.com/cocos2d/cocos2d-x/pull/4669 2013-12-26 16:03:30 +08:00
minggo 24b2b7e692 Merge pull request #4677 from dabingnn/develop_FixTestCase_Box2dView 
Develop fix test case box2d view
 2013-12-25 23:59:20 -08:00
Huabing.Xu 984c53a74e Merge branch 'develop' into develop_FixTestCase_Box2dView 
* develop:
 2013-12-26 15:55:32 +08:00
Huabing.Xu 9bd609a8fb Merge pull request #1 from boyu0/develop_removeCommandPool 
Specialize GroupCommand and CustomCommand, change generateCommand to new...
 2013-12-25 23:51:38 -08:00
yinkaile 7027587542 fixed armature update 2013-12-26 15:49:20 +08:00
Huabing.Xu 69a490ef08 Fix box2dView 2013-12-26 15:48:26 +08:00
boyu0 f878864794 Specialize GroupCommand and CustomCommand, change generateCommand to new. 2013-12-26 15:41:47 +08:00
minggo 0ad192e2cc Merge pull request #4676 from dabingnn/develop_FixTestCase_ClippingNodeTest 
Develop fix test case clipping node test
 2013-12-25 23:37:27 -08:00
chuanweizhang be9e384fa0 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-12-26 15:35:08 +08:00
Huabing.Xu 5faf89c183 change rendering callback from public to protected 2013-12-26 15:34:22 +08:00
Huabing.Xu 04fec6e95b Merge branch 'develop' into develop_FixTestCase_ClippingNodeTest 
* develop:
 2013-12-26 15:32:28 +08:00
Huabing.Xu c28f3fb0e9 fix clippingNodeTest 2013-12-26 15:30:13 +08:00
James Chen beced4897e Merge pull request #4675 from dabingnn/develop_FixTestCase_TilemapTest 
Develop fix test case tilemap test
 2013-12-25 22:58:52 -08:00
CaiWenzhi 4d8e3a423c Merge branch 'develop' into develop_nutty_modify_framework_newrender_modify_projectfiles 2013-12-26 14:58:44 +08:00
yinkaile c096743325 change comment 2013-12-26 14:57:38 +08:00
CaiWenzhi 530f82ee27 Add refresh layout method 2013-12-26 14:57:30 +08:00
Huabing.Xu 3cdc20612b Merge branch 'develop' into develop_FixTestCase_TilemapTest 
* develop:
  Update CHANGELOG [ci skip]
  [AUTO] : updating submodule reference to latest autogenerated bindings
  [GUI] Updates Mac project.
  Remove C cast
  Fixed bugs about color and opacity
  Remove "_renderer" from widget
  Fixed bugs
  Remove CCDictionary from GUIReader
  Add samples
  Remove NodeRGBA inherit
 2013-12-26 14:57:10 +08:00
chuanweizhang 911c7eae10 modify license time 2013-12-26 14:49:06 +08:00
chengstory efa7495953 Merge branch 'develop' into #3457 2013-12-26 14:46:36 +08:00
Huabing.Xu 963d637198 use raw new instead of generateCommand 2013-12-26 14:45:44 +08:00
Huabing.Xu b4c61d5a7c specialize RenderCommandPool<QuadCommand> 2013-12-26 14:44:21 +08:00
minggo 03c4b57f5b Merge pull request #4668 from dabingnn/develop_FixTestCase_Texture2dTest 
Develop fix test case texture2d test
 2013-12-25 22:42:20 -08:00
chengstory 2232e0f015 fixed #3457 remove jsoncpp cmakelist. 2013-12-26 13:35:33 +08:00
chengstory ab3cf064d1 fixed #4357 failed to build android. 2013-12-26 13:26:23 +08:00
chengstory 263c4fbb0a fixed #3457 remove unused comment. 2013-12-26 12:58:34 +08:00
chengstory 8ae7ecff33 Merge branch 'develop' into #3457 
Conflicts:
	build/cocos2d_samples.xcodeproj/project.pbxproj
	cocos/editor-support/cocostudio/CCSGUIReader.cpp
	cocos/editor-support/cocostudio/CCSGUIReader.h
 2013-12-26 12:55:52 +08:00
James Chen df690e8f8b Updates bindings config files. 2013-12-26 12:50:37 +08:00
CaiWenzhi 946dab0b34 Modify android mk 2013-12-26 12:23:58 +08:00
CaiWenzhi 7be4d07b7f Fixed build error 2013-12-26 11:56:48 +08:00
子龙山人 215c365383 Merge pull request #3 from cocos2d/develop 
sync original repo
 2013-12-25 19:48:09 -08:00
CaiWenzhi 8215e90870 Modify build files 2013-12-26 11:44:55 +08:00
CaiWenzhi 30cc579f0c Modify Test CMakeList 2013-12-26 11:36:18 +08:00
CaiWenzhi b1d2aa9b79 Modify CMakeList 2013-12-26 11:25:49 +08:00
Huabing.Xu ec8f30b4d5 fix tilemapTest 2013-12-26 11:19:09 +08:00
CaiWenzhi 581678b6b0 Modify android mk 2013-12-26 11:06:10 +08:00
chuanweizhang 951b460321 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-12-26 11:03:56 +08:00
James Chen 4e25d88741 Merge pull request #4670 from CocosRobot/updategeneratedsubmodule_1388026235 
[AUTO] : updating submodule reference to latest autogenerated bindings[ci skip]
 2013-12-25 18:58:22 -08:00
James Chen dafaff0d83 Update CHANGELOG [ci skip] 2013-12-26 10:52:01 +08:00
CocosRobot e6727ea087 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-26 02:50:37 +00:00
子龙山人 47ab490559 Merge pull request #2 from cocos2d/develop 
update
 2013-12-25 18:47:04 -08:00
James Chen 7f459ef16b Merge pull request #4669 from dumganhar/gui-refactor 
Merge PR #4617, GUI refactor
 2013-12-25 18:46:04 -08:00
James Chen 444389e92d [GUI] Updates Mac project. 2013-12-26 10:44:41 +08:00
Huabing.Xu 58bb327db9 fix texture2dtest->drawinrect 2013-12-26 10:24:40 +08:00
yinkaile b553828ed2 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-12-26 10:24:33 +08:00
yinkaile b44090b40b change std::map to std::unordered_map 2013-12-26 10:23:51 +08:00
chuanweizhang 0343f55dc7 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-12-26 10:23:00 +08:00