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

161 Commits

Author SHA1 Message Date
yangxiao 17304b4775 add comment 2014-07-31 18:28:52 +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 6de3309f90 have two GL_UNSIGNED_INT delete one 2014-07-08 20:13:57 +08:00
yangxiao 8b482fdfcd remove gl_fixed 2014-07-08 11:02:00 +08:00
lvlong e315ef527a parseGLType bug 2014-07-07 17:22:46 +08:00
lvlong 0a9e96bfdf modify Bundle3D::parseGLType add other type 2014-07-07 09:16:08 +08:00
lvlong e44dee6607 merge 2014-07-01 11:08:37 +08:00
lvlong e3cc234cfb Revert "modify BundleReader and the version read" 
This reverts commit 660c80fac7.
 2014-07-01 11:05:48 +08:00
lvlong 660c80fac7 modify BundleReader and the version read 2014-07-01 10:45:01 +08:00
lvlong c1afd7133a modify BundleReader and the version read 2014-07-01 09:30:14 +08:00
lvlong df7ab50062 modify BundleReader and the version read 2014-07-01 09:26:21 +08:00
minggo 36e864552e Merge pull request #7253 from super626/v3 
c3b loader bug
 2014-06-30 17:33:13 +08:00
lvlong 701a2b60c2 sub-version > 0 2014-06-30 17:14:47 +08:00
lvlong 42aaf38468 modify reader-64bit bug 2014-06-30 17:10:07 +08:00
Dhilan007 26f3445311 add missing files for the projects 2014-06-30 17:07:55 +08:00
lvlong 9d9c1eb51a change the tab in code to space 2014-06-27 14:42:48 +08:00
lvlong e6e9c6caa9 modify bug about parent index is -1 2014-06-27 09:32:09 +08:00
lvlong 658a955e36 modify skindata binary reading 2014-06-25 13:20:42 +08:00
lvlong da835cb837 modify origin-pos stuff 2014-06-25 11:35:55 +08:00
lvlong 984e9079a7 modify bundle3d 2014-06-25 10:13:11 +08:00
lvlong ab910dfe19 reader test 2014-06-25 09:13:24 +08:00
yangxiao 2e4c801b2f load originpose 2014-06-24 23:33:30 +08:00
lvlong dc0101737c test for tony 2014-06-24 14:43:20 +08:00
lvlong 431378a41e commit for tony test 2014-06-24 14:10:03 +08:00
lvlong 0ac6b8c96d 1.delete write function from bundle reader. 
2.unsigned int -> size_t.
 2014-06-23 11:10:03 +08:00
lvlong 75f1ef5288 modify warning 2014-06-23 09:23:09 +08:00
yangxiao 1e319bc1f8 fix compile bug 2014-06-20 22:38:09 +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 4db0bea73f bone original pose 2014-06-19 12:01:03 +08:00
yangxiao 1ba59fba94 code adjustment according to minggo 2014-06-17 19:18:56 +08:00
yangxiao e1fb8c82f0 missing include 2014-06-17 15:31:45 +08:00
lvlong ef32bffceb modify bundle3D load() 2014-06-17 13:59:03 +08:00
yangxiao fb7fc23ee9 refactor code 2014-06-17 10:49:52 +08: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
yangxiao bc31d6b082 merge lv 2014-06-16 16:45:43 +08:00
lvlong 2282c98f2e do some test 2014-06-16 15:38:03 +08:00
lvlong 2840409933 for tony test 2014-06-16 14:09:41 +08:00
yangxiao dd8f66ce57 merge loader 2014-06-16 00:01:38 +08:00
yangxiao 9dd7241176 load c3t animation work 90% 2014-06-15 22:45:56 +08:00
lvlong 4ae01d148f 11 2014-06-13 19:26:46 +08:00
yangxiao ff6ef1140d two animate3d the same time 2014-06-13 19:20:19 +08:00
Huabing.Xu f7b8acd6fd change pointer to std::vector for mesh 2014-06-13 11:59:13 +08:00
lvlong 14f4b6430f modify 3dloader, you can run animation. 2014-06-12 18:26:42 +08:00
lvlong 1ca69d2689 Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 
Conflicts:
	cocos/3d/CCBundle3D.cpp
	cocos/3d/CCBundle3D.h
	tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
 2014-06-12 16:28:36 +08:00
lvlong 742ea7f2df Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 
Conflicts:
	cocos/2d/cocos2d.vcxproj.filters
	cocos/3d/CCBundle3D.cpp
	cocos/3d/CCBundle3D.h
 2014-06-12 15:53:41 +08:00
Huabing.Xu e70918e325 extract Animation3DData 2014-06-12 14:03:33 +08:00
lvlong 9fe7c1a9da loader 2014-06-12 10:01:54 +08:00
Huabing.Xu f1bc0971aa extract mesh data, material data, skin data into a header file for reuse in converter and engine 2014-06-11 18:24:14 +08:00
yangxiao d76525ced1 use my data temp 2014-06-11 14:20:14 +08:00
Huabing.Xu 9ee6f1f3e0 adjust shader uniform settings 
use a new fake data for testing
 2014-06-11 12:07:25 +08:00
yangxiao cddad40ec0 make it rotate 2014-06-11 10:01:52 +08:00
yangxiao 6d09b50699 animation bug 2014-06-10 19:53:06 +08:00
yangxiao a991940268 debug Sprite3D with .c3t 2014-06-09 18:37:58 +08:00
yangxiao 0c95fe1fbd animation test 2014-06-06 19:12:08 +08:00
yangxiao 87c7e2b0e9 worldmat cache in bone 2014-06-05 18:21:25 +08:00
yangxiao ed8f8a9cad sprite3d with skin render&bundle 2014-06-05 16:36:01 +08:00