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

293 Commits

Author SHA1 Message Date
yangxiao 2d5431353a engine adjust 2014-08-22 13:25:26 +08:00
pandamicro bb5e189f30 Fix warning or Bundle3D 2014-08-21 20:02:22 +08:00
lvlong 4ce334c0c3 Merge branch 'v3' of github.com:super626/cocos2d-x into merge-bundle 2014-08-21 18:16:21 +08:00
lvlong d00bcbccb0 add texture coord2-7 2014-08-21 18:14:24 +08:00
lvlong 7753f4c471 modify assert(0) 2014-08-21 13:30:51 +08:00
liuliang 9ee6683569 Merge branch 'v3' of github.com:super626/cocos2d-x into Meshv3 2014-08-21 11:24:11 +08:00
liuliang 082689971d Modify the model resolution 2014-08-21 11:23:31 +08:00
lvlong 1f349cb3fe fix binary load bug. 2014-08-21 10:38:33 +08:00
yangxiao 3a69fc9b14 rename ModelDataNode to ModelData 2014-08-20 19:19:49 +08:00
yangxiao fcf4d79b06 setGLProgramState support 2014-08-20 19:01:04 +08:00
yangxiao bd4aec4bcd support multi-attribs 2014-08-20 18:20:19 +08:00
yangxiao 9a6181fdca Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2014-08-20 15:02:26 +08:00
yangxiao 79857c471b multiply Mesh attrib support 2014-08-20 15:02:16 +08:00
XiaoYang 82c2304e64 Merge pull request #105 from lvlonggame/merge-bundle 
format code
 2014-08-20 14:23:40 +08:00
lvlong 8e0d80d4c6 Merge branch 'newcode' into merge-bundle 
Conflicts:
	cocos/3d/CCBundle3D.cpp
 2014-08-20 14:00:25 +08:00
liuliang df272ee7f5 Modify the parsing 2014-08-20 13:53:15 +08:00
liuliang a27a420a91 Merge branch 'v3' of github.com:super626/cocos2d-x into Meshv3 
Conflicts:
	cocos/3d/CCSprite3D.cpp
 2014-08-20 11:45:48 +08:00
liuliang c6cd9b029d Modify the parsing 2014-08-20 11:40:04 +08:00
lvlong 93ee44c912 format code 2014-08-20 10:24:46 +08:00
yangxiao 54423efe9f fix reskin 2014-08-19 15:25:00 +08:00
XiaoYang 9f444b7010 Merge pull request #104 from liuliang2004/Meshv3 
Modification is compatible with the old model
 2014-08-19 14:32:05 +08:00
liuliang 9d3bab3810 Modification is compatible with the old model 2014-08-19 14:03:41 +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
yangxiao b2d43a4167 Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2014-08-19 11:56:21 +08:00
yangxiao f2729c7ef2 cache work 2014-08-19 11:56:09 +08:00
lvlong 2b70cf3dd8 Merge branch 'v3' of https://github.com/super626/cocos2d-x into merge-bundle 2014-08-18 20:22:56 +08:00
lvlong 9c25139895 animation & animations 2014-08-18 20:22:18 +08:00
yangxiao d5df1f3ab2 forget return true 2014-08-18 18:56:01 +08:00
yangxiao d6ed1af1f7 compute submesh aabb error 2014-08-18 18:34:18 +08:00
yangxiao b9c28dd8d7 return true 2014-08-18 17:57:14 +08:00
yangxiao 2f600f8af4 fix bundle mac 2014-08-18 17:52:27 +08:00
liuliang ee4e4ca455 Merge branch 'v3' of github.com:super626/cocos2d-x into Meshv3 
Conflicts:
	cocos/3d/CCBundle3D.cpp
 2014-08-18 17:39:28 +08:00
