zhukaixy
|
aead9e5855
|
correct for code indent
|
2015-03-26 09:53:41 +08:00 |
lvlong
|
f93dffdeb0
|
node frame animation test and resource
|
2015-03-26 09:25:37 +08:00 |
lvlong
|
ecfd66cda3
|
node frame code!!!!!
|
2015-03-26 09:12:05 +08:00 |
zhukaixy
|
54472497a4
|
fix comments
|
2015-03-25 13:43:55 +08:00 |
zhukaixy
|
2ebc854335
|
Modify code style
|
2015-03-25 11:36:11 +08:00 |
zhukaixy
|
6eaa78d1cb
|
add reload mechanism for TextureCube and Skybox
|
2015-03-24 15:43:59 +08:00 |
tangziwen
|
e213cd1747
|
fix UVAnimation test while switching back to foreground
|
2015-03-23 10:19:00 +08:00 |
Nite Luo
|
cfa1f0c84f
|
Merge pull request #10843 from konopka/fix_compiler_reorder_warnings
Get rid of compiler warnings: field '_xxx' will be initialized after field '_yyy'...
|
2015-03-13 21:12:35 -07:00 |
songchengjiang
|
7026b89b02
|
fix the bug of moveTo
|
2015-03-13 11:35:58 +08:00 |
Martin Konopka
|
350b81501d
|
Get rid of warnings: field '_xxx' will be initialized after field '_yyy' [-Wreorder]
Initialization follows the order of declaration, not the order of the initialization list.
|
2015-03-12 23:47:58 +01:00 |
yangxiao
|
437a59fb9a
|
modify project & unproject api
|
2015-02-27 10:01:57 +08:00 |
yangxiao
|
f13237c013
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2015-02-26 17:27:42 +08:00 |
yangxiao
|
9a64eb18dd
|
add project function
|
2015-02-26 15:20:20 +08:00 |
zhukaixy
|
f3536056d8
|
Simpilify skybox
|
2015-01-29 19:01:10 +08:00 |
Nite Luo
|
5532cb30b6
|
Tweak the name
|
2015-01-29 00:24:32 -08:00 |
Nite Luo
|
995b7225dd
|
Add test-case for force depth bug
|
2015-01-29 00:21:33 -08:00 |
zhukaixy
|
ee99700ec1
|
add test case TextureCube
|
2015-01-29 09:28:14 +08:00 |
Nite Luo
|
5c32b31d6e
|
Fix test case #10237
|
2015-01-27 17:24:01 -08:00 |
yangxiao
|
89f107ac08
|
remove unused variables
|
2015-01-27 15:25:40 +08:00 |
yangxiao
|
9744439048
|
use case 2 finished
|
2015-01-27 15:24:15 +08:00 |
yangxiao
|
cc18a3a955
|
another use case not finished
|
2015-01-26 18:44:30 +08:00 |
yangxiao
|
5e1d7449f7
|
complete use case 1
|
2015-01-26 14:58:16 +08:00 |
yangxiao
|
677ee473ff
|
3d+2d use case, not finished
|
2015-01-23 18:24:15 +08:00 |
Nite Luo
|
4a440e66c9
|
Refactor draw command
|
2015-01-15 14:00:49 -08:00 |
WenhaiLin
|
13b049a543
|
Fixed warns:truncation from double to float
|
2015-01-15 10:07:23 +08:00 |
Dale Stammen
|
32c14710e7
|
allow custom shaders for WinRT Universal App
|
2015-01-14 10:37:04 -08:00 |
minggo
|
301cb558ec
|
Merge pull request #9970 from super626/v3
correct wrong word
|
2015-01-14 11:45:48 +08:00 |
yangxiao
|
772813e810
|
modify wrong word
|
2015-01-14 09:36:22 +08:00 |
Nite Luo
|
4335328e3d
|
Add support for creating empty sprite3D
|
2015-01-13 16:41:24 -08:00 |
Dale Stammen
|
f07999e1be
|
enabled all sprites3d tests for winrt universal apps
|
2015-01-13 14:33:16 -08:00 |
minggo
|
d517831e01
|
Merge pull request #9699 from super626/fixandroid
fix background/foreground switch
|
2014-12-30 17:07:38 +08:00 |
yangxiao
|
3377c3ee53
|
fix #9689
|
2014-12-30 11:54:53 +08:00 |
yangxiao
|
bfb577e385
|
fix ##9689
|
2014-12-30 11:48:39 +08:00 |
Thomas Hou
|
1502d32aac
|
use std math library M_PI instead of pi.
|
2014-12-29 16:24:31 +08:00 |
yangxiao
|
060c6ee0b7
|
add quaternion test
|
2014-12-29 14:36:25 +08:00 |
yangxiao
|
3d77c7535d
|
merge cocos
|
2014-12-23 10:35:35 +08:00 |
tangziwen
|
68177e41e9
|
update
|
2014-12-19 17:39:26 +08:00 |
tangziwen
|
395cf929a8
|
update
|
2014-12-19 17:22:17 +08:00 |
tangziwen
|
95bcfaaa3e
|
update test 15:29
|
2014-12-19 15:31:06 +08:00 |
tangziwen
|
1bbe9e249d
|
fix coding style
|
2014-12-19 11:22:59 +08:00 |
yangxiao
|
7137e49cd4
|
modify async load test fix crash
|
2014-12-19 10:22:42 +08:00 |
tangziwen
|
591edd8bad
|
update test
|
2014-12-19 09:05:53 +08:00 |
tangziwen
|
086bca399f
|
add three samples -- toonshader fakeshadow lightmap
|
2014-12-18 16:09:29 +08:00 |
tangziwen
|
73014e8be3
|
asdasd
|
2014-12-17 13:31:35 +08:00 |
yangxiao
|
5ad408530c
|
merge cocos
|
2014-12-15 17:47:05 +08:00 |
yangxiao
|
34b21dad6d
|
invalid texture parameter on release mode fix #9465
|
2014-12-12 15:05:55 +08:00 |
yangxiao
|
2a445ef1d9
|
correct unsuitable word
|
2014-12-05 16:44:49 +08:00 |
yangxiao
|
5e86d71fcc
|
modify async load sample
|
2014-12-05 15:44:09 +08:00 |
yangxiao
|
c99185b755
|
add async load test
|
2014-12-05 15:01:30 +08:00 |
yangxiao
|
b476e65c6a
|
Merge branch 'newcode' into fixsprite
|
2014-11-28 14:33:04 +08:00 |
yangxiao
|
437ee04d5d
|
fix linux
|
2014-11-28 14:12:38 +08:00 |
Dale Stammen
|
316b68f783
|
added winrt and wp8 support for EVENT_RENDERER_RECREATED
|
2014-11-21 10:30:49 -08:00 |
yangxiao
|
3c0779885d
|
refact reskin test code
|
2014-11-19 16:50:09 +08:00 |
yangxiao
|
e8fbf4d071
|
remove space line
|
2014-11-13 14:21:19 +08:00 |
yangxiao
|
ba51065f3a
|
remove space line
|
2014-11-13 14:19:51 +08:00 |
yangxiao
|
7395fb70f6
|
refact code style
|
2014-11-13 14:16:38 +08:00 |
tangziwen
|
c33777a45a
|
remove dummy log
|
2014-11-13 11:57:18 +08:00 |
tangziwen
|
8101b6a94e
|
add UV Animation Test & it's resource
|
2014-11-12 17:42:45 +08:00 |
andyque
|
16d0419136
|
fix compile error
|
2014-11-10 16:02:06 +08:00 |
minggo
|
25053b80bc
|
Merge pull request #8930 from super626/fixsprite
add Sprite3D::getMeshArrayByName and refactor re-skin test
|
2014-11-05 18:11:51 +08:00 |
Ricardo Quesada
|
3a34d6eb9d
|
Performance improvements
`Director::getMatrix()` returns `const Mat4`
|
2014-11-04 16:46:14 -08:00 |
yangxiao
|
20decd5a39
|
refact reskin code
|
2014-10-25 14:11:32 +08:00 |
James Chen
|
13b51f7c73
|
Small fixes in Sprite3DTest
|
2014-10-24 12:03:42 +08:00 |
minggo
|
f3e4c705eb
|
more warnings fixed
|
2014-10-21 11:47:28 +08:00 |
Dhilan007
|
a5f838496c
|
Move `CCCamera.cpp/h` `CCLight.cpp/h` into 2d
|
2014-10-20 16:25:24 +08:00 |
Dhilan007
|
83150aa4d1
|
fix warns and memory leak
|
2014-10-09 17:19:43 +08:00 |
Ricardo Quesada
|
27cb6afb5e
|
fixes warnings on Android
|
2014-10-08 18:55:33 -07:00 |
yangxiao
|
dbf564208b
|
move light from 3d to base
|
2014-09-28 16:02:12 +08:00 |
yangxiao
|
bf84aba47e
|
do not add ambient color by default
|
2014-09-25 16:27:31 +08:00 |
yangxiao
|
56313aa895
|
merge cocos
|
2014-09-25 11:05:02 +08:00 |
yangxiao
|
650f810815
|
add obb by default
|
2014-09-19 11:22:37 +08:00 |
songchengjiang
|
3c67515378
|
Finished light reconstruction
|
2014-09-18 16:38:35 +08:00 |
yangxiao
|
584284c847
|
merge cocos and rename lighttest
|
2014-09-17 14:26:57 +08:00 |
yangxiao
|
df9ab144fe
|
light work
|
2014-09-11 15:46:32 +08:00 |
yangxiao
|
bb6f5a6be5
|
Merge branch 'newcode' into billboard
|
2014-09-10 16:27:59 +08:00 |
songchengjiang
|
4099015421
|
Sprite3D set default _contentSize by AABB
|
2014-09-09 17:47:34 +08:00 |
songchengjiang
|
117c38f806
|
Sprite3DHitTest use AABB testing
|
2014-09-09 17:05:33 +08:00 |
yangxiao
|
cf9094207a
|
merge cocos
|
2014-09-09 16:00:55 +08:00 |
yangxiao
|
ed63f01c7e
|
seperate billboard test from Sprite3D test
|
2014-09-04 16:27:18 +08:00 |
songchengjiang
|
68ce6449e8
|
repaired camera orientation
Testing RotateBy action
|
2014-09-03 17:17:57 +08:00 |
songchengjiang
|
18d06015c6
|
Added More Models
Code optimization
|
2014-09-02 11:24:19 +08:00 |
yangxiao
|
538fe2e543
|
Merge branch 'newcode' into transition
|
2014-09-01 15:14:30 +08:00 |
yangxiao
|
a039d6b0fc
|
animate3d transition
|
2014-08-29 18:25:42 +08:00 |
songchengjiang
|
9f715e4e00
|
Added Sprite3D Model
|
2014-08-29 18:18:19 +08:00 |
songchengjiang
|
0d75998027
|
pressure test
|
2014-08-29 17:58:20 +08:00 |
songchengjiang
|
4aa4287d28
|
test on Android
|
2014-08-29 17:29:15 +08:00 |
songchengjiang
|
34070677ad
|
Added testing Model Number
|
2014-08-29 17:11:18 +08:00 |
songchengjiang
|
71d722854c
|
added mesh command
|
2014-08-29 12:08:28 +08:00 |
songchengjiang
|
701d70fb6c
|
Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
|
2014-08-29 10:58:04 +08:00 |
songchengjiang
|
06e3eb955f
|
repaired BillBoard Depth Test
|
2014-08-29 09:30:59 +08:00 |
songchengjiang
|
ac8158c60b
|
Tab Format
|
2014-08-29 09:14:54 +08:00 |
songchengjiang
|
e16fb5977e
|
Finished BillBorad
|
2014-08-29 09:14:22 +08:00 |
songchengjiang
|
e6f055f3fd
|
calculated Z in View
Transparent Render
|
2014-08-28 19:22:01 +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 |
yangxiao
|
7d6b8ea706
|
merge cocos
|
2014-08-26 14:58:58 +08:00 |
yangxiao
|
dd93439c4b
|
replace model
|
2014-08-25 19:25:51 +08:00 |
yangxiao
|
d90572fc10
|
engine refactor hide concept of submesh
|
2014-08-22 13:52:03 +08:00 |
yangxiao
|
2d5431353a
|
engine adjust
|
2014-08-22 13:25:26 +08:00 |
yangxiao
|
bd4aec4bcd
|
support multi-attribs
|
2014-08-20 18:20:19 +08:00 |
yangxiao
|
54423efe9f
|
fix reskin
|
2014-08-19 15:25:00 +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
|
94be97f724
|
Modify change interface
|
2014-08-19 14:30:27 +08:00 |
liuliang
|
06dfaf9db5
|
Modify change interface
|
2014-08-19 14:21:48 +08:00 |
liuliang
|
9d3bab3810
|
Modification is compatible with the old model
|
2014-08-19 14:03:41 +08:00 |
yangxiao
|
3fd122391c
|
reset sprite3dtest
|
2014-08-18 18:01:57 +08:00 |
yangxiao
|
79a55286ce
|
refactor to new model
|
2014-08-18 11:13:08 +08:00 |
samuele3hu
|
6259aebdab
|
Split cocos3d from cocos2d on the android、win32 and linux platform and adjust the related test project
|
2014-08-17 23:45:56 +08:00 |
yangxiao
|
7159914248
|
old model work
|
2014-08-16 16:56:04 +08:00 |
songmiao
|
08a4ebba06
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into billboard
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h
|
2014-08-15 17:43:04 +08:00 |
songmiao
|
361770e0f3
|
add BillBorad and BillBoardTest
|
2014-08-15 16:15:29 +08:00 |
yangxiao
|
ab783d2702
|
merge cocos2d
|
2014-08-14 17:12:39 +08:00 |
Huabing.Xu
|
5d49afec0e
|
fix ios running error
|
2014-08-14 10:04:01 +08:00 |
yangxiao
|
6ce3b5c20a
|
add mirror test
|
2014-08-13 17:38:16 +08:00 |
Huabing.Xu
|
e387caf763
|
add create(modelPath) interface for EffectSprite3D
|
2014-08-12 09:56:25 +08:00 |
Huabing.Xu
|
0dff45cfc2
|
adjust SkinnedEffectCode
|
2014-08-12 09:51:03 +08:00 |
Huabing.Xu
|
e66d1f6f69
|
add skinned outline effect
|
2014-08-11 18:11:15 +08:00 |
Huabing.Xu
|
7e1adeb3e9
|
add new test case
|
2014-08-08 18:01:36 +08:00 |
lvlong
|
8101e2ff1a
|
1. move drawnode3d to Sprite3DTest
2. add getAABB to sprite3D and mesh
|
2014-08-08 17:54:39 +08:00 |
lvlong
|
28769c9b15
|
add obb sample
|
2014-08-08 11:16:33 +08:00 |
yangxiao
|
44c501ca2a
|
merge cocos2d
|
2014-07-31 09:56:23 +08:00 |
yangxiao
|
da4ba95806
|
SubMesh and Attachment
|
2014-07-29 10:49:06 +08:00 |
vision
|
40951d586c
|
update
|
2014-07-17 10:10:33 +08:00 |
vision
|
c47d844d20
|
update the buildin shaders on WP8. Disable the effect 3d test.
|
2014-07-17 10:08:49 +08:00 |
minggo
|
6c37541657
|
Merge pull request #7363 from Dhilan007/v3-event-clear
Dispatch EVENT_RENDERER_RECREATED event when renderer was recreated on android/wp8.
|
2014-07-11 13:36:52 +08:00 |
minggo
|
c7856b21fd
|
Merge pull request #7366 from Dhilan007/v3-fixed-warn
fixed warn and replace NULL with nullptr.
|
2014-07-10 15:42:02 +08:00 |
Dhilan007
|
6cff8cb564
|
fixed warn and replace NULL with nullptr.
|
2014-07-10 00:45:27 +08:00 |
Dhilan007
|
dbcb20b886
|
Dispatch EVENT_RENDERER_RECREATED event when renderer was recreated on android/wp8.
Make clear EVENT_COME_TO_FOREGROUND event.
|
2014-07-09 23:03:04 +08:00 |
yangxiao
|
90b6841e25
|
adjust api according feedback
|
2014-07-09 09:53:15 +08:00 |
Huabing.Xu
|
75c7777999
|
fix Effect3dSprite memory leak
|
2014-07-01 14:48:46 +08:00 |
yangxiao
|
4685a8654e
|
Animate3D transition
|
2014-06-27 17:02:08 +08:00 |
yangxiao
|
2a6ce26335
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
|
2014-06-27 16:36:36 +08:00 |
yangxiao
|
343ef9ae55
|
update sprite3d test
|
2014-06-27 16:36:01 +08:00 |
lvlong
|
fac17097a0
|
add a new model and change girl model to it
|
2014-06-27 11:44:44 +08:00 |
yangxiao
|
ccb39e51b2
|
animation3d transition not finished
|
2014-06-26 18:35:12 +08:00 |
lvlong
|
7331ef49b6
|
don't rotate girl model
|
2014-06-25 13:29:45 +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 |
yangxiao
|
c65e5d6872
|
simplify shader, bath sprite3D render
|
2014-06-23 19:08:26 +08:00 |
yangxiao
|
1e319bc1f8
|
fix compile bug
|
2014-06-20 22:38:09 +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
|
17854cd922
|
change speed
|
2014-06-17 13:45:58 +08:00 |
yangxiao
|
9acd373a0e
|
make girl up
|
2014-06-16 19:41:10 +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 |
lvlong
|
2840409933
|
for tony test
|
2014-06-16 14:09:41 +08:00 |
yangxiao
|
79d2de3b67
|
make character up
|
2014-06-16 00:31:31 +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 |
lvlong
|
14f4b6430f
|
modify 3dloader, you can run animation.
|
2014-06-12 18:26:42 +08:00 |