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

59 Commits

Author SHA1 Message Date
tangziwen 3247acc0c1 ignore some method ,fix typo 2015-04-01 10:23:53 +08:00
samuele3hu c3ad458a26 Update comment for Lua 2015-03-30 15:47:47 +08:00
minggo 30db8ab7fa Merge pull request #11159 from super626/v3 
node animation support
 2015-03-30 09:32:36 +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
yangxiao a45f0d1a76 merge cocos 2015-03-27 16:50:40 +08:00
tangziwen 68563494ae fix doxygen add to group 2015-03-27 14:10:41 +08:00
lvlong 5ce4fbe6df merge node transform problem！！！ 2015-03-24 17:59:24 +08:00
tangziwen 814490ab44 add 3D doc, fixed typo 2015-03-20 17:20:22 +08:00
yangxiao c788a1892d make it thread safe 2014-12-19 10:20:44 +08:00
yangxiao a1ec27d0b1 calculate aabb if not exist 2014-12-08 10:30:06 +08:00
yangxiao 460bc2bf08 move aabb calculation to bundle 2014-11-19 17:58:40 +08:00
lvlong a33bad7482 modify read animation. 2014-11-18 16:10:33 +08:00
lvlong 63a47534ab fix 0.2 version load bug. 2014-10-21 18:44:10 +08:00
tangziwen 8f7d202816 fix animation3D ID bug 2014-10-20 19:22:00 +08:00
Ricardo Quesada d326db427f removes the `3d_export.h` file 2014-10-08 18:30:23 -07:00
minggo 50a2cb2b86 remove unneeded includes 2014-08-28 17:32:23 +08:00
yangxiao 7818b28ee3 Merge branch 'newcode' into v3 2014-08-22 13:32:57 +08:00
pandamicro bb5e189f30 Fix warning or Bundle3D 2014-08-21 20:02:22 +08:00
yangxiao 5cf30a363c remove unused code 2014-08-19 13:54:06 +08:00
yangxiao 289b04a2ae merge cocos2d 2014-08-19 13:19:42 +08:00
liuliang e151b207a4 Modified binary load model, compatible with the old format 2014-08-18 17:31:04 +08:00
samuele3hu 6259aebdab Split cocos3d from cocos2d on the android、win32 and linux platform and adjust the related test project 2014-08-17 23:45:56 +08:00
yangxiao 1e961e00b7 obj loader work 2014-08-17 22:49:53 +08:00
lvlong 84dcff2f7a Merge branch 'v3' of https://github.com/super626/cocos2d-x into merge-bundle 
Conflicts:
	cocos/3d/CCBundle3D.cpp
 2014-08-16 14:44:41 +08:00
lvlong d60a7734b1 merge bundle. 2014-08-16 14:28:15 +08:00
liuliang ae79603791 Modify the material parsing 2014-08-16 14:14:37 +08:00
lvlong f8f416cd3c merge bundle 2014-08-16 11:12:26 +08:00
liuliang 21dcc51c0f Modify the material parsing 2014-08-16 10:41:42 +08:00
liuliang 4c8b24d113 Modify the binary parsing 2014-08-15 15:32:15 +08:00
yangxiao fdcec51cf4 struct for newmodel 2014-08-15 13:03:53 +08:00
yangxiao 2c29560514 add CC_DLL 2014-07-31 10:28:39 +08:00
yangxiao 9f1cfbfca5 add skeleton and refactor skin 2014-07-30 18:32:34 +08:00
yangxiao da4ba95806 SubMesh and Attachment 2014-07-29 10:49:06 +08:00
lvlong 42aaf38468 modify reader-64bit bug 2014-06-30 17:10:07 +08:00
lvlong ab910dfe19 reader test 2014-06-25 09:13:24 +08:00
lvlong e48982aeaa unsigned int -> size_t 2014-06-23 11:12:08 +08:00
lvlong 69436ddd65 Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 
Conflicts:
	cocos/3d/CCBundle3D.cpp
	cocos/3d/CCBundle3D.h
	cocos/3d/CCBundle3DData.h
 2014-06-20 16:02:22 +08:00
lvlong e4bbfad773 1. binary loader is OK. 
2. add some comment.
 2014-06-20 15:30:08 +08:00
lvlong 8493c4579b before switch branch save 2014-06-19 15:43:02 +08:00
yangxiao c5bb10e5f4 add comments 2014-06-19 14:11:14 +08:00
yangxiao 1ba59fba94 code adjustment according to minggo 2014-06-17 19:18:56 +08:00
yangxiao 6c39dc0e18 adjust includes 2014-06-17 15:28:14 +08:00
lvlong ef32bffceb modify bundle3D load() 2014-06-17 13:59:03 +08:00
yangxiao b9824e1778 remove external from include path 2014-06-17 21:16:32 +08:00
yangxiao 189fbb7071 resolve conflict 2014-06-17 10:52:48 +08:00
yangxiao fb7fc23ee9 refactor code 2014-06-17 10:49:52 +08:00
Huabing.Xu 07ec5970fb 1. using external/json folder for rapidjson 
2. linux works now
 2014-06-16 19:18:02 -07:00
lvlong 32cc5b12d6 ready 2014-06-16 19:30:45 +08:00
lvlong 4b7f6a6185 static Sprite3D is ok 2014-06-16 19:08:43 +08:00
yangxiao 2c6f7b63d1 avoid reopen file 2014-06-16 18:46:58 +08:00