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

8977 Commits

Author SHA1 Message Date
yangxiao 9e115073a1 fix warning 2015-04-02 14:04:31 +08:00
XiaoYang 984babc9c9 Merge pull request #281 from tangziwen/terrain 
update terrain
 2015-04-02 10:19:11 +08:00
yusheng.lu 82c6e623e0 Remove CCNodeReader.h/cpp from libcocos2d_8_1.Shared.vcxitems, libcocos2d_8_1.Shared.vcxitems.filters 2015-04-02 10:15:36 +08:00
samuele3hu 826fe4cf31 Update the Xcode project setting for luajit 2015-04-02 10:07:31 +08:00
CocosRobot dfc2390659 [AUTO]: updating luabinding automatically 2015-04-02 01:51:14 +00:00
minggo 6cf344ded6 Merge pull request #10827 from mogemimi/remove-useless-cast-and-cleanup 
Remove useless (char*) casts in CCTMXXMLParser.cpp
 2015-04-02 09:45:22 +08:00
minggo e7a6c7eada Merge pull request #11245 from CocosRobot/update_lua_bindings_1427857074 
[AUTO]: updating luabinding automatically
 2015-04-02 09:39:36 +08:00
minggo 332ce1a8f3 Merge pull request #11249 from super626/v3 
Release note for texturecube skybox and animtion quality
 2015-04-02 09:39:16 +08:00
minggo 199fb2b694 Merge pull request #11250 from super626/texturecube 
Texturecube Modify
 2015-04-02 09:38:26 +08:00
lvlong 1da7ef121e _aabbDirty = true 2015-04-02 09:33:48 +08:00
tangziwen 6cd1077cb0 update terrain 2015-04-01 18:24:05 +08:00
yangxiao 2cc9814702 modify 2015-04-01 17:58:41 +08:00
yangxiao 4b7ae430a8 Merge branch 'texturecube' of https://github.com/super626/cocos2d-x into texturecube 2015-04-01 17:37:55 +08:00
yangxiao 9540fd590f modify skybox 2015-04-01 17:34:57 +08:00
yangxiao 591fff4046 release note for texturecube skybox and animtion quality 2015-04-01 16:40:40 +08:00
xiaofeng11 ea8538117b Merge pull request #7 from pipu/remove_CCNodeReader 
Remove CCNodeReader.h/.cpp.
 2015-04-01 14:12:09 +08:00
pipu 340e26d81a Supplement invoke destroyInstance() of some Reader in destroyCocosStudio(). 2015-04-01 14:08:09 +08:00
pipu 41661830ff Remove CCNodeReader.h/.cpp. 2015-04-01 13:37:36 +08:00
yusheng.lu 01a091ef2c Delete CCNodeReader for Win8.1 project 2015-04-01 11:49:36 +08:00
CocosRobot 17a80b0c54 [AUTO]: updating luabinding automatically 2015-04-01 02:59:47 +00:00
lvlong 72722ba5b0 fix aabbDirty bug. 2015-04-01 10:57:19 +08:00
minggo 02e8a08de7 Merge pull request #11241 from tangziwen/v3_doc 
update 3d doc
 2015-04-01 10:52:35 +08:00
minggo eefd06415b Merge pull request #11229 from xiaofeng11/v3 
Add destroyCocosStudio()
 2015-04-01 10:49:49 +08:00
tangziwen 3247acc0c1 ignore some method ,fix typo 2015-04-01 10:23:53 +08:00
tangziwen 8cde333d36 update 3d doc 2015-04-01 09:47:09 +08:00
minggo 7b2fcb5287 Merge pull request #11237 from perminovVS/v3-dev-rename-file-win32 
Win32 correct rename file
 2015-04-01 09:35:18 +08:00
pipu bc7d8f0a09 Add method destroyCocosStudio() for CocoStudio 2015-03-31 19:55:56 +08:00
Vladimir Perminov b7279524d6 Win32 correct rename file 
Old version, check GetLastError even if all ok, but LastError can be set
other code.
Write log info.
 2015-03-31 13:52:40 +03:00
CocosRobot 46f32142c7 [AUTO]: updating luabinding automatically 2015-03-31 10:26:49 +00:00
minggo cb0c9ad6ee Merge pull request #11233 from super626/texturecube 
Bug fix: ios devices crash on release mode
 2015-03-31 18:21:22 +08:00
minggo c1cd041912 Merge pull request #11221 from super626/v3 
3d animation quality control
 2015-03-31 17:23:58 +08:00
zhukaixy 3835675cab bugfix: TextureCube will be crashed on release environment 2015-03-31 16:56:02 +08:00
pipu bb110449be Reset method purge() definition for some Reader. 2015-03-31 14:56:24 +08:00
lvlong 336e719a2f initialize _forceDepthWrite 2015-03-31 14:41:07 +08:00
lvlong ab2c773c5c clean all action from s_fadeInAnimates, s_fadeOutAnimates, s_runningAnimates!!!! 2015-03-31 14:26:40 +08:00
pipu 91acd6aea9 Set macro CC_DEPRECATED_ATTRIBUTE for method purge() for all Reader. 2015-03-31 14:21:10 +08:00
CocosRobot 00792e98a3 [AUTO]: updating luabinding automatically 2015-03-31 04:01:57 +00:00
minggo 6ef27df2fc Merge pull request #11223 from hawkwood/patch-6 
Remove use of autorelease NSString and NSURL
 2015-03-31 11:57:00 +08:00
pipu a0a461f319 Supplement some Reader. 2015-03-31 11:22:34 +08:00
XiaoYang 45987b6a60 Merge pull request #276 from tangziwen/terrain 
update Terrain, support skirt
 2015-03-31 09:14:27 +08:00
Justin Hawkwood 237e809f23 Remove use of autorelease NSString and NSURL 
Since there is no autorelease pool, these were leaking.
 2015-03-30 16:27:05 -07:00
Justin Hawkwood 3641ef266c Remove use of autorelease NSString and NSURL 
Since there is no autorelease pool, these were leaking.
 2015-03-30 16:24:48 -07:00
VisualSJ a29becb185 [ci skip] Add javascript notes... 
cocos/ui/UIHBox.h
  cocos/ui/UIHelper.h
  cocos/ui/UIImageView.h
  cocos/ui/UILayout.h
  cocos/ui/UIText.h
  cocos/ui/UITextAtlas.h
  cocos/ui/UITextBMFont.h
  cocos/ui/UITextField.h
  cocos/ui/UIVBox.h
  cocos/ui/UIVideoPlayer.h
  cocos/ui/UIWebView.h
  cocos/ui/UIWidget.h
 2015-03-30 21:38:32 +08:00
tangziwen 1a93f87a15 update terrain 2015-03-30 18:25:22 +08:00
lvlong 4bc44c207d modify config-example.plist 2015-03-30 18:07:32 +08:00
lvlong cbdfd77400 modify some name. 2015-03-30 17:46:45 +08:00
pipu 6f20da4444 Add destroyCocosStudio() 2015-03-30 16:46:33 +08:00
lvlong 5032194e98 modify animate 3d quality to bool 2015-03-30 15:57:58 +08:00
samuele3hu 6c528c4a42 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_5_test 2015-03-30 15:51:01 +08:00
samuele3hu c3ad458a26 Update comment for Lua 2015-03-30 15:47:47 +08:00
minggo 0b400a0b20 Merge pull request #11207 from andyque/fix-remaining-missing-comments 
Finish the missing comments
 2015-03-30 14:54:48 +08:00
lvlong 6fe9f0d1c8 add comments for 3d animation quality!!! 2015-03-30 14:05:03 +08:00
yangxiao c6a86ac287 move shader to shaders 2015-03-30 13:45:50 +08:00
lvlong ccb5039411 Merge branch 'v3' of github.com:super626/cocos2d-x into v3 
Conflicts:
	cocos/base/CCConfiguration.h
 2015-03-30 11:50:01 +08:00
lvlong b2a7a753c2 add comments 2015-03-30 11:44:30 +08:00
andyque b5d10fb246 Merge branch 'v3' into fix-remaining-missing-comments 
Conflicts:
	cocos/base/CCIMEDelegate.h
 2015-03-30 10:56:42 +08:00
minggo d437ce3e59 Merge pull request #11208 from samuele3hu/v3_5_comment 
Update Sprite3DCubeMap  lua test case and the related bindings-generator submodule
 2015-03-30 10:48:36 +08:00
minggo 59441adc2c Merge pull request #11213 from super626/texturecube 
Texturecube bug fix
 2015-03-30 10:48:10 +08:00
yangxiao b469cfa928 merge cocos 2015-03-30 10:28:14 +08:00
yangxiao 7affd8edcf large value for min max 2015-03-30 10:00:06 +08:00
minggo 30db8ab7fa Merge pull request #11159 from super626/v3 
node animation support
 2015-03-30 09:32:36 +08:00
minggo 73279e3b3f Merge pull request #11205 from WenhaiLin/v3-doxygen 
[ci skip]Update comments.
 2015-03-30 09:31:36 +08:00
VisualSJ 875b5d95f4 [ci skip] Add javascript notes... 
cocos/ui/UIListView.h
  cocos/ui/UILoadingBar.h
  cocos/ui/UIPageView.h
  cocos/ui/UIRelativeBox.h
  cocos/ui/UIRichText.h
  cocos/ui/UIScale9Sprite.h
  cocos/ui/UIScrollView.h
  cocos/ui/UISlider.h
 2015-03-28 16:02:47 +08:00
VisualSJ 6285e72d1e [ci skip] Add javascript notes... 
cocos/3d/CCBundle3D.h
  cocos/3d/CCBundle3DData.h
  cocos/3d/CCBundleReader.h
  cocos/3d/CCFrustum.h
  cocos/3d/CCMeshSkin.h
  cocos/3d/CCMeshVertexIndexData.h
  cocos/3d/CCOBB.h
  cocos/3d/CCObjLoader.h
  cocos/3d/CCPlane.h
  cocos/3d/CCRay.h
  cocos/3d/CCSprite3DMaterial.h
  cocos/base/CCAsyncTaskPool.h
  cocos/base/CCIMEDelegate.h
  cocos/base/CCIMEDispatcher.h
  cocos/base/CCMap.h
  cocos/base/CCScriptSupport.h
 2015-03-28 15:11:51 +08:00
samuele3hu 921981833e Update Sprite3DCubeMap test case 2015-03-28 14:59:47 +08:00
VisualSJ 9ba82584a9 [ci skip] Add javascript notes... 
cocos/2d/CCClippingNode.h
  cocos/2d/CCTMXTiledMap.h
  cocos/2d/CCTMXObjectGroup.h
  cocos/2d/CCTMXLayer.h
  cocos/2d/CCSpriteBatchNode.h
  cocos/2d/CCSprite.h
  cocos/2d/CCRenderTexture.h
  cocos/2d/CCProtectedNode.h
  cocos/2d/CCMenuItem.h
  cocos/2d/CCMenu.h
  cocos/2d/CCLabelAtlas.h
  cocos/2d/CCLabel.h
  cocos/2d/CCGrid.h
  cocos/2d/CCGLBufferedNode.h
  cocos/2d/CCFastTMXTiledMap.h
  cocos/2d/CCFastTMXLayer.h
  cocos/2d/CCDrawingPrimitives.h
  cocos/2d/CCDrawNode.h
  cocos/2d/CCComponentContainer.h
  cocos/2d/CCClippingRectangleNode.h
  cocos/2d/CCTextFieldTTF.h
  cocos/2d/CCTileMapAtlas.h
 2015-03-28 14:28:16 +08:00
andyque e3fc9b082e Finish the missing comments 2015-03-27 20:56:12 +08:00
Wenhai Lin ff3777dfd1 [ci skip]Update comments. 2015-03-27 18:26:14 +08:00
zhukaixy 5bff8f5bf3 Bugfix: for glcontext recreated 2015-03-27 17:20:46 +08:00
minggo b78b0f7238 Merge pull request #11202 from minggo/add-documentation 
[ci skip]fix doxygen comment
 2015-03-27 17:12:37 +08:00
minggo b03900bbbf fix doxygen comment 2015-03-27 17:09:54 +08:00
minggo 8b5a6d9ccc Merge pull request #11196 from tangziwen/doc 
3d fix doxygen add to group
 2015-03-27 17:09:24 +08:00
