Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
26,609 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

120 Commits

Author SHA1 Message Date
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
yangxiao 908b9e470d do not try to load empty texture 2014-12-23 15:52:45 +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
yangxiao d1a35fe47a make bundle thread safe 2014-12-19 10:21:30 +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
yangxiao 5ad408530c merge cocos 2014-12-15 17:47:05 +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
yangxiao f17df4b0bc add createAsync 2014-12-03 17:40:27 +08:00
tangziwen 0d43a8f337 add macro CC_MODEL_VIEWER 2014-11-19 17:01:34 +08:00
tangziwen 63fcdcebdd use dummy texture even if in release mode 2014-11-19 16:16:59 +08:00
yangxiao 0696041ea9 add getMeshArrayByName method 2014-10-25 12:27:03 +08:00
yangxiao f878533f85 load attached sprite from cache 2014-10-24 15:52:24 +08:00
Dhilan007 a5f838496c Move `CCCamera.cpp/h` `CCLight.cpp/h` into 2d 2014-10-20 16:25:24 +08:00
yangxiao 9e1656e5b0 simplify compute global z when it is transparent 2014-10-17 11:52:39 +08:00
XiaoYang ed5f5d7229 Merge pull request #143 from tangziwen/v3 
fix Zorder for transparent mesh
 2014-10-17 11:14:01 +08:00
tangziwen d14b30ecac fix tab style 2014-10-17 10:59:53 +08:00
tangziwen 69cda9ccae fix duplicate function in create dummy texture 2014-10-17 08:58:05 +08:00
tangziwen f7888d9798 tab style fix 2014-10-15 17:01:56 +08:00
tangziwen 6ed31fa47e fix some dummy texture bugs , supply some comments 2014-10-15 16:25:14 +08:00
tangziwen cd1d2289a6 bug fix 2014-10-15 11:36:44 +08:00
tangziwen 29b255fa36 use a pure red dummy texture to indicate Sprite3d texture missing 2014-10-15 10:39:18 +08:00
tangziwen 473c9e90b2 fix Zorder for transparent mesh 2014-10-14 16:59:41 +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
Huabing.Xu e69465e428 remove texture unit 4-7, only 0 -3 is reserved 2014-10-10 14:06:37 +08:00
yangxiao dbf564208b move light from 3d to base 2014-09-28 16:02:12 +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 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 5b61e569f5 light mask 2014-09-19 14:50:20 +08:00
yangxiao 25091ca849 add transparent flag to render command 2014-09-18 12:00:44 +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 3cfc36591c merge cocos 2014-09-11 10:13:57 +08:00
minggo 46d4f487bb Merge pull request #7978 from super626/v3 
Calculate Content Size for Sprite3D
 2014-09-10 14:06:47 +08:00
Ricardo Quesada 6f3ca63f00 Moved base/CCPlatform* -> platform/CCPlatform* 2014-09-09 17:17:07 -07:00
songchengjiang 4099015421 Sprite3D set default _contentSize by AABB 2014-09-09 17:47:34 +08:00
liuliang c167ed17ee Set the node name 2014-09-03 15:55:11 +08:00