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

132 Commits

Author SHA1 Message Date
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