minggo c4ac84d4f6 Merge pull request #11200 from samuele3hu/v3_5_comment 
[ci skip]Update comments of some header files
 2015-03-27 17:08:26 +08:00
zhukaixy a1bad14c1e Update ccShader_3D_Skybox.frag 2015-03-27 17:07:30 +08:00
yangxiao a45f0d1a76 merge cocos 2015-03-27 16:50:40 +08:00
minggo b6ac2fa422 Merge pull request #11199 from WenhaiLin/v3-doxygen 
[ci skip]Update comments
 2015-03-27 16:04:25 +08:00
samuele3hu f54512a618 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_5_comment 2015-03-27 15:59:05 +08:00
Wenhai Lin 6f117c4f49 [ci skip]Update comments 2015-03-27 15:31:42 +08:00
samuele3hu bb225d052e Update comments of some header files 2015-03-27 15:27:08 +08:00
minggo 3c3163d7dd Merge pull request #11193 from CocosRobot/update_lua_bindings_1427435046 
[AUTO]: updating luabinding automatically
 2015-03-27 15:26:36 +08:00
Wenhai Lin 8f3bbe3c40 [ci skip]Update comments 2015-03-27 15:25:44 +08:00
tangziwen 56c31845ff fix conflict again 2015-03-27 15:25:16 +08:00
tangziwen 12bcdc8868 fix conflict 2015-03-27 15:08:20 +08:00
minggo 7d0a49a98f Merge pull request #11198 from SuYaoHui/cocosapi 
[ci skip]Add comment
 2015-03-27 15:00:22 +08:00
SuYaohui 3d772df930 Add comment 2015-03-27 14:43:24 +08:00
minggo 9d428d8e48 Merge pull request #11194 from WenhaiLin/v3-doxygen 
[ci skip]Fixed warnings
 2015-03-27 14:34:26 +08:00
minggo 033a3e09b9 Merge pull request #11191 from fusijie/cocosapi 
[ci skip]update comments.
 2015-03-27 14:33:49 +08:00
tangziwen 68563494ae fix doxygen add to group 2015-03-27 14:10:41 +08:00
CocosRobot 4785e6e383 [AUTO]: updating luabinding automatically 2015-03-27 05:46:01 +00:00
Jacky d9b0c67f65 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into cocosapi 
Conflicts:
	cocos/2d/CCNode.h
 2015-03-27 13:43:38 +08:00
tangziwen a2cce0594b update 2015-03-27 13:43:09 +08:00
minggo 85530648a7 Merge pull request #11180 from andyque/fix-comments 
remove unneeded js & lua NA and remove deprecated list from navtree
 2015-03-27 13:40:54 +08:00
Jacky 4edf9e76fd update comments. 2015-03-27 12:07:19 +08:00
Huabing.Xu 0367d752af Merge branch 'v3' into v3_comments 
Conflicts:
	cocos/renderer/ccShaders.h
 2015-03-27 12:05:15 +08:00
andyque 602093e474 fix extra @ symbol in Base group 2015-03-27 12:01:20 +08:00
Wenhai Lin a47cad0354 [ci skip]Fixed warnings 2015-03-27 11:59:10 +08:00
Huabing.Xu 3d657df9f6 [ci skip]add group base to files in renderer folder 2015-03-27 11:54:40 +08:00
tangziwen 5a76a628d3 add some utility functions 2015-03-27 11:46:02 +08:00
minggo 29c5da8429 Merge pull request #11189 from SuYaoHui/cocosapi 
Add comments
 2015-03-27 11:46:02 +08:00
SuYaohui 17bd26e9d4 Add comments 2015-03-27 11:39:31 +08:00
minggo 8691602b81 Merge pull request #11185 from samuele3hu/v3_5_comment 
[ci skip]Update comments of some header files
 2015-03-27 11:35:11 +08:00
Huabing.Xu 6cb99312ee [ci skip]add group base to files in math folder 2015-03-27 11:34:52 +08:00
andyque 813bcc4017 Merge branch 'v3' into fix-comments 2015-03-27 11:26:46 +08:00
Huabing.Xu b22f92635f [ci skip]fix warning for doxygen 2015-03-27 11:20:50 +08:00
samuele3hu a1b054911c Update comments of some header files 2015-03-27 11:13:28 +08:00
minggo d9680b2c74 Merge pull request #11178 from calfjohn/v3 
[ci skip]fixed doxygen warning for physics and texture2d
 2015-03-27 11:11:28 +08:00
minggo 8b4f662ac0 Merge pull request #11179 from WenhaiLin/v3-doxygen 
[ci skip]Fixed warnings when generating docs by doxygen.
 2015-03-27 11:10:43 +08:00
minggo 2ea8b8272a Merge pull request #11177 from CocosRobot/update_lua_bindings_1427423082 
[AUTO]: updating luabinding automatically
 2015-03-27 11:10:19 +08:00
Huabing.Xu 49bf8d5e13 Merge pull request #11181 from dabingnn/v3_comments 
V3 comments
 2015-03-27 11:09:17 +08:00
minggo 24aef7c6bb Merge pull request #11164 from super626/texturecube 
Texturecube
 2015-03-27 11:06:28 +08:00
Huabing.Xu cbcdef11c3 [ci skip]fix warning for doxygen 2015-03-27 11:05:01 +08:00
Huabing.Xu f18fac48ed [ci skip]fix warning for doxygen 2015-03-27 11:03:21 +08:00
andyque bc2ffe4e19 remove unneeded js & lua NA and remove deprecated list from navtree 2015-03-27 11:02:04 +08:00
Wenhai Lin fdffad3956 [ci skip]Fixed warnings when generating docs by doxygen. 2015-03-27 10:52:59 +08:00
calfjohn 0af4f9f1ed fixed doxygen warning for physics and texture2d 2015-03-27 10:34:01 +08:00
CocosRobot c73602a523 [AUTO]: updating luabinding automatically 2015-03-27 02:26:35 +00:00
zhangbin 58bc56f759 Solve the warning when generating docs by doxygen. 2015-03-27 10:17:33 +08:00
tangziwen 8b376e511c update Terrain 2015-03-27 10:12:24 +08:00
CocosRobot a4e633a299 [AUTO]: updating luabinding automatically 2015-03-26 16:17:35 +00:00
samuele3hu fb085fc2ea Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_5_comment 
Conflicts:
	docs/doxygen_white_book.config
 2015-03-26 22:29:37 +08:00
samuele3hu e0bde0f789 Update comments of some header files 2015-03-26 22:07:44 +08:00
yangxiao 6cd1697240 config wp8 and add comment 2015-03-26 18:10:42 +08:00
minggo f7e11a2467 Merge pull request #11168 from andyque/fix-comments 
fix group error
 2015-03-26 16:10:06 +08:00
andyque 42cd63fe01 fix group error 2015-03-26 15:47:14 +08:00
minggo 590cd9dc52 Merge pull request #11167 from minggo/v3 
[ci skip]fix some documentation
 2015-03-26 15:42:52 +08:00
minggo 1f0ba8cf2b fix some documentation 2015-03-26 15:40:54 +08:00
minggo 4eadd1ce47 Merge pull request #11165 from calfjohn/v3 
[ci skip]Modify group name for physics and Texture2d, Texture2dCache, TextureAtla...
 2015-03-26 15:29:17 +08:00
calfjohn 587931faaa Modify group name for physics and Texture2d, Texture2dCache, TextureAtlas. 2015-03-26 15:20:25 +08:00
yangxiao 7d3154e2e9 add to linux 2015-03-26 14:34:11 +08:00
yangxiao c23746fbcd modify 2015-03-26 13:05:42 +08:00
yangxiao 000e34c6d0 merge cocos 2015-03-26 12:50:18 +08:00
yangxiao 84535feb0c merge cocos 2015-03-26 11:59:26 +08:00
lvlong 6c29385547 animate quality! 2015-03-26 11:33:16 +08:00
lvlong c999307150 add different animate quality. 2015-03-26 11:30:22 +08:00
CocosRobot f43b666929 [AUTO]: updating luabinding automatically 2015-03-26 02:44:28 +00:00
minggo f9589d166d Merge pull request #11161 from samuele3hu/v3_5_comment 
Update comments of some header files
 2015-03-26 10:37:41 +08:00
minggo 52d53fd7ee Merge pull request #11148 from andyque/finish-v3-comments 
Add missing comments for UI modules
 2015-03-26 10:02:42 +08:00
minggo fae951d928 Merge pull request #11150 from samuele3hu/v3_5_test 
[ci skip]Update comments of some header files
 2015-03-26 10:00:11 +08:00
zhukaixy aead9e5855 correct for code indent 2015-03-26 09:53:41 +08:00
XiaoYang 11c021881b Merge pull request #263 from lvlonggame/v3 
fix: obj file load material.
 2015-03-26 09:29:58 +08:00
lvlong f93dffdeb0 node frame animation test and resource 2015-03-26 09:25:37 +08:00
lvlong ecfd66cda3 node frame code!!!!! 2015-03-26 09:12:05 +08:00
andyque 86c3e60254 fix merge issue 2015-03-25 22:16:41 +08:00
samuele3hu 1bea6a52a2 Update comments of some header files 2015-03-25 18:54:33 +08:00
andyque f32b59d565 ignore GUIDefine.h 2015-03-25 18:24:35 +08:00
andyque 248325d055 Add missing comments for UI modules 
Squashed commit of the following:

commit eb23bf8972d1a580db537f3d341091eaeb99d626
Author: andyque <guanghui8827@126.com>
Date:   Wed Mar 25 17:08:07 2015 +0800

    finish all the documents

commit a64ec4196eb1b41771ac2f7b2ba48845d22b6211
Author: andyque <guanghui8827@126.com>
Date:   Wed Mar 25 09:49:33 2015 +0800

    finish scrollview

commit 4ff76623230f19dd25c4de29e2816754524570b2
Author: andyque <guanghui8827@126.com>
Date:   Tue Mar 24 21:40:26 2015 +0800

    add UIScale9Sprite comments

    Conflicts:
    	cocos/ui/UIScale9Sprite.h

commit e82a17b4e3cd07a03d4bfc906b0dc94d1fa08757
Author: andyque <guanghui8827@126.com>
Date:   Tue Mar 24 18:05:02 2015 +0800

    add comments for UIRichText

commit 7cbbcc6883ace0ef60a060f6c5808f4c296af4df
Author: andyque <guanghui8827@126.com>
Date:   Mon Mar 23 22:08:26 2015 +0800

    add comments for UIPageView and UIRelativeBox

commit 6fcf32a40d5407aefcba39e76aea5fb93a1a4e4a
Author: andyque <guanghui8827@126.com>
Date:   Mon Mar 23 21:12:27 2015 +0800

    finish loadingbar comments

commit 58e16b81dee833788018d913aef80e2ddd33d408
Author: andyque <guanghui8827@126.com>
Date:   Mon Mar 23 20:51:30 2015 +0800

    finished UiListView

commit 8278b3f1ee905c34dbd9c461975b1b4491eb7977
Author: andyque <guanghui8827@126.com>
Date:   Mon Mar 23 20:06:10 2015 +0800

    add comments for LayoutManager and LayoutParameter.

commit b2edfa06b83fbb0cdaf2f567c0d6f8d72e6f90c5
Author: andyque <guanghui8827@126.com>
Date:   Mon Mar 23 17:09:17 2015 +0800

    finish comments for UILayoutComponent

commit 730b5bc9c1a18139fbdef331b16c58b928cf999f
Author: andyque <guanghui8827@126.com>
Date:   Fri Mar 20 14:07:58 2015 +0800

    add missing comments

commit cecd97e830492e58dd07a2b1f5d0e87f19144856
Author: andyque <guanghui8827@126.com>
Date:   Fri Mar 20 09:31:51 2015 +0800

    add comments

commit ca0a6033bf61c7fc9caf70719ee5ea651953f580
Author: andyque <guanghui8827@126.com>
Date:   Thu Mar 19 21:02:36 2015 +0800

    add missing docs for UIButton, UILayout, UIIMageview and UIWidget

commit df98454583553e80d2ef4f72cc58de4b433f43c7
Author: andyque <guanghui8827@126.com>
Date:   Thu Mar 19 14:02:05 2015 +0800

    add missing comments for UIHbox and UIHelper

