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

15464 Commits

Author SHA1 Message Date
boyu0 dec003477c delete ‘delete ptr’ and add CC_UNUSED_PARAM 2013-12-26 19:25:53 +08:00
boyu0 d32fbbbfca change GroupCommand variable to class member. 2013-12-26 18:11:23 +08:00
chengstory d9ba53f9a9 o my god. 2013-12-26 17:55:46 +08:00
CaiWenzhi ad535e2fcb Add listview and pageview reader 2013-12-26 17:53:22 +08:00
yinkaile b1b08b2d18 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-12-26 17:47:01 +08:00
chengstory bd46681867 fixed #3457 continue to fixes failed to build. 2013-12-26 17:37:02 +08:00
CaiWenzhi f0eb5d28c1 Merge branch 'develop' into develop_nutty_modify_framework_newrender_modify_projectfiles 2013-12-26 17:32:08 +08:00
James Chen dcde5ec50c Merge pull request #4681 from CocosRobot/updategeneratedsubmodule_1388048641 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-12-26 01:22:20 -08:00
chengstory 041e78cb54 Fixes failed to build android. 2013-12-26 17:17:02 +08:00
CocosRobot 50a379b8f0 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-26 09:04:04 +00:00
CaiWenzhi 3206727b9c Modify actionnode 2013-12-26 17:01:31 +08:00
chengstory 91edad5152 Merge branch 'develop' into #3457 2013-12-26 16:56:43 +08:00
James Chen 8dfc428599 Merge pull request #4671 from nutty898/develop_nutty_modify_framework_newrender_modify_projectfiles 
Add refresh layout method and uses Range loop for GUI codes
 2013-12-26 00:49:49 -08:00
yinkaile 891d8c3a38 change comment 2013-12-26 16:48:19 +08:00
cheng.zhang b50c3468c1 Merge pull request #4 from liamcindy/MergeCocos2d_3.0 
modify coco action with new coding rule
 2013-12-26 00:47:29 -08:00
chuanweizhang 7d7a0866e2 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 
Conflicts:
	tools/bindings-generator
 2013-12-26 16:46:55 +08:00
CaiWenzhi a2e873d12a Merge branch 'develop' into develop_nutty_modify_framework_newrender_modify_projectfiles 2013-12-26 16:45:48 +08:00
Liam a158e25767 modify coco action with new coding rule 2013-12-26 16:36:21 +08:00
boyu0 2fb0179293 change QuadCommand variable to class member. 2013-12-26 16:36:03 +08:00
Liam bc54707893 modify coco action with new coding rule 2013-12-26 16:29:59 +08:00
James Chen 9d4a84c40c Merge pull request #4679 from dabingnn/develop_FixTestCase_labelTestNew 
Develop fix test case label test new
 2013-12-26 00:27:59 -08:00
James Chen ef713e11da Merge pull request #4680 from CocosRobot/updategeneratedsubmodule_1388046023 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-12-26 00:21:00 -08:00
CocosRobot 09996ea82c [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-26 08:20:26 +00:00
yinkaile f0d4f3f9bf Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-12-26 16:19:21 +08:00
CaiWenzhi 7b6e022388 Merge branch 'develop' into develop_nutty_modify_framework_newrender_modify_projectfiles 2013-12-26 16:19:12 +08:00
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