15 Commits

Author	SHA1	Message	Date
pandamicro	99e504e668	Merge pull request #12854 from yangws/issue_11310 ... fixed #11310 : multiple camera case utils::captureScreen bug.	2015-07-15 15:00:29 +08:00
Vincent Yang	7a105ce1e1	fixed #11310 : multiple camera case utils::captureScreen bug.	2015-07-15 12:09:08 +08:00
andyque	e4cad50c2f	fix tons of warnings	2015-07-15 12:04:48 +08:00
Vincent Yang	46d25a45a0	Merge branch 'v3_scene3d_fixspineani' into v3_scene3dtest	2015-07-02 10:27:25 +08:00
Vincent Yang	1105111fab	Merge v3 branch.	2015-06-30 11:59:56 +08:00
yangxiao	a433d57807	show fps	2015-06-23 11:56:50 +08:00
Vincent Yang	27bf636eab	Fix bug: spine animition can't show in Scene3DTest.	2015-06-18 11:45:17 +08:00
Vincent Yang	0e0c8cf72e	Modify Scene3DTest to composite 2D/3D scene by moving UI and camera far away.	2015-06-18 09:54:48 +08:00
Huabing.Xu	8bdb8125a2	fix android compile error	2015-05-14 14:36:45 +08:00
Vincent Yang	761da2fd20	Scene3DTest ok.	2015-05-11 14:41:50 +08:00
Vincent Yang	3bf16dcc4d	Add skybox and partile 3d in Scene3DTest.	2015-05-08 18:28:12 +08:00
Vincent Yang	966f3b6a3f	Add terrain in Scene3DTest.	2015-05-08 11:46:27 +08:00
Vincent Yang	60aa223065	Add dialog in Scene3DTest.	2015-05-07 18:43:07 +08:00
Vincent Yang	1daca7fac9	Merge bug fix code.	2015-05-07 16:52:37 +08:00
Vincent Yang	a8f0ad9d68	Add Scene3DTest.	2015-05-07 16:22:30 +08:00