commit 4baf76dd92672b745d3d84e47e5fed8c680b01c7
Author: andyque <guanghui8827@126.com>
Date:   Thu Mar 19 11:28:32 2015 +0800

    add comments for UICheckbox

commit 77c4080b3c70268b6a07cfa12d1e9319c86a2f38
Author: andyque <guanghui8827@126.com>
Date:   Thu Mar 19 00:01:42 2015 +0800

    update coments

commit 4506327ace5b7786ee8b490aab1653462a834418
Author: andyque <guanghui8827@126.com>
Date:   Wed Mar 18 20:32:57 2015 +0800

    add comments for UIEditbox

commit 4937f30adb8912a02ab10353b6cc5fe2eed9d4bf
Author: andyque <guanghui8827@126.com>
Date:   Wed Mar 18 10:51:20 2015 +0800

    add missing comments for UIEditBox

commit 64a48c6b09f4eaf6b84cc8446ef59d382cf8767b
Author: andyque <guanghui8827@126.com>
Date:   Wed Mar 18 10:12:08 2015 +0800

    fix indentation problem

commit b38c921c114bb4a707be0f29dcdf8c46e43a445a
Author: andyque <guanghui8827@126.com>
Date:   Wed Mar 18 10:08:46 2015 +0800

    add missing comments for CCIMEDispatcher

commit 4412cf52429f22351a5c9fbb7c392bca64c2a2c6
Author: andyque <guanghui8827@126.com>
Date:   Wed Mar 18 09:57:52 2015 +0800

    add missing documents for CCIMedelegate

commit 53d3242f2cafde2bebedebe8353c6be625e5ce84
Author: andyque <guanghui8827@126.com>
Date:   Wed Mar 18 09:43:33 2015 +0800

    add missing documentation for CCTilemapatlas

commit 1f6183086b6e21557e5b05bf4cede43d472611a1
Author: andyque <guanghui8827@126.com>
Date:   Wed Mar 18 09:38:59 2015 +0800

    add missing comments for CCTextfieldttf

commit a7fe234153cebc4113cc97064d20dfd3515f9611
Author: andyque <guanghui8827@126.com>
Date:   Tue Mar 17 22:03:31 2015 +0800

    supplement comments for ProtectedNode

commit 3b02d22850b6a9e99e779ca09e5ce0b5bf24d602
Author: andyque <guanghui8827@126.com>
Date:   Tue Mar 17 21:55:03 2015 +0800

    add comments to CCMenuitem.h

commit 58e054c5cd28986e4420c2ae44af7e9a2beab4ce
Author: andyque <guanghui8827@126.com>
Date:   Tue Mar 17 21:36:14 2015 +0800

    add comments to Menu
 2015-03-25 18:17:58 +08:00
yinjimmy 75a7927bad Load all lua module as default 2015-03-25 16:35:11 +08:00
minggo cb07aa4ae2 Merge pull request #11091 from super626/v3 
fix memory leak
 2015-03-25 16:16:28 +08:00
yangxiao c6af12bcd9 use CC_SAFE_DELETE 2015-03-25 14:33:53 +08:00
zhukaixy 54472497a4 fix comments 2015-03-25 13:43:55 +08:00
minggo 518536964f Merge pull request #11142 from CocosRobot/update_lua_bindings_1427255864 
[AUTO]: updating luabinding automatically
 2015-03-25 13:36:49 +08:00
minggo 326233ab02 Merge pull request #11105 from pipu/TextAtlas_parse_avoid_crash 
Avoid crash during parse TextAtlas.
 2015-03-25 13:36:28 +08:00
CocosRobot 1ced296b58 [AUTO]: updating luabinding automatically 2015-03-25 03:59:57 +00:00
minggo 5604c98558 Merge pull request #11122 from chengstory/AvoidTimelineCrash 
Avoid timeline crash when custom widget is placed in scene.
 2015-03-25 11:44:54 +08:00
minggo d67bd549f1 Merge pull request #11135 from fusijie/cocosapi 
[ci skip]add comments.
 2015-03-25 11:10:31 +08:00
minggo 51329ac130 Merge pull request #11136 from WenhaiLin/v3-doxygen 
[ci skip]Update comments.
 2015-03-25 11:10:08 +08:00
WenhaiLin f13065a038 [ci skip]Update comments 2015-03-25 11:07:11 +08:00
WenhaiLin 153d697f1a [ci skip]Update comments. 2015-03-25 10:59:04 +08:00
Jacky 8b57b66f16 add comments. 2015-03-25 10:13:17 +08:00
lvlong 7efd4c2df6 replace setAdditionnalTransform() 2015-03-25 10:04:51 +08:00
minggo 1f4d7c598f Merge pull request #11126 from samuele3hu/v3_5_test 
[ci skip]Update comments of some header files
 2015-03-25 09:53:28 +08:00
minggo bed7746459 Merge pull request #11120 from fusijie/cocosapi 
[ci skip]add comments.
 2015-03-25 09:49:52 +08:00
minggo 671be8e157 Merge pull request #11131 from natural-law/v3 
[ci skip] Update the group of CCClippingRectangleNode.
 2015-03-25 09:48:41 +08:00
zhangbin 2f7397f6b9 Update the group of CCClippingRectangleNode. 2015-03-25 09:46:00 +08:00
Huabing.Xu 63a65b1dd1 [ci skip]update comments CCAffineTransform.h 2015-03-24 23:29:41 +08:00
Huabing.Xu d06d575e6e Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_comments 2015-03-24 23:01:18 +08:00
samuele3hu f3890d3bb3 Update comments of some header files 2015-03-24 21:52:56 +08:00
samuele3hu 020b3ba5cb Update comments of some header files 2015-03-24 21:46:18 +08:00
Huabing.Xu 133955dba1 [ci skip]update comments CCGrid.h CCGrabber.h CCGLBufferNode.h 2015-03-24 21:34:20 +08:00
Huabing.Xu b84c1f2c2c [ci skip]update comments CCGeometry.h 2015-03-24 21:33:55 +08:00
Huabing.Xu e6d1dcef58 Merge pull request #11123 from WenhaiLin/v3-doxygen 
V3 doxygen
 2015-03-24 20:33:17 +08:00
WenhaiLin 89f9ae044d [ci skip]Update comments 2015-03-24 20:29:13 +08:00
WenhaiLin 9dd778edb0 [ci skip]Update comments 2015-03-24 20:23:51 +08:00
zhangcheng e2e0ed0595 Avoid timeline crash when custom widget is placed in scene. 2015-03-24 19:59:27 +08:00
Huabing.Xu 9923a0b575 [ci skip]update comments Mat4.h, MathUtil.h, Quaternion.h 2015-03-24 19:27:13 +08:00
Jacky 32f37b8701 [ci skip]add comments. 2015-03-24 18:22:52 +08:00
lvlong 5ce4fbe6df merge node transform problem！！！ 2015-03-24 17:59:24 +08:00
minggo 9e9d263a17 Merge pull request #11114 from VisualSJ/v3-docs 
[ci skip] Add javascript notes...
 2015-03-24 17:40:40 +08:00
VisualSJ 6590d34bda [ci skip] Add javascript notes... 
cocos/base/CCEventListener.h
  cocos/base/CCEventListenerAcceleration.h
  cocos/base/CCEventListenerController.h
  cocos/base/CCEventListenerCustom.h
  cocos/base/CCEventListenerFocus.h
  cocos/base/CCEventListenerKeyboard.h
  cocos/base/CCEventListenerMouse.h
  cocos/base/CCEventListenerTouch.h
  cocos/base/CCEventMouse.h
  cocos/base/CCEventTouch.h
 2015-03-24 16:37:09 +08:00
CocosRobot 08919a1445 [AUTO]: updating luabinding automatically 2015-03-24 08:35:26 +00:00
minggo e50a71609f Merge pull request #11071 from pipu/reconstruct_ColorFrame 
Reconstruct ColorFrame.
 2015-03-24 16:29:55 +08:00
lvlong 5c20d49cd7 Merge branch 'v3' of github.com:super626/cocos2d-x into v3 2015-03-24 16:07:42 +08:00
lvlong 6e6b2c1869 fix bug: load *.obj can't load sub-mesh material. 2015-03-24 16:03:51 +08:00
zhukaixy 3b8a796404 config project config file for cocos2d-win8.1-universal 2015-03-24 16:01:06 +08:00
pipu 90da9dbee5 Avoid crash during parse TextAtlas. 2015-03-24 15:59:21 +08:00
zhukaixy aa0193044b discard modify of lua_cocos2dx_3d_auto.cpp 2015-03-24 15:49:24 +08:00
zhukaixy 6eaa78d1cb add reload mechanism for TextureCube and Skybox 2015-03-24 15:43:59 +08:00
minggo 9cb02c800a Merge pull request #11102 from WenhaiLin/v3-doxygen 
[ci skip]Update comments
 2015-03-24 15:15:40 +08:00
WenhaiLin 3b555be91a [ci skip]Update comments 2015-03-24 15:13:05 +08:00
WenhaiLin 9e7e819eab [ci skip]Update comments 2015-03-24 14:43:54 +08:00
WenhaiLin 2caff4e64d [ci skip]Update comments 2015-03-24 14:12:58 +08:00
minggo 8f9eb6ce22 Merge pull request #11097 from CocosRobot/update_lua_bindings_1427167387 
[AUTO]: updating luabinding automatically
 2015-03-24 14:01:35 +08:00
WenhaiLin 8ae81e6c7a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-doxygen 2015-03-24 11:43:09 +08:00
minggo 6cc8fb4348 Merge pull request #11092 from fusijie/cocosapi 
[ci skip]update headers' module name.
 2015-03-24 11:27:54 +08:00
WenhaiLin 1450dfbc7b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-doxygen 2015-03-24 11:26:10 +08:00
CocosRobot 9d886cc5f2 [AUTO]: updating luabinding automatically 2015-03-24 03:25:31 +00:00
minggo 4973de2b25 add more doxygen document 2015-03-24 11:15:40 +08:00
minggo 14574bdd41 add doxygen comment of CCFileUtils.h 2015-03-24 10:34:44 +08:00
Jacky af12891cfc [ci skip]update headers' module name. 2015-03-24 10:34:41 +08:00
yangxiao fad4fb8e6f fix memory leak 2015-03-24 10:22:55 +08:00
minggo 9976885d37 Merge pull request #11079 from fusijie/cocosapi 
add comments.
 2015-03-24 09:50:19 +08:00
minggo 73a3051417 Merge pull request #11087 from CocosRobot/update_lua_bindings_1427121273 
[AUTO]: updating luabinding automatically
 2015-03-24 09:49:54 +08:00
minggo 13062a36fb Merge pull request #11088 from minggo/disable-travis-building 
[ci skip]Disable travis building
 2015-03-24 09:46:22 +08:00
CocosRobot 0fb2aeb2b2 [AUTO]: updating luabinding automatically 2015-03-23 14:37:03 +00:00
minggo 2dfc0e11db Merge pull request #11081 from VisualSJ/v3-docs 
[ci skip] Add javascript notes...
 2015-03-23 22:18:34 +08:00
minggo 67e0cd20d2 Merge pull request #11080 from SuYaoHui/cocosapi 
[ci skip]Action,Sprite,TmxTiledMap,UTF8,GLView....
 2015-03-23 22:18:00 +08:00
WenhaiLin 78a8ba7f98 [ci skip]Update comments 2015-03-23 22:17:59 +08:00
minggo 7f60b1cea2 Merge pull request #11078 from calfjohn/v3 
[ci skip] Add documents for Texture2D\TextureAtlas\TextureCache
 2015-03-23 22:16:56 +08:00
minggo e86e954abf add doxygen comment for CCVector.h 2015-03-23 22:13:04 +08:00
Huabing.Xu 92b110ce25 [ci skip]update comments Vec2/3/4.h TransformUtils.h 2015-03-23 21:49:36 +08:00
Huabing.Xu b14cf9b775 Merge pull request #11082 from dabingnn/v3_comments 
V3 comments
 2015-03-23 21:48:00 +08:00
