yangxiao
|
70f4ca2a4a
|
Merge branch 'newcode' into v3
|
2014-10-14 09:28:17 +08:00 |
XiaoYang
|
c171a8772d
|
Merge pull request #140 from tangziwen/v3
fix mesh AABB incorrect calculation through using static variable
|
2014-10-14 09:23:13 +08:00 |
tangziwen
|
7566880d46
|
fix mesh's AABB calculation incorrect by using static variable
|
2014-10-14 09:14:46 +08:00 |
songchengjiang
|
ecd63db80b
|
Fixing bug
|
2014-10-13 19:10:42 +08:00 |
tangziwen
|
e8007b9e63
|
fix mesh AABB incorrect calculation through using static variable
|
2014-10-13 17:49:00 +08:00 |
yangxiao
|
d81e4d7a92
|
fix light uniform array errors, and using shader without light by default fix #8612
|
2014-10-13 15:17:22 +08:00 |
XiaoYang
|
72e6204426
|
Merge pull request #138 from lvlonggame/v3
add create Animate3D interface by frame section
|
2014-10-11 17:36:37 +08:00 |
lvlong
|
6be64fedd7
|
modify Animate3D::create
|
2014-10-11 17:02:42 +08:00 |
lvlong
|
4bba69d578
|
add a param comment
|
2014-10-10 17:48:54 +08:00 |
lvlong
|
2c18db5b18
|
create animate by frame section.
|
2014-10-10 17:44:45 +08:00 |
Huabing.Xu
|
a08d0e4be3
|
Merge branch 'v3' into v3_fixGLProgramCrash
|
2014-10-10 15:05:09 +08:00 |
yangxiao
|
a67825e950
|
use shader without light by default
|
2014-10-10 15:01:14 +08:00 |
Huabing.Xu
|
e69465e428
|
remove texture unit 4-7, only 0 -3 is reserved
|
2014-10-10 14:06:37 +08:00 |
yangxiao
|
88fc4258ca
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
|
2014-10-09 17:02:10 +08:00 |
Ricardo Quesada
|
d326db427f
|
removes the `3d_export.h` file
|
2014-10-08 18:30:23 -07:00 |
lvlong
|
cba155b5bc
|
Remove string err no used
|
2014-10-08 15:23:31 +08:00 |
martell
|
d420ae39e2
|
Added CC_STATIC support for 3d, all these commits will be squashed and renamed, structured and signed at the end
Signed-off-by: martell <martellmalone@gmail.com>
|
2014-10-03 23:22:27 +01:00 |
martell
|
c3172bef50
|
Finalise Windows cmake support for mingw-w64
Signed-off-by: martell <martellmalone@gmail.com>
|
2014-10-03 23:22:09 +01:00 |
martell
|
ecd8a02ee6
|
Fixed up some more cmake errors
Signed-off-by: martell <martellmalone@gmail.com>
|
2014-10-03 23:22:01 +01:00 |
martell
|
30240a8a37
|
Multi platform cmake support
Signed-off-by: martell <martellmalone@gmail.com>
|
2014-10-03 23:21:45 +01:00 |
yangxiao
|
38873dd999
|
move light fix linux and android
|
2014-09-28 16:05:20 +08:00 |
yangxiao
|
dbf564208b
|
move light from 3d to base
|
2014-09-28 16:02:12 +08:00 |
yangxiao
|
744e09c141
|
reset change to getDirectionInWorld
|
2014-09-28 11:03:18 +08:00 |
yangxiao
|
53dee7ef86
|
can ci android compile?
|
2014-09-28 10:21:47 +08:00 |
yangxiao
|
db2ff49f26
|
adjust according to minggo
|
2014-09-26 14:13:26 +08:00 |
yangxiao
|
e2f1b91117
|
remove unused variable
|
2014-09-25 22:25:43 +08:00 |
yangxiao
|
90523fc3d5
|
fix light check
|
2014-09-25 22:24:47 +08:00 |
yangxiao
|
ca9eb3d203
|
support ambient light without normal & optimaze code
|
2014-09-25 18:32:33 +08:00 |
yangxiao
|
8f3f37c2bb
|
auto switch shader according to light status
|
2014-09-25 17:13:46 +08:00 |
yangxiao
|
567c632d98
|
config max support light number in shader
|
2014-09-25 15:29:32 +08:00 |
yangxiao
|
56313aa895
|
merge cocos
|
2014-09-25 11:05:02 +08:00 |
songchengjiang
|
b51dc584d5
|
Light optimization
|
2014-09-23 17:08:28 +08:00 |
songchengjiang
|
216c40fe9e
|
Modified Light Shader
|
2014-09-22 18:08:58 +08:00 |
yangxiao
|
61def04ca6
|
add light mask
|
2014-09-22 11:14:30 +08:00 |
minggo
|
653986a3a2
|
Merge pull request #8106 from super626/v3
add OBBs to OBB collision test by default, Fix 0.1 version static model load bug and remove unused resource
|
2014-09-19 16:16:33 +08:00 |
yangxiao
|
5b61e569f5
|
light mask
|
2014-09-19 14:50:20 +08:00 |
XiaoYang
|
d1328cfb41
|
Merge pull request #132 from lvlonggame/v3
Deal read string length problem!
|
2014-09-19 14:47:59 +08:00 |
lvlong
|
eb89efe510
|
deal the length problem!
|
2014-09-19 14:30:02 +08:00 |
songchengjiang
|
f052e45c04
|
Move Light Uniforms into Meshcommand
|
2014-09-19 10:54:07 +08:00 |
songchengjiang
|
62777e9552
|
compile Android
|
2014-09-18 18:35:18 +08:00 |
songchengjiang
|
3c67515378
|
Finished light reconstruction
|
2014-09-18 16:38:35 +08:00 |
yangxiao
|
25091ca849
|
add transparent flag to render command
|
2014-09-18 12:00:44 +08:00 |
yangxiao
|
8c77130ae0
|
refactor light compile
|
2014-09-17 18:58:35 +08:00 |
yangxiao
|
34f642377e
|
fix billboard anchor point
|
2014-09-17 18:01:18 +08:00 |
yangxiao
|
41caef878b
|
refactor light
|
2014-09-17 17:59:10 +08:00 |
yangxiao
|
584284c847
|
merge cocos and rename lighttest
|
2014-09-17 14:26:57 +08:00 |
yangxiao
|
c5f6f8de5b
|
share glprogramstate
|
2014-09-17 13:42:08 +08:00 |
yangxiao
|
2e0e4e58c8
|
support transparent object
|
2014-09-12 17:57:54 +08:00 |
yangxiao
|
9eb62ed1f6
|
Merge branch 'newcode' into v3
|
2014-09-12 10:00:13 +08:00 |
yangxiao
|
df9ab144fe
|
light work
|
2014-09-11 15:46:32 +08:00 |
yangxiao
|
e849b997ed
|
modify interface
|
2014-09-11 12:05:49 +08:00 |
yangxiao
|
3cfc36591c
|
merge cocos
|
2014-09-11 10:13:57 +08:00 |
yangxiao
|
33cabb553a
|
add transparent property
|
2014-09-11 09:15:24 +08:00 |
yangxiao
|
bb6f5a6be5
|
Merge branch 'newcode' into billboard
|
2014-09-10 16:27:59 +08:00 |
minggo
|
46d4f487bb
|
Merge pull request #7978 from super626/v3
Calculate Content Size for Sprite3D
|
2014-09-10 14:06:47 +08:00 |
yangxiao
|
a980a2efa4
|
merge cocos
|
2014-09-10 10:28:59 +08:00 |
Ricardo Quesada
|
6f3ca63f00
|
Moved base/CCPlatform* -> platform/CCPlatform*
|
2014-09-09 17:17:07 -07:00 |
Ricardo Quesada
|
0ead7b6307
|
Squashed commit of the following:
commit b9181ae92541d11119bedd766773ddb01f0bb486
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Sep 9 09:34:40 2014 -0700
Compiles luasocket on Mac
commit 91fc79aa2101867fedfbcd7d846e9508009894e6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Sep 9 09:12:30 2014 -0700
disables luasockets
commit 31f2ee462708ab7b604b9399eaabd275e2da9e02
Merge: 19099fd 0abe4cb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Sep 9 08:10:48 2014 -0700
Merge remote-tracking branch 'cocos2d/v3' into cmakefile_mac_osx
Conflicts:
cocos/3d/cocos3d.h
commit 19099fd021b4ecf1f2eebd73ea14e84572d1ee33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 23:21:03 2014 -0700
compiles on Linux
commit eec7b92817ac9208123468bb882612aad89f94bf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 23:16:46 2014 -0700
all projecs compiles with CMake
commit 40fcc8325b409a580fdbf26d2ee27aa2d1db0109
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 21:47:27 2014 -0700
CCUserDefualt.mm better includes
commit 30709ec8243562858498cb118240bb45bf9b33b0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 21:26:36 2014 -0700
cpp-tests compiles and works on Mac using CMake
commit 67f0fc8df887d08d3d7a27c5fdadd335d6841676
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 20:12:09 2014 -0700
Adds missing files to CMakeLists.txt
commit 36f939ea7f157ca851aee138300c13d9888c0078
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 19:52:34 2014 -0700
Adds more box2d missing files
commit 00f81e3b5ec97150974cc6022e86c394ff488ccb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 19:39:54 2014 -0700
Adds missing box2d files
commit 9673227b4d7d0e6d9eced49bdd69b98cb519968a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 18:44:15 2014 -0700
Initial CMake support for Mac
|
2014-09-09 12:18:31 -07:00 |
songchengjiang
|
4099015421
|
Sprite3D set default _contentSize by AABB
|
2014-09-09 17:47:34 +08:00 |
yangxiao
|
cf9094207a
|
merge cocos
|
2014-09-09 16:00:55 +08:00 |
yangxiao
|
b88c462c8f
|
remove Sequence3D
|
2014-09-09 11:34:17 +08:00 |
yangxiao
|
a295159a3a
|
Merge branch 'newcode' into transition
|
2014-09-09 10:37:08 +08:00 |
yangxiao
|
730ab846c3
|
code adjustment
|
2014-09-05 14:59:14 +08:00 |
yangxiao
|
8da7a4b2de
|
merge cocos reslove conflict
|
2014-09-04 17:40:14 +08:00 |
yangxiao
|
31dc3301b3
|
add space line
|
2014-09-04 17:03:46 +08:00 |
yangxiao
|
a5e1e692e8
|
Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard
|
2014-09-04 17:00:49 +08:00 |
liuliang
|
c42bef1f02
|
Add a bulletin board test example
|
2014-09-04 16:58:00 +08:00 |
yangxiao
|
d114e11a0b
|
android, linux and lua
|
2014-09-04 16:45:42 +08:00 |
yangxiao
|
226e60a3ee
|
rename billboard
|
2014-09-04 16:26:36 +08:00 |
yangxiao
|
86d9ce381b
|
rename billboard
|
2014-09-04 16:26:11 +08:00 |
yangxiao
|
08a1405bdc
|
fix bug on custom mesh
|
2014-09-04 14:26:23 +08:00 |
yangxiao
|
4e65d070a1
|
rename BillBoard Model
|
2014-09-03 18:19:12 +08:00 |
XiaoYang
|
58f4e84b9a
|
Merge pull request #126 from songchengjiang/billboard
Billboard
|
2014-09-03 18:12:08 +08:00 |
songchengjiang
|
114de83a0b
|
Added View_Oriented and View_Plane_Oriented Mode
|
2014-09-03 18:04:48 +08:00 |
songchengjiang
|
68ce6449e8
|
repaired camera orientation
Testing RotateBy action
|
2014-09-03 17:17:57 +08:00 |
yangxiao
|
bb90fe48ef
|
merge cocos
|
2014-09-03 16:54:17 +08:00 |
XiaoYang
|
f03c4d4790
|
Merge pull request #125 from liuliang2004/Meshv3
Set the node name
|
2014-09-03 15:59:49 +08:00 |
liuliang
|
c167ed17ee
|
Set the node name
|
2014-09-03 15:55:11 +08:00 |
yangxiao
|
5a85cb405e
|
fix billboard face
|
2014-09-03 15:28:15 +08:00 |
XiaoYang
|
4e0c358a90
|
Merge pull request #124 from liuliang2004/Meshv3
Set the node name
|
2014-09-03 13:12:33 +08:00 |
yangxiao
|
adda886210
|
tmp work
|
2014-09-03 11:58:09 +08:00 |
liuliang
|
278a3441ce
|
Set the node name
|
2014-09-03 11:43:42 +08:00 |
yangxiao
|
fed2021707
|
Fixme: frustum culling
|
2014-09-03 09:02:32 +08:00 |
lvlong
|
387f190ff1
|
Merge newcode into v3
|
2014-09-02 17:52:02 +08:00 |
lvlong
|
27f771744a
|
static model load problem of old version .
|
2014-09-02 17:33:22 +08:00 |
yangxiao
|
f84c6a5d27
|
Merge branch 'newcode' into transition
|
2014-09-02 17:15:05 +08:00 |
songchengjiang
|
8a88ba6142
|
Tab Format
|
2014-09-02 11:50:09 +08:00 |
songchengjiang
|
18d06015c6
|
Added More Models
Code optimization
|
2014-09-02 11:24:19 +08:00 |
yangxiao
|
d542624bfd
|
remove from map when release
|
2014-09-02 10:40:29 +08:00 |
yangxiao
|
9ce30bdabd
|
add to linux
|
2014-09-01 17:52:13 +08:00 |
yangxiao
|
57a70b629f
|
add sequence3d
|
2014-09-01 16:00:50 +08:00 |
yangxiao
|
33005bedcb
|
add to cocos3d
|
2014-09-01 15:32:06 +08:00 |
yangxiao
|
97c8764ae7
|
remove unused header
|
2014-09-01 15:21:47 +08:00 |
yangxiao
|
538fe2e543
|
Merge branch 'newcode' into transition
|
2014-09-01 15:14:30 +08:00 |
yangxiao
|
c24701ac79
|
Merge branch 'newcode' into v3
|
2014-09-01 15:11:27 +08:00 |
yangxiao
|
b5a3bb1c03
|
sequence3d work
|
2014-09-01 15:07:06 +08:00 |
songchengjiang
|
97f7d21f50
|
Format
|
2014-09-01 09:36:07 +08:00 |
yangxiao
|
f3e017e139
|
normalize quat
|
2014-09-01 09:34:09 +08:00 |
songchengjiang
|
3f8b430b3e
|
deleted Meshcommand
|
2014-09-01 09:33:08 +08:00 |
yangxiao
|
a039d6b0fc
|
animate3d transition
|
2014-08-29 18:25:42 +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 |
minggo
|
3679d66c8e
|
remove unneeded includes
|
2014-08-29 15:39:52 +08:00 |
songchengjiang
|
71d722854c
|
added mesh command
|
2014-08-29 12:08:28 +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 |
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 |
lvlong
|
5a1e0601a7
|
Code Standards
|
2014-08-29 10:43:26 +08:00 |
songchengjiang
|
96e6595e95
|
Added getInverseViewMatrix
|
2014-08-29 10:42:02 +08:00 |
yangxiao
|
18a0f34c5c
|
Merge branch 'newcode' into billboard
|
2014-08-29 10:12:00 +08:00 |
songchengjiang
|
06e3eb955f
|
repaired BillBoard Depth Test
|
2014-08-29 09:30:59 +08:00 |
songchengjiang
|
e6f055f3fd
|
calculated Z in View
Transparent Render
|
2014-08-28 19:22:01 +08:00 |
yangxiao
|
a3dd4e101a
|
animation transition
|
2014-08-28 18:53:15 +08:00 |
minggo
|
50a2cb2b86
|
remove unneeded includes
|
2014-08-28 17:32:23 +08:00 |
minggo
|
7baf873bf6
|
remove unneeded includes
|
2014-08-28 17:03:29 +08:00 |
yangxiao
|
16ab05a8cf
|
sequence3d
|
2014-08-28 13:47:17 +08:00 |
lvlong
|
a05d50d66e
|
Merge branch 'v3' of github.com:super626/cocos2d-x into merge-bundle
|
2014-08-28 12:02:33 +08:00 |
minggo
|
d3ce2acff6
|
Merge pull request #7892 from Dhilan007/v3-androidmk
Adjust android.mk for cocos2d and related module
|
2014-08-28 10:16:39 +08:00 |
yangxiao
|
74f98b36d6
|
merge cocos
|
2014-08-28 09:22:57 +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 |
Dhilan007
|
bef774a14a
|
Adjust android.mk for cocos2d and related module
|
2014-08-27 22:54:28 +08:00 |
samuele3hu
|
3d5f8de346
|
Adjust android.mk for cocos2d and related module
|
2014-08-27 20:58:32 +08:00 |
lvlong
|
e05f6bc874
|
modify for compress
|
2014-08-27 18:44:31 +08:00 |
yangxiao
|
8cb3edf91f
|
merge cocos light work
|
2014-08-27 14:53:39 +08:00 |
yangxiao
|
fdc0fad935
|
tmp work
|
2014-08-27 14:46:24 +08:00 |
samuele3hu
|
3759648d3a
|
Remove the useless aneroid.mk files
|
2014-08-27 10:21:47 +08:00 |
samuele3hu
|
a5a706aa05
|
Remove the useless win32 project
|
2014-08-27 10:20:15 +08:00 |
yangxiao
|
8a38ce10be
|
first version billboard
|
2014-08-26 15:07:37 +08:00 |
yangxiao
|
7ff75fb397
|
remove warning
|
2014-08-26 14:19:08 +08:00 |
yangxiao
|
03390a4f46
|
merge cocos
|
2014-08-26 14:05:59 +08:00 |
songchengjiang
|
1a1ccda3ed
|
repaired Action BUG
|
2014-08-25 13:58:15 +08:00 |
yangxiao
|
c7f7623320
|
reserve animation size
|
2014-08-25 11:30:34 +08:00 |
yangxiao
|
3a0d63caa6
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
|
2014-08-22 14:55:11 +08:00 |
yangxiao
|
a102946d35
|
android and linux
|
2014-08-22 14:54:26 +08:00 |
XiaoYang
|
e4737f9070
|
Merge pull request #112 from liuliang2004/Meshv3
Modify project file
|
2014-08-22 14:46:46 +08:00 |
yangxiao
|
39cc03173b
|
remove unused variable
|
2014-08-22 14:43:48 +08:00 |
liuliang
|
c7c091e4b6
|
Modify project file
|
2014-08-22 14:32:27 +08:00 |
yangxiao
|
81dbb0bca4
|
add comment
|
2014-08-22 14:02:51 +08:00 |
yangxiao
|
d90572fc10
|
engine refactor hide concept of submesh
|
2014-08-22 13:52:03 +08:00 |
yangxiao
|
7818b28ee3
|
Merge branch 'newcode' into v3
|
2014-08-22 13:32:57 +08:00 |
yangxiao
|
022b7e3fd3
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
|
2014-08-22 13:27:14 +08:00 |
yangxiao
|
2d5431353a
|
engine adjust
|
2014-08-22 13:25:26 +08:00 |
pandamicro
|
bb5e189f30
|
Fix warning or Bundle3D
|
2014-08-21 20:02:22 +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 |
songchengjiang
|
e42eb950a3
|
Name modification
|
2014-08-21 11:33:00 +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 |