Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
22,927 Commits 2 Branches 34 Tags 1.2 GiB
Commit Graph

181 Commits

Author SHA1 Message Date
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
yangxiao 4452d9579a merge cocos2d, fix lua 2014-08-04 12:07:27 +08:00
yangxiao 52d3c4461f adjust 2014-07-31 20:20:29 +08:00
yangxiao 7562214c63 adjust 2014-07-31 20:19:43 +08:00
yangxiao 342dc05890 adjust 2014-07-31 20:17:51 +08:00
yangxiao 4aec1d37c8 code adjust 2014-07-31 20:14:43 +08:00
yangxiao 49052ab28d code adjust 2014-07-31 18:42:58 +08:00
yangxiao ca0afcfa92 add Quaternion::ZERO 2014-07-31 18:36:30 +08:00
yangxiao 17304b4775 add comment 2014-07-31 18:28:52 +08:00
yangxiao 780914687e code style adjust according minggo 2014-07-31 18:14:01 +08:00
yangxiao 38c86f7697 skeleton retain 2014-07-31 10:57:19 +08:00
yangxiao 2c29560514 add CC_DLL 2014-07-31 10:28:39 +08:00
yangxiao 44c501ca2a merge cocos2d 2014-07-31 09:56:23 +08:00