Huabing.Xu 044c954155 [ci skip] update comments CCGLGroupCommand.h 2015-03-23 21:36:01 +08:00
Huabing.Xu 027106c9ee [ci skip] update comments CCGLProgramStateCache.h, CCPrimitive.h CCPrimitiveCommand.h 2015-03-23 21:19:02 +08:00
Zhe Wang 8e2e1e5723 Add comments of async load, to avoid confusions of developers. 2015-03-23 20:58:16 +08:00
Huabing.Xu 126186e413 [ci skip]update comments CCMathBase.h CCGLProgramState.h CCRenderer.h 2015-03-23 20:30:37 +08:00
VisualSJ b5fa6d2e95 [ci skip] Add javascript notes... 
cocos/2d/CCMotionStreak.h
  cocos/2d/CCParticleBatchNode.h
  cocos/2d/CCParticleExamples.h
  cocos/2d/CCParticleSystem.h
  cocos/2d/CCParticleSystemQuad.h
  cocos/2d/CCTransition.h
  cocos/2d/CCTransitionPageTurn.h
  cocos/base/CCConfiguration.h
  cocos/base/CCTouch.h
 2015-03-23 20:27:13 +08:00
Huabing.Xu 2dde1e69e3 Merge branch 'v3' into v3_comments 2015-03-23 20:00:31 +08:00
Jacky 7f41b091e0 add comments. 2015-03-23 18:39:27 +08:00
SuYaohui d8a033c2ef Action,Sprite,TmxTiledMap,UTF8,GLView 2015-03-23 18:37:28 +08:00
calfjohn 657f270855 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2015-03-23 17:50:53 +08:00
calfjohn ff0e852044 Add document for Texture2D\TextureAtlas\TextureCache 2015-03-23 17:50:22 +08:00
minggo 2923ad6cd6 Merge pull request #11076 from CocosRobot/update_lua_bindings_1427099413 
[AUTO]: updating luabinding automatically
 2015-03-23 16:34:17 +08:00
minggo 3f9862d008 Merge pull request #11075 from CocosRobot/update_lua_bindings_1427099254 
[AUTO]: updating luabinding automatically
 2015-03-23 16:33:07 +08:00
CocosRobot 9f17ed6bed [AUTO]: updating luabinding automatically 2015-03-23 08:32:54 +00:00
CocosRobot 01930b408e [AUTO]: updating luabinding automatically 2015-03-23 08:29:35 +00:00
minggo 3180f21640 Merge pull request #11068 from minggo/add-documentation 
[ci skip]update document for CCValue.h
 2015-03-23 16:25:38 +08:00
minggo c587d19e8b Merge pull request #11059 from SuYaoHui/cocosapi 
add comments.
 2015-03-23 16:24:22 +08:00
minggo 4143eae713 Merge pull request #11061 from fusijie/cocosapi 
add comments.
 2015-03-23 16:23:51 +08:00
pipu 787225ce21 Make _alpha of ColorFrame become deprecated attribute. 2015-03-23 15:45:32 +08:00
pipu c068e60aa6 Reconstruct ColorFrame. 2015-03-23 13:37:24 +08:00
SuYaohui 6310e75071 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into cocosapi 2015-03-23 11:35:30 +08:00
minggo 27c4104ca7 Merge pull request #11049 from MSOpenTech/v3-wp8-shaders 
Edit V3 updated precompiled shaders for WP8
 2015-03-23 11:28:18 +08:00
CocosRobot ef631d743c [AUTO]: updating luabinding automatically 2015-03-23 03:20:47 +00:00
minggo dda85fcb02 Merge pull request #11027 from tangziwen/doc 
add 3D doc, fixed typo
 2015-03-23 10:45:41 +08:00
Jacky cc09b84153 add comments. 2015-03-21 18:02:56 +08:00
SuYaohui 367fb6ed4c add comments. 2015-03-21 17:06:26 +08:00
Dale Stammen fc94659fd5 updated precompiled shaders for WP8 2015-03-20 23:50:48 -07:00
CocosRobot fd7ac235ce [AUTO]: updating luabinding automatically 2015-03-21 04:55:48 +00:00
dingpinglv ef56088886 Issue: Added js Annotates to CCNode.h 2015-03-21 11:07:39 +08:00
dingpinglv b30b6db09b Issue: added js annotates to CCLayer.h 2015-03-21 10:23:42 +08:00
zhukaixy 52280e6376 add 3d test case(skybox and texture cube) for lua project 2015-03-20 17:53:05 +08:00
tangziwen 814490ab44 add 3D doc, fixed typo 2015-03-20 17:20:22 +08:00
samuele3hu 865aa886a9 Update comments of some header files 2015-03-20 14:39:33 +08:00
minggo 7c4f8b238d Merge pull request #11014 from pipu/InnerActionSpeed_flatbuffer_data 
Create flat buffer format data for "InnerActionSpeed".
 2015-03-20 13:39:09 +08:00
CocosRobot 7ea110134c [AUTO]: updating luabinding automatically 2015-03-20 04:53:00 +00:00
Huabing.Xu abaa8dba77 update comments 2015-03-20 11:24:52 +08:00
pipu 8791e36d3f Create flat buffer format data for "InnerActionSpeed". 2015-03-20 11:10:22 +08:00
minggo f3398eafbf Merge pull request #11008 from andyque/change-jenkins-to-use-msbuild 
use msbuild in windows slaves
 2015-03-20 10:38:50 +08:00
andyque a29a298ec3 fix wrong comment 2015-03-20 09:49:34 +08:00
Huabing.Xu d075a2bf86 Merge pull request #11009 from dabingnn/v3_comments 
[ci skip] update comments in renderer folder
 2015-03-20 09:47:30 +08:00
Huabing.Xu 055b71569a [ci skip] update comments in renderer folder 2015-03-20 09:46:08 +08:00
minggo a5eca355fd Merge pull request #11005 from CocosRobot/update_lua_bindings_1426774505 
[AUTO]: updating luabinding automatically
 2015-03-20 09:28:57 +08:00
CocosRobot 7da412a4e1 [AUTO]: updating luabinding automatically 2015-03-19 14:17:17 +00:00
minggo 78ff70a8f6 Merge pull request #10972 from pipu/fix_armaturenode_load 
Avoid crash during parse armature node.
 2015-03-19 22:10:34 +08:00
minggo d28e5d61b6 Merge pull request #10998 from dingpinglv/Iss_Annotate 
[ci skip] Added js annotates to -x
 2015-03-19 22:09:43 +08:00
minggo 8e019de83b Merge pull request #11003 from fusijie/cocosapi 
[ci skip]add comments to CCLayer & CCNode & CCConfiguration.
 2015-03-19 22:09:20 +08:00
minggo f4e2469730 update document for CCValue.h 2015-03-19 21:52:56 +08:00
minggo 0648ac7ca0 Merge pull request #11004 from SuYaoHui/cocosapi 
[ci skip]NodeGrid,Config,NS,ApplicationProtocol,ProgressTimer
 2015-03-19 21:47:32 +08:00
dingpinglv de73f25e42 Corrected some wrong indent in CCScene.h and CCSpriteFrameCache.h 2015-03-19 21:44:44 +08:00
SuYaohui 5e236fd753 progressTimer,ApplicationProtocol 2015-03-19 21:42:31 +08:00
Jacky 85c04ff605 [ci skip]add comments to CCLayer & CCNode & CCConfiguration. 2015-03-19 21:41:40 +08:00
dingpinglv 41822ef131 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Iss_Annotate 2015-03-19 21:27:52 +08:00
dingpinglv 3413c716df Issue: Added js annotates to CCScheduler.h 2015-03-19 21:25:09 +08:00
minggo 8e32933dd3 Merge pull request #10340 from seobyeongky/network_bugfix2 
receive content data even though status code is not 2xx
 2015-03-19 21:12:51 +08:00
SuYaohui c295952c71 NodeGrid,Config,NS,ApplicationProtocol 2015-03-19 21:03:28 +08:00
dingpinglv c03703ddab Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Iss_Annotate 2015-03-19 21:01:17 +08:00
dingpinglv 069791a0a2 Corrected a wrong indent in CCSpriteFrameCache.h 2015-03-19 21:00:33 +08:00
minggo 35078b70da Merge pull request #10997 from CocosRobot/update_lua_bindings_1426768076 
[AUTO]: updating luabinding automatically
 2015-03-19 20:44:33 +08:00
CocosRobot 21e46efb00 [AUTO]: updating luabinding automatically 2015-03-19 12:30:15 +00:00
dingpinglv 67169443df Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Iss_Annotate 
Conflicts:
	cocos/audio/include/SimpleAudioEngine.h
 2015-03-19 20:28:29 +08:00
dingpinglv baa723a899 Issue : Added js annotates to CCController.h 2015-03-19 20:26:44 +08:00
Vincent Yang 93ccdae7df Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2015-03-19 20:22:59 +08:00
Vincent Yang ca4c71bf0e Add MainPageWhiteBook.h, and move doxygen_modules.h to docs. 2015-03-19 20:21:40 +08:00
dingpinglv 1b179c2b02 Issue : added js annotates to SimpleAudioEngine, CCVertexIndexBuffer.h, CCVertexIndexData.h 2015-03-19 20:20:16 +08:00
minggo 0b19781d8c Merge pull request #10989 from pipu/serialize_InnerActionSpeed 
Serialize attribute "InnerActionSpeed" during create from .csd file.
 2015-03-19 20:11:34 +08:00
minggo 1539b5de78 Merge pull request #10991 from VisualSJ/v3-docs 
Add javascript notes...
 2015-03-19 20:09:41 +08:00
minggo 8075cc1602 Merge pull request #10986 from samuele3hu/v3_5_comment 
[ci skip]Update comments of some header files
 2015-03-19 20:01:43 +08:00
minggo f3e518b103 Merge pull request #10985 from dabingnn/v3_fixRenderTextureCrash 
fix crash problem when switch to a new scene after call RenderTexture::s...
 2015-03-19 20:00:31 +08:00
minggo 5601eed02f Merge pull request #10987 from samuele3hu/v3_5_f_bug 
issue #10875: fix a lua bindings bug for GLProgram::setUniformLocationF32
 2015-03-19 19:59:28 +08:00
dingpinglv 7a50af4407 Issue : added js annotate to CCLight.h 2015-03-19 19:54:46 +08:00
dingpinglv 194c8d8f17 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Iss_Annotate 2015-03-19 19:46:01 +08:00
VisualSJ f87b06a1c8 Add javascript notes... 
cocos/2d/CCAction.h
  cocos/2d/CCActionCamera.h
  cocos/2d/CCActionCatmullRom.h
  cocos/2d/CCActionInstant.h
  cocos/2d/CCActionInterval.h
  cocos/2d/CCActionManager.h
  cocos/audio/include/AudioEngine.h
  cocos/audio/include/SimpleAudioEngine.h
 2015-03-19 18:41:11 +08:00
calfjohn 97048c8fdc Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2015-03-19 18:00:08 +08:00
calfjohn c2cded367c add document for physics 2015-03-19 17:58:08 +08:00
pipu e9b6ca724d Serialize attribute "InnerActionSpeed" during creating project node from .csd file for cocosstudio simulator. 2015-03-19 17:54:26 +08:00
samuele3hu 5a5acc624a issue #10875: fix a lua bindings bug for GLProgram::setUniformLocationF32 2015-03-19 17:31:57 +08:00
samuele3hu 1eb1057875 Update comments of some header files 2015-03-19 16:59:21 +08:00
samuele3hu 31b34ddf77 Update comments of some header files 2015-03-19 16:45:53 +08:00
Huabing.Xu 8b04a15ee8 fix crash problem when switch to a new scene after call RenderTexture::saveToFile() 2015-03-19 16:39:45 +08:00
CocosRobot 0afd385412 [AUTO]: updating luabinding automatically 2015-03-19 08:29:09 +00:00
Vladimir Perminov 133be7e57f Clean possible GL error 
CHECK_GL_ERROR_DEBUG work debug only.
Clean need for correct check glTexImage2D and glCompressedTexImage2D

Release now work: If gl error before any code, initWithMipmaps return
false always
 2015-03-19 11:10:49 +03:00
zhangbin f196d213ee Solve the error format of comments in header files. 2015-03-19 15:59:58 +08:00
zhukaixy 0587122ccc Move Skybox.shader from Sprite3DTest to Shader3D folder 2015-03-19 15:11:24 +08:00
minggo a8471dd507 Merge pull request #10978 from natural-law/v3 
[ci skip] Update comments of some header files.
 2015-03-19 13:42:48 +08:00
zhangbin d755a7b46a Update comments of some header files. 2015-03-19 13:41:21 +08:00
minggo a8d29b6122 Merge pull request #10970 from CocosRobot/update_lua_bindings_1426737203 
[AUTO]: updating luabinding automatically
 2015-03-19 11:56:41 +08:00
