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
|
a48d33ce31
|
Merge branch 'newcode' into v3
|
2014-07-07 17:06:37 +08:00 |
lvlong
|
0a9e96bfdf
|
modify Bundle3D::parseGLType add other type
|
2014-07-07 09:16:08 +08:00 |
yangxiao
|
d2cd2449d8
|
adjust code
|
2014-07-04 10:42:02 +08:00 |
lvlong
|
ff908d771a
|
add a space to test pushing
|
2014-07-01 11:26:29 +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 |
yangxiao
|
58e9fcc741
|
remove unused code
|
2014-06-27 22:11:29 +08:00 |
Huabing.Xu
|
9126819941
|
linux work now for bundleReader
|
2014-06-27 01:22:41 -07: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 |
yangxiao
|
392a769c8f
|
merge cocos2d v3
|
2014-06-26 22:48:42 +08:00 |
yangxiao
|
2175b25730
|
fix animation bug
|
2014-06-26 21:58:26 +08:00 |
yangxiao
|
ccb39e51b2
|
animation3d transition not finished
|
2014-06-26 18:35:12 +08:00 |
minggo
|
dc635db163
|
fix warnings
|
2014-06-26 16:15:02 +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
|
2de28eea89
|
for tony
|
2014-06-24 13:40:04 +08:00 |
yangxiao
|
c65e5d6872
|
simplify shader, bath sprite3D render
|
2014-06-23 19:08:26 +08:00 |
lvlong
|
e48982aeaa
|
unsigned int -> size_t
|
2014-06-23 11:12:08 +08:00 |
lvlong
|
0ac6b8c96d
|
1.delete write function from bundle reader.
2.unsigned int -> size_t.
|
2014-06-23 11:10:03 +08:00 |
yangxiao
|
c92ba3f3dc
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
|
2014-06-23 09:32:59 +08:00 |
lvlong
|
75f1ef5288
|
modify warning
|
2014-06-23 09:23:09 +08:00 |
yangxiao
|
92da41694d
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
|
2014-06-23 09:05:03 +08:00 |
yangxiao
|
1e319bc1f8
|
fix compile bug
|
2014-06-20 22:38:09 +08:00 |
yangxiao
|
1581396810
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
|
2014-06-20 18:54:34 +08:00 |
yangxiao
|
3096979b1f
|
rename createSubAnimate3D to create
|
2014-06-20 18:54:09 +08:00 |
XiaoYang
|
2371e8e6ae
|
Merge pull request #38 from lvlonggame/v3
binary loader
|
2014-06-20 18:46:52 +08:00 |
yangxiao
|
c5e562106f
|
Animate3D support spawn
|
2014-06-20 17:55:25 +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 |
yangxiao
|
f633c6a8c2
|
create sub Animate3D
|
2014-06-20 12:01:54 +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
|
4db0bea73f
|
bone original pose
|
2014-06-19 12:01:03 +08:00 |
yangxiao
|
9eaff7465d
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-06-18 17:17:33 +08:00 |