yangxiao
|
0c07b05e1d
|
remove unused code
|
2014-06-16 18:36:30 +08:00 |
yangxiao
|
c00cdd0ae3
|
use bone dirtyflag
|
2014-06-16 18:22:32 +08:00 |
yangxiao
|
927d29f334
|
bug on Repeat when diff bigger than duration
|
2014-06-16 18:21:47 +08:00 |
yangxiao
|
bc31d6b082
|
merge lv
|
2014-06-16 16:45:43 +08:00 |
lvlong
|
920b358764
|
new girl.c3t
|
2014-06-16 16:23:24 +08:00 |
yangxiao
|
58a6adca02
|
construct BoneBlendState
|
2014-06-16 15:45:58 +08:00 |
lvlong
|
a4ee8b8dc2
|
Merge branch 'lv' of https://github.com/super626/cocos2d-x into v3
|
2014-06-16 15:39:05 +08:00 |
lvlong
|
2282c98f2e
|
do some test
|
2014-06-16 15:38:03 +08:00 |
Huabing.Xu
|
a0ba6775c6
|
adjust animation logic
|
2014-06-16 15:22:00 +08:00 |
lvlong
|
2840409933
|
for tony test
|
2014-06-16 14:09:41 +08:00 |
lvlong
|
0fa4e921f0
|
delete girl - 副本.c3t
|
2014-06-16 09:25:12 +08:00 |
yangxiao
|
79d2de3b67
|
make character up
|
2014-06-16 00:31:31 +08:00 |
yangxiao
|
7b621c5c93
|
aa
|
2014-06-16 00:26:31 +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 |
yangxiao
|
247734e2e0
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
|
2014-06-13 12:25:04 +08:00 |
Huabing.Xu
|
638fdd62df
|
Merge pull request #37 from dabingnn/v3Animation
V3 animation
|
2014-06-13 12:12:44 +08:00 |
Huabing.Xu
|
4e94eaabed
|
Merge branch 'v3' into v3Animation
|
2014-06-13 12:06:11 +08:00 |
Huabing.Xu
|
9ece9cead4
|
Merge pull request #36 from dabingnn/v3Animation
V3 animation
|
2014-06-13 12:03:06 +08:00 |
Huabing.Xu
|
f7b8acd6fd
|
change pointer to std::vector for mesh
|
2014-06-13 11:59:13 +08:00 |
lvlong
|
3af0bdfef6
|
texture
|
2014-06-13 09:18:25 +08:00 |
yangxiao
|
09fe7e13b7
|
blendstate
|
2014-06-13 09:12:29 +08:00 |
lvlong
|
dbadabb6e9
|
skin: getPosition()
|
2014-06-12 18:46:45 +08:00 |
yangxiao
|
ae0b850d89
|
boneblendstate 30%
|
2014-06-12 18:32:47 +08:00 |
lvlong
|
14f4b6430f
|
modify 3dloader, you can run animation.
|
2014-06-12 18:26:42 +08:00 |
minggo
|
1b24af95f1
|
[ci skip]
|
2014-06-12 18:23:31 +08:00 |
minggo
|
cf7c603d79
|
Merge pull request #7036 from visiblelight/new_blur_shader
New shader for the blur effect
|
2014-06-12 18:20:38 +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 |
minggo
|
1187cfff6d
|
[ci skip]
|
2014-06-12 16:19:05 +08:00 |
minggo
|
d1ca81634a
|
[ci skip]
|
2014-06-12 16:18:22 +08:00 |
minggo
|
eb21bf1ad1
|
Merge pull request #7030 from Rumist/v3
#5506 bug fix
|
2014-06-12 16:16:13 +08:00 |
minggo
|
f6913fc931
|
[ci skip]
|
2014-06-12 16:12:03 +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 |
yangxiao
|
ee5aa0f648
|
android work
|
2014-06-12 15:42:53 +08:00 |
minggo
|
bb5471ca8b
|
[ci skip]
|
2014-06-12 15:07:29 +08:00 |
minggo
|
77fdd124a1
|
[ci skip]
|
2014-06-12 15:05:31 +08:00 |
minggo
|
5a28ba68b4
|
Merge pull request #7031 from sachingarg05/GLProgramNoAbort
GLProgram should not abort() if shader compilation fails, returning false is better.
|
2014-06-12 15:03:29 +08:00 |
minggo
|
22f445d56f
|
[ci skip]
|
2014-06-12 14:47:42 +08:00 |
minggo
|
ed14108ab1
|
Merge pull request #7042 from Dhilan007/v3-systemfont-ios
LinWenhai fixed calculating height of multi-line string was incorrect on IOS.
|
2014-06-12 14:44:26 +08:00 |
minggo
|
85a9e85dfd
|
Merge pull request #7045 from heliclei/commit-status-desc
[ci skip] Set github commit status context & description
|
2014-06-12 14:40:55 +08:00 |
yangxiao
|
e37c6ab7ee
|
test action sequence
|
2014-06-12 14:20:38 +08:00 |
Huabing.Xu
|
e70918e325
|
extract Animation3DData
|
2014-06-12 14:03:33 +08:00 |
minggo
|
cc683ff00f
|
[ci skip]
|
2014-06-12 11:40:41 +08:00 |
minggo
|
5c718e27da
|
Merge pull request #7044 from Dhilan007/v3-label-improve
Ensuring release cache texture in timely.
|
2014-06-12 11:39:36 +08:00 |
minggo
|
70147e9a20
|
[ci skip]
|
2014-06-12 11:38:28 +08:00 |
minggo
|
c5a8ba3a2c
|
Merge pull request #7043 from Dhilan007/v3-texturecachefix
issue #3341:fix TextureCache::addImageAsync repeatedly generate Image for the same image file.
|
2014-06-12 11:35:34 +08:00 |
heliclei
|
87ac4c660d
|
[ci skip] Set github commit status context & description
|
2014-06-12 11:30:37 +08:00 |
Dhilan007
|
d755b7ffcb
|
issue #3341:fix TextureCache::addImageAsync repeatedly generate Image for the same image file.
|
2014-06-12 11:21:42 +08:00 |