minggo 1d37016912 Merge pull request #10962 from dingpinglv/Iss_Annotate 
[ci skip] added js annotate to classes
 2015-03-19 11:56:07 +08:00
CocosRobot f2c49b3311 [AUTO]: updating luabinding automatically 2015-03-19 03:55:42 +00:00
minggo 194510dacc Merge pull request #10969 from pipu/parse_csd_position 
Fix that parse position from .csd file.
 2015-03-19 11:53:31 +08:00
minggo b3d9b72f27 Merge pull request #10944 from pipu/manage_actiontimelinedata_reference 
Manage reference count of ActiontimelineData object.
 2015-03-19 11:53:07 +08:00
minggo aec86d7e61 Merge pull request #10967 from VisualSJ/v3-docs 
Add javascript notes...
 2015-03-19 11:52:44 +08:00
pipu c1f147b7a1 Avoid crash during parse armature node. 2015-03-19 11:51:34 +08:00
minggo 74de66a286 Merge pull request #10964 from CocosRobot/update_lua_bindings_1426687157 
[AUTO]: updating luabinding automatically
 2015-03-19 11:49:54 +08:00
pipu 46741e1035 Fix that parse position from .csd file. 2015-03-19 11:22:11 +08:00
minggo b469f460c7 Merge pull request #10968 from WenhaiLin/v3-update-document 
[ci skip]Update document
 2015-03-19 10:46:06 +08:00
WenhaiLin e528531b4b [ci skip]Update document 2015-03-19 10:38:12 +08:00
VisualSJ 62b3f537ce Add javascript notes...Fixed error 2015-03-19 10:33:11 +08:00
SuYaohui 2edb7f7d50 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into cocosapi 2015-03-19 10:05:24 +08:00
SuYaohui bc2b897dc6 ProgressTimer 2015-03-19 10:00:30 +08:00
dingpinglv 9be573e92f Added js annotate to CCSpriteFrameCache.h 2015-03-18 22:24:03 +08:00
dingpinglv 4bb78a2eec Added js annotate to CCScene.h 2015-03-18 22:08:50 +08:00
CocosRobot b7881eab88 [AUTO]: updating luabinding automatically 2015-03-18 14:02:42 +00:00
dingpinglv ee44f024f1 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Iss_Annotate 
Conflicts:
	cocos/2d/CCActionGrid.h
	cocos/2d/CCAnimation.h
	cocos/2d/CCAnimationCache.h
	cocos/base/CCRef.h
 2015-03-18 21:58:07 +08:00
minggo 8306aaaab2 Merge pull request #10955 from dabingnn/v3_comments 
[ci skip] update comments CCRenderCommand.h
 2015-03-18 21:48:47 +08:00
minggo ddb6230c13 Merge pull request #10953 from fusijie/cocosapi 
[ci skip]update CCActionManager & CCActionInstant & CCActionInterval & CCScene & ...
 2015-03-18 21:48:28 +08:00
minggo a9f13148f4 Merge pull request #10961 from minggo/add-documentation 
[ci skip]update document for ccUtils.h
 2015-03-18 21:46:20 +08:00
dingpinglv a99c2c7893 Issue : added js annotate to CCActionGrid.h, CCAnimation.h, CCAnimationCache.h, CCAtlasNode.h, CCRef.h 2015-03-18 21:45:58 +08:00
minggo 7f825d3dae update document for ccUtils.h 2015-03-18 21:45:00 +08:00
VisualSJ 3576df4b89 Add javascript notes... 
cocos/base/CCDirector.h
 2015-03-18 21:39:50 +08:00
VisualSJ 785214ae12 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-docs 
Conflicts:
	cocos/base/CCAutoreleasePool.h
	cocos/base/CCData.h
 2015-03-18 21:38:56 +08:00
minggo bf0d48e483 Merge pull request #10957 from natural-law/v3 
[ci skip] Update comments of some header files.
 2015-03-18 21:33:13 +08:00
minggo 0267faa7d1 Merge pull request #10958 from minggo/add-documentation 
[ci skip]update document for CCUserDefault.h
 2015-03-18 21:27:13 +08:00
minggo 85811bd710 update document for CCUserDefault.h 2015-03-18 21:24:31 +08:00
zhangbin f31a833df4 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2015-03-18 21:10:17 +08:00
zhangbin a5e148c829 Update comments of some header files. 2015-03-18 20:56:17 +08:00
VisualSJ cb50c7d89a Add javascript notes... 
cocos/2d/CCActionPageTurn3D.h
  cocos/base/CCAutoreleasePool.h
  cocos/base/CCData.h
 2015-03-18 20:51:18 +08:00
minggo 660cfdf964 Merge pull request #10954 from minggo/add-documentation 
[ci skip]Add documentation
 2015-03-18 20:43:33 +08:00
Jacky 2d50327323 update CCActionManager & CCActionInstant & CCActionInterval & CCScene & CCSpriteFrame & CCSpriteFrameCache 2015-03-18 20:40:29 +08:00
minggo 19fc6a1495 update document for CCScheduler.h 2015-03-18 20:37:43 +08:00
minggo 10703bce66 Merge pull request #10952 from SuYaoHui/cocosapi 
[ci skip]Action,ActionCamera,ActionCatmullRom,Animation,AnimationCache,AtlasNode
 2015-03-18 20:33:00 +08:00
Huabing.Xu 0c8218581f [ci skip] update comments CCRenderCommand.h 2015-03-18 20:30:52 +08:00
SuYaohui 31944da08c [ci skip]Action,ActionCamera,ActionCatmullRom,Animation,AnimationCache,AtlasNode 2015-03-18 20:26:16 +08:00
Huabing.Xu 431b3593a7 [ci skip] update comments CCQuadCommand.h 2015-03-18 20:12:34 +08:00
calfjohn e67a57512f Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2015-03-18 20:10:16 +08:00
SuYaohui ee8776f041 [ci skip]Action,ActionCamera,ActionCatmullRom,Animation,AnimationCache,AtlasNode 2015-03-18 20:07:00 +08:00
Huabing.Xu a87c5755e9 [ci skip] update comments CCTrianglesCommand.h 2015-03-18 19:52:08 +08:00
Huabing.Xu 4ae4500a68 [ci skip]adjust comments 2015-03-18 19:32:10 +08:00
minggo 359e25327d Merge pull request #10946 from natural-law/v3 
[ci skip] Update comments of some header files.
 2015-03-18 18:25:31 +08:00
zhangbin b55916c283 Update comments of some header files. 2015-03-18 18:15:34 +08:00
Huabing.Xu fb1d9899c7 [ci skip]adjust comments CCVertexIndexBuffer.h and CCVertexIndexData.h 2015-03-18 17:40:10 +08:00
Huabing.Xu a71fb9f946 [ci skip]update comments CCVertexIndexBuffer.h 2015-03-18 17:18:25 +08:00
pipu e7c89dadf1 Manage reference count of ActiontimelineData object in ObjectExtensionData. 2015-03-18 16:56:16 +08:00
calfjohn 83e69f4532 add comments for PhysicsWorld 2015-03-18 16:35:38 +08:00
minggo 0408fc0667 update document for CCRef.h 2015-03-18 15:02:03 +08:00
Huabing.Xu eb2786f40d [ci skip]update comments CCVertexIndexData.h 2015-03-18 14:43:44 +08:00
minggo aa5f257243 Merge pull request #10938 from minggo/add-documentation 
[ci skip]Add documentation
 2015-03-18 14:11:30 +08:00
minggo 723244f62d Merge pull request #10932 from lyubomirv/v3-bulgarian 
Added Bulgarian language.
 2015-03-18 14:01:26 +08:00
minggo 5271c75c11 Merge pull request #10936 from super626/v3 
Camera mask for label
 2015-03-18 14:00:44 +08:00
minggo eeebe97547 Merge pull request #10937 from CocosRobot/update_lua_bindings_1426657990 
[AUTO]: updating luabinding automatically
 2015-03-18 13:57:08 +08:00
CocosRobot 611ec0a4a5 [AUTO]: updating luabinding automatically 2015-03-18 05:55:07 +00:00
Huabing.Xu edf785cec3 [ci skip]update version 2015-03-18 13:52:52 +08:00
yangxiao 44af57459e add comment 2015-03-18 11:58:36 +08:00
yangxiao 21d581a72c set camera mask when member created 2015-03-18 11:41:43 +08:00
pipu faf9d6b01c Avoid crash during parse .csd file. 2015-03-18 10:28:12 +08:00
minggo be2af44583 update document for CCDirector.h 2015-03-17 22:32:26 +08:00
lyubomirv 2aec39ad56 Added Bulgarian language. 2015-03-17 15:14:02 +02:00
minggo 44c04153a6 update document for CCDataVisitor.h 2015-03-17 20:54:47 +08:00
minggo 36bf7c6d39 update document for CCAutoreleaseData.h 2015-03-17 20:49:00 +08:00
minggo 5b55e873d0 update document for CCAutoreleasePool.h 2015-03-17 20:15:50 +08:00
minggo 1e271a9d96 Merge pull request #10899 from super626/v3 
Bug fix
 2015-03-17 19:29:21 +08:00
songchengjiang 73caf536da fix the bug of lighting shader 2015-03-17 16:43:08 +08:00
lvlong 3ce0449c97 decompose 2015-03-17 15:17:23 +08:00
CocosRobot 9df3f57e0d [AUTO]: updating luabinding automatically 2015-03-17 06:28:14 +00:00
minggo aa573a9553 Merge pull request #10904 from pipu/fixed_widget_reader_actiontag 
Optimize parse action tag for node and widget.
 2015-03-17 14:18:22 +08:00
minggo f51e2b9537 Merge pull request #10912 from perminovVS/v3-dev-console 
Create Console before any sub systems
 2015-03-17 14:17:35 +08:00
lvlong 733a89100e remove old code! 2015-03-17 13:13:03 +08:00
lvlong 080132d072 modify sub node transform! 2015-03-17 12:15:03 +08:00
Dale Stammen 5606fad642 Merge branch 'v3' into v3-wp8-fix 2015-03-16 20:47:55 -07:00
Vincent Yang 6bbb89a098 Add doxygen config for white book and cocos/doxygen_modules.h for doc mudules. 2015-03-17 11:26:33 +08:00
Dale Stammen 65c83378d0 Merge branch 'v3' into v3-wp8-fix 2015-03-16 20:22:28 -07:00
minggo f7d5a16734 Merge pull request #10873 from konopka/fix_compiler_override_warnings 
Fix compiler override warnings
 2015-03-17 10:38:19 +08:00
Vladimir Perminov e745d5949a Create Console before any sub systems 
Sub system use cocos2d::log in constructors.
 2015-03-16 20:22:20 +03:00
Petr Babička fa245c44b9 Spaces instead of tabs 2015-03-16 17:22:17 +01:00
Alok Sahay 80576b5903 Don't set scale and loadHTMLString on nil. 2015-03-16 17:00:01 +01:00
konopka 0387b13bb6 Adding missing virtual keywords 2015-03-16 16:39:43 +01:00
konopka 7fb79272ca Undo changes that are not allowed by spine license 2015-03-16 16:35:41 +01:00
Dale Stammen e2a5eb2f9f updated to Angle ddbf057c52 2015-03-16 08:18:26 -07:00
Dale Stammen 08ceae3de2 removed no-gl_PointSize shaders for Windows Phone 8.1 2015-03-16 08:08:02 -07:00
pipu a5e9ebc4e6 Fix parse action tag for widget. 2015-03-16 20:04:59 +08:00
yangxiao 8b3e116ed6 check running scene 2015-03-16 18:04:50 +08:00
Dale Stammen ef5e6fc473 fixed use of Color4B 2015-03-16 02:17:05 -07:00
yangxiao 5b26ba3c68 override setCameraMask 2015-03-16 17:11:17 +08:00
yangxiao f56d8c4784 fix camra mask for label does not work 2015-03-16 15:31:29 +08:00
CocosRobot a3ddd92307 [AUTO]: updating luabinding automatically 2015-03-16 07:11:12 +00:00
minggo f25be54e95 Merge pull request #10671 from kpkhxlgy0/v3 
enable setWritablePath on platform win32 and mac
 2015-03-16 14:57:26 +08:00