liuliang e151b207a4 Modified binary load model, compatible with the old format 2014-08-18 17:31:04 +08:00
yangxiao 01c1691a4f deal aabb 2014-08-18 17:02:13 +08:00
samuele3hu 91fd40dd3a Add a newline for some files 2014-08-18 15:27:54 +08:00
samuele3hu 7596a8a831 Split cocos3d from cocos2d on the android、win32 and linux platform and adjust the related test project 2014-08-18 14:58:57 +08:00
yangxiao 30ce92f677 obj work, make code clean 2014-08-18 14:16:34 +08:00
yangxiao 219404bd7d change tex param 2014-08-18 11:42:41 +08:00
yangxiao cd4da73beb merge, obj not work now 2014-08-18 11:28:57 +08:00
yangxiao 79a55286ce refactor to new model 2014-08-18 11:13:08 +08:00
liuliang 2f816aea2c Modified load static model 2014-08-18 10:32:23 +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 da63032a46 draw sub mesh bug 2014-08-16 20:38:00 +08:00
lvlong b1c9fb99e3 animation is ok. 2014-08-16 19:51:59 +08:00
lvlong 9c41b1a826 Merge branch 'v3' of https://github.com/super626/cocos2d-x into merge-bundle 2014-08-16 18:20:29 +08:00
lvlong 4f4b8dc25c for testing 2014-08-16 18:19:41 +08:00
yangxiao fb1b7ca3bb fix skeleton 2014-08-16 18:18:15 +08:00
lvlong 24bb827ef4 Merge branch 'v3' of https://github.com/super626/cocos2d-x into merge-bundle 2014-08-16 16:58:02 +08:00
yangxiao 7159914248 old model work 2014-08-16 16:56:04 +08:00
lvlong 4dd9102e87 Merge branch 'v3' of https://github.com/super626/cocos2d-x into merge-bundle 2014-08-16 15:45:28 +08:00
lvlong 5b59b8a987 fixed some loading problems. 2014-08-16 15:40:00 +08:00
yangxiao a11ac316bf create model 2014-08-16 14:52:44 +08:00
yangxiao 8a5bbabe21 Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2014-08-16 14:49:47 +08:00
yangxiao 47d15a4aa1 load 2014-08-16 14:49:38 +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
yangxiao ae361c91cd Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2014-08-16 14:16:27 +08:00
yangxiao ef2db59825 modify render 2014-08-16 14:16:17 +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 1b92409d78 Merge branch 'v3' of github.com:super626/cocos2d-x into Meshv3 2014-08-16 09:59:25 +08:00
liuliang f35dd346eb Modify Analytic 2014-08-16 09:59:08 +08:00
yangxiao 3ab7c6b952 create from bundle data 2014-08-15 20:52:45 +08:00
liuliang b4a20feabc Parse the data file 2014-08-15 18:27:28 +08:00
yangxiao 9ab48bd71e Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2014-08-15 18:27:03 +08:00
yangxiao a740841f5e submeshid 2014-08-15 18:21:58 +08:00
liuliang 0db924d7cd Parse the data file 2014-08-15 18:20:37 +08:00
liuliang c533f66b9f Merge branch 'v3' of github.com:super626/cocos2d-x into Meshv3 2014-08-15 17:46:40 +08:00
liuliang b5665a4723 Modify the binary parsing 2014-08-15 17:46:21 +08:00
liuliang ab80c5026d Modify the binary parsing 2014-08-15 17:45:37 +08:00
yangxiao d09695b118 create from data 2014-08-15 17:41:04 +08:00
yangxiao 6f0fc48e8e merge cocos2d 2014-08-15 16:36:17 +08:00
yangxiao e2312bd353 Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2014-08-15 15:55:32 +08:00
yangxiao 42916bcbe6 newmodel 2014-08-15 15:55:21 +08:00
liuliang 4c8b24d113 Modify the binary parsing 2014-08-15 15:32:15 +08:00
yangxiao 88bb1482e3 newmodel 2014-08-15 14:58:30 +08:00
yangxiao fdcec51cf4 struct for newmodel 2014-08-15 13:03:53 +08:00
yangxiao 2786e63824 Merge branch 'newcode' into obb 2014-08-14 18:58:46 +08:00
yangxiao 84bb22780a merge cocos2d 2014-08-14 17:16:20 +08:00
yangxiao ab783d2702 merge cocos2d 2014-08-14 17:12:39 +08:00
yangxiao 1942a27a5c Merge branch 'newcode' into v3_merge 2014-08-14 13:55:57 +08:00
lvlong dbf58b8873 modify function name and add default to switch block. 2014-08-14 13:15:37 +08:00
yangxiao f6da3b76b5 use renderer passed instead of get from global 2014-08-14 10:29:17 +08:00
yangxiao 6ce3b5c20a add mirror test 2014-08-13 17:38:16 +08:00
Huabing.Xu cb8c80de0d export MeshSkin as CC_DLL 2014-08-12 14:41:25 +08:00
lvlong f191bebe72 optimize Sprite3D get aabb. 2014-08-12 13:45:06 +08:00
lvlong c592ac4248 for pull request modify!! 2014-08-11 10:40:34 +08:00
yangxiao 53c143c679 remove normalize 2014-08-09 00:02:40 +08:00
yangxiao 73a0b7701d remove normalize 2014-08-09 00:02:19 +08:00
lvlong 8101e2ff1a 1. move drawnode3d to Sprite3DTest 
2. add getAABB to sprite3D and mesh
 2014-08-08 17:54:39 +08:00
yangxiao ceb6549ec8 merge cocos2d 2014-08-08 16:25:52 +08:00
lvlong 28769c9b15 add obb sample 2014-08-08 11:16:33 +08:00
yangxiao 813e954f4e aabb, obb 2014-08-08 00:00:58 +08:00
yangxiao 3c9483899e camera, cameratest, drawNode3D squash 2014-08-07 15:23:31 +08:00
martell 75911658aa Make CMake More Robust 2014-08-06 15:43:19 +01:00
yangxiao 8ffd0fe16e spelling error 2014-08-04 16:07:16 +08:00
yangxiao 4084fdc461 add new file to cmake 2014-08-04 15:49:12 +08:00