lvlong
|
cbdfd77400
|
modify some name.
|
2015-03-30 17:46:45 +08:00 |
lvlong
|
5032194e98
|
modify animate 3d quality to bool
|
2015-03-30 15:57:58 +08:00 |
samuele3hu
|
6c528c4a42
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_5_test
|
2015-03-30 15:51:01 +08:00 |
samuele3hu
|
c3ad458a26
|
Update comment for Lua
|
2015-03-30 15:47:47 +08:00 |
lvlong
|
6fe9f0d1c8
|
add comments for 3d animation quality!!!
|
2015-03-30 14:05:03 +08:00 |
yangxiao
|
c6a86ac287
|
move shader to shaders
|
2015-03-30 13:45:50 +08:00 |
lvlong
|
ccb5039411
|
Merge branch 'v3' of github.com:super626/cocos2d-x into v3
Conflicts:
cocos/base/CCConfiguration.h
|
2015-03-30 11:50:01 +08:00 |
lvlong
|
b2a7a753c2
|
add comments
|
2015-03-30 11:44:30 +08:00 |
minggo
|
59441adc2c
|
Merge pull request #11213 from super626/texturecube
Texturecube bug fix
|
2015-03-30 10:48:10 +08:00 |
yangxiao
|
b469cfa928
|
merge cocos
|
2015-03-30 10:28:14 +08:00 |
yangxiao
|
7affd8edcf
|
large value for min max
|
2015-03-30 10:00:06 +08:00 |
minggo
|
30db8ab7fa
|
Merge pull request #11159 from super626/v3
node animation support
|
2015-03-30 09:32:36 +08:00 |
VisualSJ
|
6285e72d1e
|
[ci skip] Add javascript notes...
cocos/3d/CCBundle3D.h
cocos/3d/CCBundle3DData.h
cocos/3d/CCBundleReader.h
cocos/3d/CCFrustum.h
cocos/3d/CCMeshSkin.h
cocos/3d/CCMeshVertexIndexData.h
cocos/3d/CCOBB.h
cocos/3d/CCObjLoader.h
cocos/3d/CCPlane.h
cocos/3d/CCRay.h
cocos/3d/CCSprite3DMaterial.h
cocos/base/CCAsyncTaskPool.h
cocos/base/CCIMEDelegate.h
cocos/base/CCIMEDispatcher.h
cocos/base/CCMap.h
cocos/base/CCScriptSupport.h
|
2015-03-28 15:11:51 +08:00 |
zhukaixy
|
5bff8f5bf3
|
Bugfix: for glcontext recreated
|
2015-03-27 17:20:46 +08:00 |
minggo
|
8b5a6d9ccc
|
Merge pull request #11196 from tangziwen/doc
3d fix doxygen add to group
|
2015-03-27 17:09:24 +08:00 |
yangxiao
|
a45f0d1a76
|
merge cocos
|
2015-03-27 16:50:40 +08:00 |
tangziwen
|
56c31845ff
|
fix conflict again
|
2015-03-27 15:25:16 +08:00 |
tangziwen
|
12bcdc8868
|
fix conflict
|
2015-03-27 15:08:20 +08:00 |
tangziwen
|
68563494ae
|
fix doxygen add to group
|
2015-03-27 14:10:41 +08:00 |
tangziwen
|
a2cce0594b
|
update
|
2015-03-27 13:43:09 +08:00 |
tangziwen
|
5a76a628d3
|
add some utility functions
|
2015-03-27 11:46:02 +08:00 |
tangziwen
|
8b376e511c
|
update Terrain
|
2015-03-27 10:12:24 +08:00 |
yangxiao
|
6cd1697240
|
config wp8 and add comment
|
2015-03-26 18:10:42 +08:00 |
yangxiao
|
7d3154e2e9
|
add to linux
|
2015-03-26 14:34:11 +08:00 |
yangxiao
|
c23746fbcd
|
modify
|
2015-03-26 13:05:42 +08:00 |
yangxiao
|
000e34c6d0
|
merge cocos
|
2015-03-26 12:50:18 +08:00 |
yangxiao
|
84535feb0c
|
merge cocos
|
2015-03-26 11:59:26 +08:00 |
lvlong
|
6c29385547
|
animate quality!
|
2015-03-26 11:33:16 +08:00 |
lvlong
|
c999307150
|
add different animate quality.
|
2015-03-26 11:30:22 +08:00 |
zhukaixy
|
aead9e5855
|
correct for code indent
|
2015-03-26 09:53:41 +08:00 |
XiaoYang
|
11c021881b
|
Merge pull request #263 from lvlonggame/v3
fix: obj file load material.
|
2015-03-26 09:29:58 +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 |
minggo
|
cb07aa4ae2
|
Merge pull request #11091 from super626/v3
fix memory leak
|
2015-03-25 16:16:28 +08:00 |
yangxiao
|
c6af12bcd9
|
use CC_SAFE_DELETE
|
2015-03-25 14:33:53 +08:00 |
zhukaixy
|
54472497a4
|
fix comments
|
2015-03-25 13:43:55 +08:00 |
lvlong
|
7efd4c2df6
|
replace setAdditionnalTransform()
|
2015-03-25 10:04:51 +08:00 |
WenhaiLin
|
9dd778edb0
|
[ci skip]Update comments
|
2015-03-24 20:23:51 +08:00 |
lvlong
|
5ce4fbe6df
|
merge node transform problem!!!
|
2015-03-24 17:59:24 +08:00 |
lvlong
|
5c20d49cd7
|
Merge branch 'v3' of github.com:super626/cocos2d-x into v3
|
2015-03-24 16:07:42 +08:00 |
lvlong
|
6e6b2c1869
|
fix bug: load *.obj can't load sub-mesh material.
|
2015-03-24 16:03:51 +08:00 |
zhukaixy
|
6eaa78d1cb
|
add reload mechanism for TextureCube and Skybox
|
2015-03-24 15:43:59 +08:00 |
yangxiao
|
fad4fb8e6f
|
fix memory leak
|
2015-03-24 10:22:55 +08:00 |
minggo
|
dda85fcb02
|
Merge pull request #11027 from tangziwen/doc
add 3D doc, fixed typo
|
2015-03-23 10:45:41 +08:00 |
tangziwen
|
814490ab44
|
add 3D doc, fixed typo
|
2015-03-20 17:20:22 +08:00 |
zhukaixy
|
0587122ccc
|
Move Skybox.shader from Sprite3DTest to Shader3D folder
|
2015-03-19 15:11:24 +08:00 |
minggo
|
1e271a9d96
|
Merge pull request #10899 from super626/v3
Bug fix
|
2015-03-17 19:29:21 +08:00 |
lvlong
|
3ce0449c97
|
decompose
|
2015-03-17 15:17:23 +08:00 |
lvlong
|
733a89100e
|
remove old code!
|
2015-03-17 13:13:03 +08:00 |
lvlong
|
080132d072
|
modify sub node transform!
|
2015-03-17 12:15:03 +08:00 |
konopka
|
0387b13bb6
|
Adding missing virtual keywords
|
2015-03-16 16:39:43 +01:00 |
yangxiao
|
8b3e116ed6
|
check running scene
|
2015-03-16 18:04:50 +08:00 |
Martin Konopka
|
2c80b6ae3a
|
Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
|
2015-03-15 00:10:08 +01:00 |
Martin Konopka
|
cd12d08a52
|
Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
|
2015-03-14 19:33:15 +01:00 |
yangxiao
|
45bd6180ad
|
fix create bundle using empty path
|
2015-03-09 17:09:18 +08:00 |
yangxiao
|
ff3eba6143
|
refact init
|
2015-03-09 16:29:57 +08:00 |
yangxiao
|
d7c1d6b6aa
|
add billboard to transparent queue
|
2015-03-06 09:57:48 +08:00 |
tangziwen
|
840b531a9a
|
update
|
2015-03-03 14:14:50 +08:00 |
yangxiao
|
38636dc8b7
|
allow transition time to 0
|
2015-03-03 11:04:34 +08:00 |
yangxiao
|
874f7c7f99
|
fix transparent render bug
|
2015-03-03 10:42:47 +08:00 |
yangxiao
|
56f3f34ee3
|
add Animate3D::setTransitionTime
|
2015-02-28 17:40:25 +08:00 |
minggo
|
c8eaa4aeba
|
Merge pull request #10447 from super626/particle_merge
add 3d particle (Particle Universe)
|
2015-02-15 19:48:18 +08:00 |
minggo
|
d5e82521de
|
Merge pull request #10359 from flamefox/3dattachnode
getAttachNode should failed when there is no bone with name
|
2015-02-15 19:03:52 +08:00 |
yangxiao
|
9b117bf87c
|
resolve conflict
|
2015-02-13 15:46:19 +08:00 |
yangxiao
|
8f290b2d24
|
modify according to minggo
|
2015-02-12 16:09:08 +08:00 |
yangxiao
|
79a0c0152a
|
add 3d particle (Particle Universe)
|
2015-02-11 18:14:22 +08:00 |
kompjoefriek
|
00edc542cb
|
Merged with upstream/v3
Merged with upstream/v3 and resolved merge conflicts
|
2015-02-10 21:27:20 +01:00 |
flamefox
|
4b405db77d
|
fix tab to space
|
2015-02-04 10:36:16 +08:00 |
flamefox
|
c2e17d6b1d
|
getAttachNode should failed when there is no bone with name
|
2015-02-04 10:32:44 +08:00 |
yangxiao
|
19edeb971b
|
fix warning
|
2015-02-03 17:51:16 +08:00 |
yangxiao
|
66da4e8096
|
mac work
|
2015-02-03 17:38:40 +08:00 |
yangxiao
|
265e6fec1a
|
fix index
|
2015-02-02 16:54:55 +08:00 |
yangxiao
|
f608377bdb
|
make vao work
|
2015-02-02 15:44:47 +08:00 |
zhukaixy
|
806a5011e5
|
solve the problems noted in comments
|
2015-01-30 17:23:30 +08:00 |
tangziwen
|
10eced8b98
|
bug fix upload new sample texture
|
2015-01-30 15:46:39 +08:00 |
minggo
|
dff7d6f639
|
Merge pull request #10277 from super626/v3
fix bug on loading .mtl
|
2015-01-29 19:21:31 +08:00 |
zhukaixy
|
f3536056d8
|
Simpilify skybox
|
2015-01-29 19:01:10 +08:00 |
tangziwen
|
89cff149fc
|
add new ray intersection method ,add new Doc to explain the terrain
|
2015-01-29 18:06:00 +08:00 |
yangxiao
|
3eeeaf051f
|
fix load mtl
|
2015-01-29 17:54:22 +08:00 |
kompjoefriek
|
89152b2856
|
Tabs to spaces
Changed indenting tabs to spaces
|
2015-01-29 10:40:00 +01:00 |
zhukaixy
|
ee99700ec1
|
add test case TextureCube
|
2015-01-29 09:28:14 +08:00 |
kompjoefriek
|
0c70660551
|
Fixed warnings
- signed/unsigned mismatch
- printing enum with %d
- using int as bool
|
2015-01-29 01:36:22 +01:00 |
Nite Luo
|
c0ff8d1177
|
Don't clear depth between queues
|
2015-01-28 15:28:14 -08:00 |
Nite Luo
|
94d5810efd
|
Merge pull request #10254 from super626/fixbillboard
Tested locally fix the billboad testcase
|
2015-01-28 14:06:53 -08:00 |
yangxiao
|
fc1dbf49fb
|
fix billboard
|
2015-01-28 15:21:57 +08:00 |
Nite Luo
|
be6ca1b6d2
|
add force depth write
|
2015-01-27 17:05:51 -08:00 |
tangziwen
|
9ec366a130
|
update terrain test add new method to get normal
|
2015-01-27 15:18:59 +08:00 |
tangziwen
|
d6c3320d49
|
fix memory leak
|
2015-01-23 18:14:44 +08:00 |
tangziwen
|
d04b3feb50
|
add new test, fix memory leak
|
2015-01-23 18:09:54 +08:00 |
minggo
|
44bcee60c7
|
Merge pull request #10182 from super626/v3
Fix bug on loading .obj's .mtl file
|
2015-01-23 12:02:00 +08:00 |
kompjoefriek
|
ca48c5e5dd
|
Fixed lots of compiler warnings
- signed / unsigned mismatches
- using int as bool
- Removed throw() from CCFrame.h, why is explained here:
http://www.gotw.ca/publications/mill22.htm
|
2015-01-23 02:02:33 +01:00 |
lvlong
|
662117e878
|
mtlPath
|
2015-01-22 17:33:24 +08:00 |
lvlong
|
c5f955466a
|
fixbug: load obj file's material.
|
2015-01-22 17:28:35 +08:00 |
minggo
|
954f372775
|
Merge pull request #10156 from vovkasm/fix-warnings
Fix warnings
|
2015-01-21 20:23:00 +08:00 |
Vladimir Timofeev
|
4e25ffbc7f
|
Fix "field 'XXX' will be initialized after 'YYY'" warning in Xcode by reorder initialization sentences.
|
2015-01-21 12:59:53 +03:00 |
minggo
|
335f69d95d
|
Merge pull request #10110 from super626/v3
Fix Animate3D speed bug and add parameter to Ray::intersects
|
2015-01-21 14:11:11 +08:00 |
lvlong
|
7934d36e24
|
modify function description.
|
2015-01-20 10:46:00 +08:00 |
tangziwen
|
25cd1f4c02
|
update test
|
2015-01-20 10:34:30 +08:00 |
lvlong
|
fc0c4bae7a
|
modify by colleague for cocostudio.
|
2015-01-16 13:23:03 +08:00 |
Nite Luo
|
4a440e66c9
|
Refactor draw command
|
2015-01-15 14:00:49 -08:00 |
tangziwen
|
130c18bde0
|
fix LOD indices capacity,refactor the code ,add some comments
|
2015-01-15 15:54:12 +08:00 |
tangziwen
|
804739b38a
|
add cmake
|
2015-01-15 11:45:51 +08:00 |
tangziwen
|
201ae6f321
|
add terrain
|
2015-01-15 11:45:06 +08:00 |
lvlong
|
6d7b530ea1
|
fix bug: add animate3D to sequence problem.
|
2015-01-15 11:32:28 +08:00 |
Nite Luo
|
15660926d9
|
Fix Sprite3D not cascading 3D flag
|
2015-01-14 16:23:35 -08:00 |
yangxiao
|
42c40d895f
|
enable disable culling using macro
|
2015-01-14 14:41:10 +08:00 |
lvlong
|
9abc5b7e82
|
fix bug: sequence action speed
|
2015-01-14 10:40:47 +08:00 |
Nite Luo
|
4335328e3d
|
Add support for creating empty sprite3D
|
2015-01-13 16:41:24 -08:00 |
Nite Luo
|
45562f3203
|
optimize based on review commends
|
2015-01-12 22:52:20 -08:00 |
Nite Luo
|
1c10ae43bc
|
Merge branch 'v3' into renderFix
Conflicts:
tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.cpp
tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.h
|
2015-01-12 20:43:55 -08:00 |
Nite Luo
|
a84f521e64
|
Clean up the debug functions in Billboard
|
2015-01-12 20:17:00 -08:00 |
Nite Luo
|
8591609128
|
Implement 3D drawing support for Sprite, Label, Particle, BatchNode
|
2015-01-12 20:06:50 -08:00 |
Nite Luo
|
fee8bc1b28
|
Remove Transparent Queue, Move transform calculation of Billboard to visit
|
2015-01-12 18:17:47 -08:00 |
Nite Luo
|
7741daf091
|
Billboard Render correctly
|
2015-01-11 22:20:41 -08:00 |
Nite Luo
|
6dfc021c02
|
Merge renderqueue to one
|
2015-01-09 14:06:21 -08:00 |
lvlong
|
f9b0c9bc92
|
fix bug.
|
2015-01-07 11:09:09 +08:00 |
yangxiao
|
d23eb83ba1
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
|
2014-12-31 11:40:37 +08:00 |
yangxiao
|
0963b3d86e
|
add comment
|
2014-12-29 10:51:16 +08:00 |
XiaoYang
|
8b95c591b1
|
Merge pull request #189 from songchengjiang/v3
read AABB from file(v0.6+)
|
2014-12-26 16:15:56 +07:00 |
yangxiao
|
afb01dcd9a
|
config linux
|
2014-12-26 16:19:02 +08:00 |
lvlong
|
f592671df6
|
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into frustum
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp
|
2014-12-26 13:42:13 +08:00 |
yangxiao
|
64ff6bb51c
|
modify msg word
|
2014-12-25 17:42:58 +08:00 |
yangxiao
|
d9d5e1a5cb
|
add release note
|
2014-12-25 17:40:26 +08:00 |
lvlong
|
a4a108f766
|
fix lua binding again!!
|
2014-12-25 14:04:41 +08:00 |
minggo
|
4cac8e2cb4
|
Merge pull request #9595 from super626/v3
Do not try to load empty texture
|
2014-12-24 10:31:44 +08:00 |
songchengjiang
|
ceb834b8d4
|
read AABB from file(v0.6+)
|
2014-12-24 10:12:31 +08:00 |
yangxiao
|
908b9e470d
|
do not try to load empty texture
|
2014-12-23 15:52:45 +08:00 |
lvlong
|
026f0a8b25
|
modify code format.
|
2014-12-23 09:57:46 +08:00 |
lvlong
|
db9f4a23fe
|
feedback commit.
|
2014-12-22 18:13:07 +08:00 |
yangxiao
|
1ba826ea17
|
modify code style
|
2014-12-22 17:40:02 +08:00 |
lvlong
|
2058742e4a
|
Merge branch 'frustum' of github.com:super626/cocos2d-x into frustum
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/2d/CCCamera.cpp
cocos/2d/CCCamera.h
cocos/3d/CCFrustum.cpp
cocos/3d/CCFrustum.h
cocos/3d/CCPlane.cpp
cocos/3d/CCPlane.h
cocos/3d/CCRay.cpp
cocos/3d/CCRay.h
cocos/3d/CCSprite3D.cpp
tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.cpp
tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.h
|
2014-12-22 17:37:00 +08:00 |
lvlong
|
63ebf20026
|
modify code format.
|
2014-12-22 15:51:10 +08:00 |
lvlong
|
7291e6e94a
|
modify about feedback.
|
2014-12-22 15:23:41 +08:00 |
songchengjiang
|
f5f95c5693
|
fix errors on Windows
|
2014-12-19 11:30:51 +08:00 |
lvlong
|
13cae3c480
|
deal tab
|
2014-12-19 10:25:59 +08:00 |
yangxiao
|
d1a35fe47a
|
make bundle thread safe
|
2014-12-19 10:21:30 +08:00 |
yangxiao
|
c788a1892d
|
make it thread safe
|
2014-12-19 10:20:44 +08:00 |
yangxiao
|
37f4d67a49
|
make it thread safe
|
2014-12-19 10:20:37 +08:00 |
yangxiao
|
549ec2adab
|
make bundle thread safe
|
2014-12-19 09:48:20 +08:00 |
lvlong
|
f6bea9b6bb
|
1.add camera culling.
2.add camera culling sample.
3.fix bug: load .obj file material.
|
2014-12-18 17:18:22 +08:00 |
lvlong
|
73a2a6385a
|
add frustum culling.
|
2014-12-16 16:34:35 +08:00 |
yangxiao
|
5ad408530c
|
merge cocos
|
2014-12-15 17:47:05 +08:00 |
XiaoYang
|
a59d4ab2a3
|
Merge pull request #171 from tangziwen/v3
let billboard can rotate in the Z axis
|
2014-12-08 09:34:58 +07:00 |
yangxiao
|
a1ec27d0b1
|
calculate aabb if not exist
|
2014-12-08 10:30:06 +08:00 |
yangxiao
|
2a445ef1d9
|
correct unsuitable word
|
2014-12-05 16:44:49 +08:00 |
yangxiao
|
11d9f27c00
|
createAsync comment
|
2014-12-05 16:11:14 +08:00 |
yangxiao
|
3439b7f68d
|
refactor async load callback funtion
|
2014-12-05 15:48:46 +08:00 |
yangxiao
|
c99185b755
|
add async load test
|
2014-12-05 15:01:30 +08:00 |
yangxiao
|
bc57e47ddb
|
add async task callback dipatcher, call it in the main thread
|
2014-12-04 18:31:10 +08:00 |
tangziwen
|
8605595a5b
|
let billboard can rotate in the Z axis
|
2014-12-04 15:19:41 +08:00 |