minggo d0753674b2 Merge pull request #10514 from cpascal/uiEditBox_Win32 
Fixed missing ui::EditBox functionalities on Win32
 2015-03-16 14:56:49 +08:00
minggo 23dbbf6d99 Merge pull request #10887 from CocosRobot/update_lua_bindings_1426488653 
[AUTO]: updating luabinding automatically
 2015-03-16 14:54:26 +08:00
CocosRobot 7a4e727ee2 [AUTO]: updating luabinding automatically 2015-03-16 06:53:18 +00:00
minggo 1916bc1f1f Merge pull request #10693 from Mazyod/editbox-text-alpha-support 
Support Color4B for editbox text
 2015-03-16 14:52:36 +08:00
minggo 2ea88a30bb Merge pull request #10817 from garfieldkwong/fix_autorelease_branch 
fix issue autorelease will not release trigger by autorelease.
 2015-03-16 14:47:30 +08:00
minggo ebe5dff7a6 Merge pull request #10737 from newnon/v3_scale9_blend_func 
blending function for Scale9Sprite
 2015-03-16 14:45:08 +08:00
Martin Konopka 2c80b6ae3a Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] 2015-03-15 00:10:08 +01:00
Martin Konopka cd12d08a52 Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] 2015-03-14 19:33:15 +01:00
Nite Luo cfa1f0c84f Merge pull request #10843 from konopka/fix_compiler_reorder_warnings 
Get rid of compiler warnings: field '_xxx' will be initialized after field '_yyy'...
 2015-03-13 21:12:35 -07:00
Nite Luo 3194da4e7d Merge pull request #10720 from darkdukey/hide_cursor 
Hide cursor
 2015-03-13 10:48:15 -07:00
SunLightJuly 6871e30b8d define __G__TRACKBACK__ in cocos.init 2015-03-13 16:39:36 +08:00
CocosRobot 2f0eb6712d [AUTO]: updating luabinding automatically 2015-03-13 07:15:34 +00:00
Huabing.Xu 639ed335b3 Merge pull request #10839 from pipu/node_load_callback 
To add the function node load callback called during create node from csb file.
 2015-03-13 15:06:14 +08:00
Huabing.Xu 03c3a4d5ed Merge pull request #10836 from pipu/reconstruct_object_extension_data 
To reconstruct object extension data.
 2015-03-13 15:04:41 +08:00
CocosRobot fa2fe74986 [AUTO]: updating luabinding automatically 2015-03-13 06:19:29 +00:00
Huabing.Xu 1fa9145a56 Merge pull request #10832 from super626/v3 
fix bugs
 2015-03-13 14:13:24 +08:00
Huabing.Xu c3aea9f6c0 update version string and releaseNotes for 3.5 2015-03-13 11:51:32 +08:00
Martin Konopka 350b81501d Get rid of warnings: field '_xxx' will be initialized after field '_yyy' [-Wreorder] 
Initialization follows the order of declaration, not the order of the initialization list.
 2015-03-12 23:47:58 +01:00
pipu 56c3d1c6f6 To add the function node load callback called during create node from csb file. 2015-03-12 17:36:39 +08:00
pipu 7515fc78f5 To set csd version for serializing. 2015-03-12 16:15:17 +08:00
pipu c72c8e865d To reconstruct object extension data. 2015-03-12 15:47:15 +08:00
yangxiao 50c3a9cb4c fix removeAllChildren cause camera to be destroyed bug 2015-03-12 10:39:21 +08:00
byeonggee.seo a2274162b5 merged 2015-03-12 10:06:53 +09:00
mogemimi 8cf0ec1aca Minor refactor TMXMapInfo 
* Replace with range-based for loop
* Replace some size() with !empty()
* Refactor scope of local variable
 2015-03-12 01:21:57 +09:00
mogemimi 279604bac5 Add missing white spaces and some minor cleanups 
* Add missing white space
* Fix if-else statement without curly braces
* Fix indentation
* Clean up code
 2015-03-12 01:19:37 +09:00
mogemimi abeb269534 Remove useless (char*) cast 2015-03-12 01:14:05 +09:00
GarfieldKwong 656842d6f1 fix issue autorelease will not release trigger by autorelease. 2015-03-11 15:31:06 +08:00
minggo d2be2290a3 Merge pull request #10796 from Mazyod/http-client-mac 
Http client mac
 2015-03-11 14:26:08 +08:00
CocosRobot e079216248 [AUTO]: updating luabinding automatically 2015-03-11 02:45:36 +00:00
minggo 04393854e8 Merge pull request #10789 from fusijie/fix-moveto-reverse 
disable MoveTo::reverse()
 2015-03-11 10:39:45 +08:00
minggo c4ac2b5f47 Merge pull request #10795 from pipu/optimize_ButtonReader 
To optimize ButtonReader for source path and source.
 2015-03-11 10:05:48 +08:00
minggo c701f89329 Merge pull request #10683 from Mazyod/mac-editbox-fix 
Fix editbox on Mac
 2015-03-11 10:00:50 +08:00
pipu 90da84a663 To modify that check whether or not string is not empty. 2015-03-11 09:59:07 +08:00
Jacky 605ce58293 disable MoveTo::reverse() 2015-03-11 09:55:32 +08:00
Mazyad Alabduljaleel 983ffd96c7 Now, mac uses ObjC HTTP client 2015-03-10 14:48:57 +04:00
minggo 858178ad8e Merge pull request #10772 from super626/v3 
refactor init method
 2015-03-10 17:50:06 +08:00
pipu 00bf9f5bfb To optimize the situation that source path is existed, but source is not existed. 2015-03-10 17:48:48 +08:00
minggo afb06b5c42 Merge pull request #10770 from m2q1n9/patch-1 
fix cocostudio anchor point bug
 2015-03-10 13:40:44 +08:00
minggo 8e6d9d5dd2 Merge pull request #10740 from newnon/v3_windows_network_path 
Windows network path fix
 2015-03-10 11:25:53 +08:00
minggo f3567ba1af Merge pull request #10780 from ryule/fix_CCDevice-ios_font_stroke_alpha 
Fix CCDevice-ios.mm to have the right alpha color for a stroke effect.
 2015-03-10 11:19:29 +08:00
minggo 5ac2fb398c Merge pull request #10774 from minggo/sync-from-v4 
Label:Fixed transform not update correctly
 2015-03-10 09:54:20 +08:00
minggo a4698eaaaf Merge pull request #10781 from mogemimi/add-const-to-member-function 
Add const to Value::getDescription() function
 2015-03-10 09:49:56 +08:00
yangxiao 5131a23de4 solve conflict 2015-03-10 09:18:13 +08:00
Dale Stammen 24d706cb7a added /bigobj to C++ compiler command line options 2015-03-09 09:39:36 -07:00
Dale Stammen 35222a8193 Merge branch 'v3' into v3-wp8-fix 2015-03-09 09:20:25 -07:00
Dale Stammen a828f73ccb updated expiration date of project certificates 2015-03-09 08:31:06 -07:00
mogemimi de4105516a Add const to Value::getDescription() function 2015-03-09 22:34:24 +09:00
Jongryul Kook 0d65dd13be Fix CCDevice-ios.mm to have the right alpha color for a stroke effect. 2015-03-09 21:20:17 +09:00
WenhaiLin cd95905a04 Label:Fixed transform not update correctly if this camera mask of Label isn't visible by the current visiting camera 2015-03-09 17:26:43 +08:00
yangxiao 45bd6180ad fix create bundle using empty path 2015-03-09 17:09:18 +08:00
yangxiao ff3eba6143 refact init 2015-03-09 16:29:57 +08:00
m2q1n9 c97742072f fix cocostudio anchor point bug 
fix a bug which will cause anchor point config not work
 2015-03-09 14:30:41 +08:00
Dale Stammen a9479a1585 updated WP8 precompiled shaders 2015-03-08 21:42:27 -07:00
Dale Stammen 6cd881d8f8 added missing Particle3D files 2015-03-08 21:37:29 -07:00
Dale Stammen 362edec6d6 added missing Particle3D files 2015-03-08 21:31:43 -07:00
minggo badfa5501d Merge pull request #10723 from pipu/reconstruct_parse_callbackbind 
To reconstruct callback binding for nest node
 2015-03-09 10:55:47 +08:00
pipu c21538e6e2 Merge branch 'v3' into reconstruct_parse_callbackbind 2015-03-09 10:38:02 +08:00
CocosRobot 1f78b18d22 [AUTO]: updating luabinding automatically 2015-03-09 02:27:14 +00:00
pipu 1fa9b2577a Merge branch 'v3' into reconstruct_parse_callbackbind 2015-03-09 10:16:14 +08:00
Mazyad Alabduljaleel ce377c4a1e Fix compilation issues on Android and Win 2015-03-06 16:05:05 +04:00
yangxiao 8137b01f23 merge cocos 2015-03-06 18:31:57 +08:00
XiaoYang 27ae60e626 Merge pull request #249 from songchengjiang/particle_merge 
support win8.1
 2015-03-06 17:57:34 +08:00
minggo 2238cb0dbb Merge pull request #10546 from krishnanm86/knarasimhan_sourcerefactor_jni_audio 
Sourcr Refactor. Abstracted common functionality from two jni methods an...
 2015-03-06 16:14:59 +08:00
minggo 15853a435e Merge pull request #10738 from newnon/v3_mingw_build_fix 
MinGW build fix
 2015-03-06 15:49:13 +08:00
minggo 65926a9f0b Merge pull request #10734 from pipu/projectnode_animation_innerspeed 
Serialize and parse attribute "innerspeed" for ProjectNode.
 2015-03-06 15:43:57 +08:00
songchengjiang 4ca90341b9 support win8.1 2015-03-06 15:35:02 +08:00
minggo c96f3b135a Merge pull request #10733 from pipu/modify_layout_attribute_name 
To modify layout attribute name that are used in serialized and parsed.
 2015-03-06 15:00:33 +08:00
yangxiao 457ac3fdd7 reset unproject with viewport cocostudio using it 2015-03-06 11:29:40 +08:00
yangxiao d7c1d6b6aa add billboard to transparent queue 2015-03-06 09:57:48 +08:00
andyque e93f39fae1 fix typo 2015-03-05 17:05:08 +08:00
andyque a229793e31 fix Linux glfw linker error on v3 2015-03-05 16:34:51 +08:00
Sergey 8270355ad6 blending function for Scale9Sprite 2015-03-05 11:13:51 +03:00
Sergey de284c98ce MinGW build fix 2015-03-05 11:11:13 +03:00
Sergey Perepelitsa 215fe8a0c9 Windows network path fix 2015-03-05 11:10:03 +03:00
pipu fadac31868 Serialize and parse attribute "inner speed" for ProjectNode. 2015-03-05 15:48:17 +08:00
songchengjiang 444dbfdf9e replace .mesh with .c3b 
modify ParticleUniverse file structure
 2015-03-05 14:54:32 +08:00
pipu be1b0b7239 To modify layout attribute name that are used in serialized and parsed. 2015-03-05 14:34:35 +08:00
yangxiao faf299c5a1 make path shorter 2015-03-05 13:24:06 +08:00
Jacky c38c4a1373 fixed source coding error. 2015-03-04 18:15:05 +08:00
Krishna 35403439f3 Fixed compilation issue. Introduced missing CLASS_NAME 2015-03-04 10:48:30 +01:00
Krishna ec3a8d49f9 Fixed compilation error. 2015-03-04 10:43:31 +01:00
pipu 010a077fa8 To reconstruct callback binding for nest node as WidgetCallBackHandlerProtocol in CSLoader. 2015-03-04 17:29:40 +08:00
yangxiao ea7dfe1147 lua test 2015-03-04 10:42:08 +08:00
yangxiao 68eaadaffb merge cocos 2015-03-04 09:57:42 +08:00
Dale Stammen e93fe1b13b Merge branch 'v3' into v3-wp8-fix 2015-03-03 08:40:07 -08:00
CocosRobot 93c2b48779 [AUTO]: updating luabinding automatically 2015-03-03 15:15:43 +00:00
minggo 13e4525772 Merge pull request #10659 from super626/v3 
Remove expolosion particle
 2015-03-03 23:03:02 +08:00
