lvlong
|
cba155b5bc
|
Remove string err no used
|
2014-10-08 15:23:31 +08:00 |
lvlong
|
27f771744a
|
static model load problem of old version .
|
2014-09-02 17:33:22 +08:00 |
lvlong
|
496aad2fe7
|
remove 0.3 branch logic
|
2014-08-29 11:59:30 +08:00 |
lvlong
|
cbe61a4b73
|
modify log
|
2014-08-29 11:56:33 +08:00 |
lvlong
|
15c945d89b
|
Merge branch 'newcode' into v3
Conflicts:
cocos/3d/CCBundle3D.cpp
|
2014-08-29 11:04:15 +08:00 |
lvlong
|
5a1e0601a7
|
Code Standards
|
2014-08-29 10:43:26 +08:00 |
Ricardo Quesada
|
3dda35b4ef
|
Adds `std::nothrow` to `new`
Since cocos2d-x doesn't support exceptions, it is important to add
`std::nothrow` to all the `new` statements
|
2014-08-27 16:31:57 -07:00 |
lvlong
|
e05f6bc874
|
modify for compress
|
2014-08-27 18:44:31 +08:00 |
yangxiao
|
c7f7623320
|
reserve animation size
|
2014-08-25 11:30:34 +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 |
lvlong
|
8e0d80d4c6
|
Merge branch 'newcode' into merge-bundle
Conflicts:
cocos/3d/CCBundle3D.cpp
|
2014-08-20 14:00:25 +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 |
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 |
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
|
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
|
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
|
1e961e00b7
|
obj loader work
|
2014-08-17 22:49:53 +08:00 |
lvlong
|
b1c9fb99e3
|
animation is ok.
|
2014-08-16 19:51:59 +08:00 |
lvlong
|
4f4b8dc25c
|
for testing
|
2014-08-16 18:19:41 +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 |
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 |
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 |
liuliang
|
ab80c5026d
|
Modify the binary parsing
|
2014-08-15 17:45:37 +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
|
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 |