cpascal db9985d7cd Added new line with the left curl bracket. 2015-03-03 20:39:25 +09:00
yangxiao 3db3d9ae11 merge cocos 2015-03-03 17:23:33 +08:00
byeonggee.seo b3335f34ae Merge branch 'network_bugfix2' of github.com:seobyeongky/cocos2d-x into network_bugfix2 2015-03-03 16:33:48 +09:00
byeonggee.seo 3811c9f1a3 connError added 2015-03-03 16:33:35 +09:00
Nite Luo 49912c2f62 clean up the formatting 2015-03-02 23:29:15 -08:00
Chad 395c14f07d Hide Cursor - Feature Request #8766 
Added the ability to hide or show the cursor on desktop builds.
 2015-03-02 23:21:18 -08:00
tangziwen 840b531a9a update 2015-03-03 14:14:50 +08:00
cpascal a6ee1451f4 changed one more indentation. 
I made mistake, (now replacing the spaces to tab)
 2015-03-03 13:44:43 +09:00
cpascal 4058e16f16 Added line break & removed function call in compare operator. 2015-03-03 13:40:40 +09:00
yangxiao 38636dc8b7 allow transition time to 0 2015-03-03 11:04:34 +08:00
yangxiao 874f7c7f99 fix transparent render bug 2015-03-03 10:42:47 +08:00
Dale Stammen 44b951a51a Merge branch 'v3' into v3-wp8-fix 2015-03-02 16:42:05 -08:00
Mazyad Alabduljaleel 9d5fdcb973 Support Color4B for editbox text 2015-03-02 15:31:59 +04:00
songchengjiang 5c460ebb2d add/update particle files 2015-03-02 13:07:32 +08:00
Mazyad Alabduljaleel 4387844176 Fix editbox on Mac 2015-03-01 23:56:18 +04:00
loadrunner 1a1c1f1ed0 added sensor property to shapes 2015-03-01 11:03:01 +02:00
kpkhxlgy0 99dea9395d enable setWritablePath on platform win32 and mac 2015-02-28 18:21:57 +08:00
yangxiao 56f3f34ee3 add Animate3D::setTransitionTime 2015-02-28 17:40:25 +08:00
CocosRobot 84fb4094fc [AUTO]: updating luabinding automatically 2015-02-28 03:23:08 +00:00
minggo 0755400a79 Merge pull request #10279 from seobyeongky/motionstreak_bug_fix 
MotionStreak MoveTo/MoveBy action OK
 2015-02-28 11:17:28 +08:00
Dale Stammen fd11984e0a disable LTCG 2015-02-27 11:21:36 -08:00
Dale Stammen e4db9f396e disable LTCG. set warning level to W3 2015-02-27 11:16:40 -08:00
Dale Stammen f68a966485 disabled Check SDL to allow CC_DEPRECATED to work as warning and not error 2015-02-27 11:07:51 -08:00
Dale Stammen e04fd6eb1d updated cocos2d dll name from 3.4 to 3.5 2015-02-27 10:54:27 -08:00
Dale Stammen d486cc78fb updated cocos2d dll name from 3.4 to 3.5 2015-02-27 10:52:32 -08:00
Dale Stammen 8bc5b37b40 removed missing include files from project 2015-02-27 10:48:53 -08:00
Dale Stammen b5e936c657 disabled LTCG to speed up release builds 2015-02-27 10:43:13 -08:00
Dale Stammen 2eb919bb7a disabled Check SDL to allow CC_DEPRECATED to work as warning and not error 2015-02-27 10:36:48 -08:00
Dale Stammen e9ef92291f renamed cocos2d dll from 3.4 to 3.5 2015-02-27 10:26:58 -08:00
Dale Stammen 49b16718a2 removed missing .h files from solution 2015-02-27 10:24:02 -08:00
seobyeongky 91b0104fd0 Fix an issue with iOS HTTP Request code (https://github.com/cocos2d/cocos2d-x/pull/10543) 2015-02-27 21:31:33 +09:00
Wenhai Lin 5af895b24d Fixed the position of physics body is wrong when the position of parent node has been change. 2015-02-27 17:55:25 +08:00
minggo 7805adce94 Merge pull request #10325 from seobyeongky/httpclient_bugfix 
HttpResponse reference counting bug fixed
 2015-02-27 14:32:41 +08:00
CocosRobot 8a310c09c0 [AUTO]: updating luabinding automatically 2015-02-27 03:54:42 +00:00
yangxiao dd070e177e modify unproject 2015-02-27 10:20:32 +08:00
yangxiao 437a59fb9a modify project & unproject api 2015-02-27 10:01:57 +08:00
yangxiao 6f395edf0e modify according to minggo 2015-02-26 17:37:45 +08:00
yangxiao f13237c013 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2015-02-26 17:27:42 +08:00
minggo e69e648d7c Merge pull request #10483 from redism/ios-network-header-fix 
apply custom request header for every request type (ios)
 2015-02-26 16:40:12 +08:00
minggo e37bbee1c2 Merge pull request #10545 from Mazyod/ios-http-request-leaks 
Fix major memory leaks in iOS http request
 2015-02-26 15:41:10 +08:00
yangxiao a1642757f9 merge setcameramask 2015-02-26 15:33:18 +08:00
yangxiao 9a64eb18dd add project function 2015-02-26 15:20:20 +08:00
Krishna 58df860b4e Made the loadeffect utility method into a static method. Removed declaration of old method from header file 2015-02-26 06:53:20 +01:00
Nite Luo dbba9e36a1 Merge pull request #10431 from vovkasm/dev/fix-win32-resource-search-path 
Fix win32 resource search path to be relative to the executable.
 2015-02-25 20:24:07 -08:00
minggo 366a938a86 Merge pull request #10603 from sun-ray/v3 
CocosStudio 3DReader
 2015-02-26 11:01:28 +08:00
minggo 5d8071bdcf Merge pull request #10597 from loadrunner/v3 
added Romanian language
 2015-02-26 10:51:46 +08:00
Ray bfb5c1ca23 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems
	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
 2015-02-26 10:44:20 +08:00
minggo 39d2f0629c [ci skip] update version 2015-02-26 10:40:30 +08:00
minggo e6ce627632 [ci skip]update version 2015-02-26 10:39:37 +08:00
minggo 31e8d0dccd Merge pull request #10521 from ryule/fix_httpclient-ios 
Fixed HttpClient-ios request to work when the data is started by 0x00.
 2015-02-26 10:32:20 +08:00
Ray 1a2aa8633f fix w8 project 2015-02-26 10:27:12 +08:00
Ray a2dc8b85c4 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2015-02-26 09:20:16 +08:00
Ray 83a7b8012c 3DParticle Reader and tests 2015-02-26 09:19:14 +08:00
Dale Stammen 38d513648a added missing UserCameraReader files to Universal App project 2015-02-25 08:33:19 -08:00
loadrunner 9e310ba272 added Romanian language 2015-02-25 17:25:19 +02:00
minggo 524c723daa Merge pull request #10587 from sun-ray/v3 
CocosStudio 3DReader
 2015-02-25 20:19:06 +08:00
Krishna 3b54af1763 Introduced missing function declarators 2015-02-25 10:26:59 +01:00
pandamicro 9bf22a51ea Fix ListView::setDirection issue 2015-02-25 16:17:43 +08:00
Mazyad Alabduljaleel 23093b9c53 Just a few more leak fixes 2015-02-25 10:56:25 +04:00
Mazyad Alabduljaleel c80312bea6 Two more memory leaks 2015-02-25 10:52:15 +04:00
Mazyad Alabduljaleel 3e60e0ddf6 For some reason, this is causing a conflict 2015-02-25 10:44:00 +04:00
Ray 2f4fbbf4e8 fix the define problem 2015-02-25 14:28:39 +08:00
Ray 94523b667a Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2015-02-25 14:19:37 +08:00
Ray c66a4f28bc Add CocosStudio UserCameraReader 
fix Sprite3DReader Test
 2015-02-25 14:19:08 +08:00
lvlong ac5d34b93d recover bundle3d 2015-02-25 10:56:01 +08:00
lvlong 2d89ee34ef recover bundle3d 2015-02-25 10:54:49 +08:00
lvlong 7437bfad15 recover bundle3D. 2015-02-25 10:33:16 +08:00
minggo c2479adc59 Merge pull request #10549 from mogemimi/fix-typo 
Fix typo in Image::Format
 2015-02-25 09:32:58 +08:00
Dale Stammen b39b078593 fixed conflict with near and far defined in windows.h for Win32, WP8 and WinRT platforms 2015-02-24 14:39:21 -08:00
minggo 0d2566c202 Merge pull request #10520 from mannewalis/v3 
adding CC_DEPRECATE(version) macro
 2015-02-24 09:30:21 +08:00
mogemimi d384f7ce1e Fix typo: unkown -> unknown 2015-02-24 02:39:50 +09:00
mogemimi 9e7ce0cd85 Fix typo in Image::Format 2015-02-24 02:36:20 +09:00
Krishna Narasimhan 80ea81884b Source refactor. Corrected compile issue 2015-02-23 13:01:19 +01:00
Krishna Narasimhan 239a5f307f Sourcr Refactor. Abstracted common functionality from two jni methods and saved space/resources 2015-02-23 10:20:12 +01:00
Ray c5cc1ebaa2 fix test project 2015-02-23 16:35:46 +08:00
Mazyad Alabduljaleel 839f1a851d One more memory leak fix: 
When you get the allHeaderFields, the net retain count is 0, because it is autoreleased.
Then, a copy message is issued +1
After that the property itself retains it +1
Total = 2, released once in the dealloc -> leak.
 2015-02-23 11:52:49 +04:00
Mazyad Alabduljaleel a2f9956d00 Fix major memory leaks in iOS http request 
... and other small fixes

Brief:

1. In iOS, whenever you have a new spawned thread with its own run loop (i.e. while true), you must wrap it with an autorelease pool, so it cleans up the objects at the end of each loop cycle.
2. There were a few "alloc" and "new" objects that weren't released.
3. The HttpAsync class itself was missing dealloc, also property assignment should use `self.property` so the previous value gets released as appropriate.
4. Resolved a small warning

**NOTE**: I have a cocos2d-x game that heavily relies on the HTTP requests, with cookies, but without SSL, so I couldn't test the SSL.
I haven't tested the cookies and SSL yet, but for starters, these improvements are meant to fix the memory issues only, not the logic.
 2015-02-23 10:38:33 +04:00
cpascal 8d9da362e5 changed indentation. 2015-02-23 11:55:27 +09:00
Ray fbe9e5b767 complate project file 2015-02-23 00:52:50 +08:00
Ray 35e3e8d62d Sprite3D Reader and tests 2015-02-23 00:34:30 +08:00
Ray 8eb201797d 工程文件修改 2015-02-19 17:52:50 +08:00
Ray 73e40f1c4b Node3DReader Test 2015-02-19 16:18:54 +08:00
Ray 2f01deee89 3D Editor Reader 
Node3DReader
 2015-02-19 12:08:09 +08:00
Jongryul Kook c05dd4357d Fixed HttpClient-ios request to work when the data is started by 0x00. 2015-02-18 16:51:12 +09:00
mannewalis 21dbc29ad1 adding CC_DEPRECATE(version) macro 2015-02-17 13:01:53 -08:00
Dale Stammen 0801160a37 added precompiled Particle3D shaders 2015-02-16 11:28:24 -08:00
Dale Stammen 76233d4c6e added missing Particle3D files and tests 2015-02-16 10:41:03 -08:00
Dale Stammen 795f65c85f added missing Particle3D files and tests 2015-02-16 10:01:09 -08:00
cpascal e7a39287f1 Fixed missing ui::EditBox functionalities on Win32 
1. There was 100-byte input limit at ui::EditBoxImplWin::openKeyboard()
2. Implemented MaxLength as LengthFilter, not ByteFilter. (same as
Android's InputFilter - LengthFilter)
3. Users can input unicode characters that is not supported by CP_ACP.
 2015-02-16 18:21:26 +09:00
CocosRobot 6a91450f7c [AUTO]: updating luabinding automatically 2015-02-15 11:53:55 +00:00
minggo c8eaa4aeba Merge pull request #10447 from super626/particle_merge 
add 3d particle (Particle Universe)
 2015-02-15 19:48:18 +08:00
minggo d5e82521de Merge pull request #10359 from flamefox/3dattachnode 
getAttachNode should failed when there is no bone with name
 2015-02-15 19:03:52 +08:00
minggo dd7d8a61ef Merge pull request #8980 from fspadoni/v3 
CCPhysicsWorld.cpp Remove cpArbiterIgnore call from collisionPreSolveCallback
 2015-02-15 18:58:17 +08:00
samuele3hu 3a7cbe9d67 Add Particle3DTest for Lua and update related configure files 2015-02-15 15:56:20 +08:00
Vladimir Perminov 9f5efe5153 Fix visual studio project out of date 
Remove 3dExport.h from project.
Change location CCPlatformConfig.h and CCPlatformMacros.h from ..\base\
to ..\platform\
 2015-02-13 11:18:14 +03:00
yangxiao 9b117bf87c resolve conflict 2015-02-13 15:46:19 +08:00
Justin Fraize 3667cc6e1f Cleaned up CCAction.cpp 
*Fixed tab/space issue.
*Removed unneeded if/else block.
*Added explicit braces around if block.
 2015-02-12 21:00:12 -08:00
minggo 87e444873f Merge pull request #10268 from kompjoefriek/Fixing-warnings 
Fixed some compiler warnings
 2015-02-13 10:04:19 +08:00
yangxiao d4ace2a08c Merge branch 'particle_merge' of https://github.com/super626/cocos2d-x into particle_merge 2015-02-13 09:49:07 +08:00
yangxiao 2789ad1393 remove unused code 2015-02-13 09:48:27 +08:00
kompjoefriek a2ef1abef3 Fixed unwanted changes 2015-02-12 23:07:24 +01:00
zhukaixy acc0476f01 Solve compile errors on win32 platform 2015-02-12 19:36:03 +08:00
Jeff Oh e33854f3eb apply custom request header for every request type (ios) 2015-02-12 20:07:19 +09:00
CocosRobot a643691795 [AUTO]: updating luabinding automatically 2015-02-12 10:47:08 +00:00
minggo afd4e94c4c Merge pull request #10160 from lite3/wildpointer 
fix wild pointer
 2015-02-12 18:01:10 +08:00
minggo 7fd6b5bfe7 Merge pull request #10172 from sergeant-wizard/make_tmx_object_group_name_getter_const 
make CCTMXObjectGroup::getGroupName const
 2015-02-12 18:00:49 +08:00
minggo 8716164a5d Merge pull request #10206 from sergeant-wizard/specify_default_capacity_for_sprite_batch_node 
Specify default capacity for sprite batch node
 2015-02-12 17:58:59 +08:00
minggo 3a4e9ced46 Merge pull request #10442 from Dhilan007/v3-accelerometer-fix 
Fixed Accelerometer has lagged on iOS
 2015-02-12 17:20:07 +08:00
yangxiao 58bfae2e57 adjust and remove unused code 2015-02-12 16:58:34 +08:00
minggo f44ea6468e Merge pull request #10461 from ntotani/fix-lua-framework-v3 
fix SpriteEx
 2015-02-12 16:17:46 +08:00
yangxiao 8f290b2d24 modify according to minggo 2015-02-12 16:09:08 +08:00
minggo 9d6f399584 Merge pull request #10467 from minggo/audio-issue 
audio resume issue
 2015-02-12 15:39:48 +08:00
Wenhai Lin eb7a7a9fb7 Fixed audio can't resume after the interruption of audio session has ended on iOS. 2015-02-12 15:38:44 +08:00
sawada_yasuharu cf8a7cd6da Changed the option to be passed to calculate bounding rect size for 
strings.

As an option, NSStringDrawingUsesLineFragmentOrigin and
NSStringDrawingUsesFontLeading are passed, the result size is differ
from the size which actually strings are rendered.
 2015-02-12 15:30:46 +08:00
Naoyuki Totani 2b43c12b88 fix SpriteEx 2015-02-12 15:16:48 +09:00
lvlong ee03bb8eea setCameraMask for cocostudio-ui 2015-02-12 09:24:04 +08:00
yangxiao 79a0c0152a add 3d particle (Particle Universe) 2015-02-11 18:14:22 +08:00
WenhaiLin 20ad425407 Fixed Accelerometer has lagged on iOS 2015-02-11 16:28:43 +08:00
lvlong 6304a89462 Merge branch 'v3' of github.com:super626/cocos2d-x into v3 2015-02-11 14:27:25 +08:00
KompjoeFriek 7f28230311 Fixed merge error 2015-02-10 21:37:18 +01:00
kompjoefriek 00edc542cb Merged with upstream/v3 
Merged with upstream/v3 and resolved merge conflicts
 2015-02-10 21:27:20 +01:00
minggo 1e11f3b3da Merge pull request #10310 from perminovVS/v3 
Fix visual studio project out of date
 2015-02-10 14:18:13 +08:00
Chad befbc0a14e FIX for Build error when CC_USE_CULLING=0 #10373 
Fix for build error when using CC_USE_CULLING
 2015-02-09 18:15:22 -08:00
Vladimir Timofeev 653bf1549d win32: Search resources in the executable directory by default instead of the current directory. Because new default location is much more predictable. 2015-02-09 02:23:01 +03:00
yangxiao 2ac0b35283 fix render state 2015-02-06 10:09:23 +08:00
Nite Luo ee2781e6a6 Merge pull request #10223 from vovkasm/cmake-msvc-fixes-core 
Cmake build system fixes for MSVC (partial)
 2015-02-04 23:18:08 -08:00
lvlong 6152925739 If parse the vertex attribute is fail, then discard the vertex attribute. 2015-02-04 16:19:30 +08:00
flamefox 4b405db77d fix tab to space 2015-02-04 10:36:16 +08:00
flamefox c2e17d6b1d getAttachNode should failed when there is no bone with name 2015-02-04 10:32:44 +08:00
XiaoYang c9fe5251a9 Merge pull request #229 from lvlonggame/v3 
add Camera::project
 2015-02-04 09:38:31 +08:00
yangxiao 19edeb971b fix warning 2015-02-03 17:51:16 +08:00
yangxiao 66da4e8096 mac work 2015-02-03 17:38:40 +08:00
byeonggee.seo 753335726a receive content data even though status code is not 2xx 2015-02-03 16:28:23 +09:00
lvlong a0c7723edb add GP_ASSERT 2015-02-03 14:21:12 +08:00
lvlong 6d92b7adc9 modify Camera::project 2015-02-03 11:59:43 +08:00
Nite Luo 6f53719772 Merge pull request #10317 from darkdukey/G17hao-patch-12 
Improve group command
 2015-02-02 14:12:50 -08:00
yangxiao 265e6fec1a fix index 2015-02-02 16:54:55 +08:00
yangxiao f608377bdb make vao work 2015-02-02 15:44:47 +08:00
byeonggee.seo 23e0320cac HttpResponse reference counting bug fixed 2015-02-02 12:23:15 +09:00
lvlonggame 23df00b0b9 Merge branch 'v3' of github.com:lvlonggame/cocos2d-x into v3 2015-02-01 21:17:12 +08:00
lvlonggame 4c65332550 add project function to camera 2015-02-01 21:14:37 +08:00
Nite Luo e9b4e4e19c Merge branch 'patch-13' of https://github.com/G17hao/cocos2d-x into G17hao-patch-12 2015-01-31 09:46:59 -08:00
Nite Luo 07cda0db37 Merge branch 'patch-12' of https://github.com/G17hao/cocos2d-x into G17hao-patch-12 2015-01-31 09:46:31 -08:00
samuele3hu fec0d9c41d Set default value for `Content-Type` of headfield in `PUT` method 2015-01-31 22:15:15 +08:00
samuele3hu 75dc45bfea Remove useless blank line 2015-01-31 15:21:03 +08:00
samuele3hu e6d50d7086 Fix the error that the binary data would be truncated 2015-01-31 14:31:24 +08:00
Vladimir Perminov bb2d2c9a07 Fix visual studio project out of date 
Remove 3dExport.h from project.
Change location CCPlatformConfig.h and CCPlatformMacros.h from ..\base\
to ..\platform\
 2015-01-30 17:37:19 +03:00
zhukaixy 806a5011e5 solve the problems noted in comments 2015-01-30 17:23:30 +08:00
tangziwen 10eced8b98 bug fix upload new sample texture 2015-01-30 15:46:39 +08:00
minggo 8efbafd09e Merge pull request #10281 from Dhilan007/v3-win32-fix 
Fixed compile error on win32
 2015-01-29 19:48:29 +08:00
WenhaiLin 6873713c31 Fixed compile error on win32 2015-01-29 19:38:55 +08:00
minggo dff7d6f639 Merge pull request #10277 from super626/v3 
fix bug on loading .mtl
 2015-01-29 19:21:31 +08:00
zhukaixy f3536056d8 Simpilify skybox 2015-01-29 19:01:10 +08:00
byeonggee.seo fa683ec98b MotionStreak MoveTo/MoveBy action OK 2015-01-29 19:30:00 +09:00
huangshiwu cd00de572d add glBindBuffer for drawnode and clippingnode to avoid crash 2015-01-29 18:06:20 +08:00
tangziwen 89cff149fc add new ray intersection method ,add new Doc to explain the terrain 2015-01-29 18:06:00 +08:00
yangxiao 3eeeaf051f fix load mtl 2015-01-29 17:54:22 +08:00
kompjoefriek 89152b2856 Tabs to spaces 
Changed indenting tabs to spaces
 2015-01-29 10:40:00 +01:00
minggo 73e8026336 Merge pull request #10274 from darkdukey/forceDepthTest 
Force depth test
 2015-01-29 16:29:13 +08:00
Nite Luo f914297703 Fix force depth write logic 2015-01-28 23:55:26 -08:00
minggo 18a45e36eb Merge pull request #10271 from Dhilan007/v3-systemfont-win32-fix 
Label:Fixed system font can't display the proper text when the text contains '&' on win32.
 2015-01-29 13:56:11 +08:00
Dale Stammen 652baed1ee increase build heap memory option to /Zm384 2015-01-28 20:37:39 -08:00
Dale Stammen be8075b29c increase build heap memory option to /Zm384 2015-01-28 20:32:32 -08:00
WenhaiLin 05db3bfd72 Fixed system font can't display the proper text when the text contains '&' on win32. 2015-01-29 11:55:49 +08:00
CocosRobot fcf0a2272f [AUTO]: updating luabinding automatically 2015-01-29 02:27:42 +00:00
minggo de3e9be2c5 Merge pull request #10265 from samuele3hu/v3_4_fi 
Add AsyncLoadSprite3D test case and update the related lua binding
 2015-01-29 10:16:49 +08:00
minggo 8b635fea1c Merge pull request #10250 from samuele3hu/v3_4_rc1 
Fix the error that HttpClient-android didn’t set responseCode when connecting failed
 2015-01-29 10:14:00 +08:00
minggo 2f04e7a6ac Merge pull request #10239 from super626/v3 
fix bug on uniform cache
 2015-01-29 10:13:11 +08:00
zhukaixy ee99700ec1 add test case TextureCube 2015-01-29 09:28:14 +08:00
samuele3hu 0ec8510f00 Fix linux compile error 2015-01-29 09:19:57 +08:00
kompjoefriek 0c70660551 Fixed warnings 
- signed/unsigned mismatch
- printing enum with %d
- using int as bool
 2015-01-29 01:36:22 +01:00
Nite Luo c0ff8d1177 Don't clear depth between queues 2015-01-28 15:28:14 -08:00
Nite Luo 94d5810efd Merge pull request #10254 from super626/fixbillboard 
Tested locally fix the billboad testcase
 2015-01-28 14:06:53 -08:00
samuele3hu 80c2e0c153 Add AsyncLoadSprite3D test case and update the related lua binding 2015-01-28 21:47:52 +08:00
andyque ac3d79a516 add constructor to AnimationInfo 2015-01-28 16:59:27 +08:00
minggo 34c132280e Merge pull request #10244 from geron-cn/fixProjectNodeLoader 
Fix project node crash in simulator and add its test-cpp
 2015-01-28 15:30:53 +08:00
minggo 757c4a6cdb Merge pull request #10253 from CocosRobot/update_lua_bindings_1422429538 
[AUTO]: updating luabinding automatically
 2015-01-28 15:24:52 +08:00
minggo 80cf4439f2 Merge pull request #10241 from Dhilan007/v3-scheduled-fix 
Fixed may access wrong memory address in Scheduler::schedule
 2015-01-28 15:22:40 +08:00