3701 Commits

Author	SHA1	Message	Date
pandamicro	a81d7aa8b4	Merge pull request #12541 from VisualSJ/v3-aa ... [ci skip] Encoded into AVC	2015-06-25 20:32:53 +08:00
VisualSJ	110e51d0bc	Encoded into AVC	2015-06-25 19:01:55 +08:00
pandamicro	117a72fa07	Merge pull request #12514 from WenhaiLin/v3-37-autotest-timeoutfix ... [Cpp-tests]Fixed cannot start auto test again if the timeout has occurred.	2015-06-24 23:07:38 +08:00
pandamicro	f9db471026	Merge pull request #12495 from super626/v3 ... Fix terrain getIntersectionPoint	2015-06-24 18:36:52 +08:00
WenhaiLin	a7632a962f	[Cpp-tests]Fixed cannot start auto test again if the timeout has occurred.	2015-06-24 18:24:16 +08:00
pandamicro	6638a53d69	Merge pull request #12509 from xiaofeng11/v3_xiaofeng ... Add a text label to Node3DReader Test, notice user there has no content to show	2015-06-24 17:10:08 +08:00
Bin Zhang	c9c212d0e1	Solve the error when run tests projects with `cocos run`.	2015-06-24 15:33:13 +08:00
XiaoFeng	0846dadbc3	Add a text label to Node3DReader Test, notice user there has no content to show	2015-06-24 14:58:14 +08:00
pandamicro	fb852046e1	Merge pull request #12508 from jianglong0156/AccelerometerCrash ... reduce the accelerometer log num, avoid log too much in vs	2015-06-24 13:45:53 +08:00
jianglong0156	9b31e8ed16	reduce the accelerometer log num, avoid log too much in vs	2015-06-24 12:03:16 +08:00
pandamicro	7ddb6308e9	Merge pull request #12503 from jianglong0156/hidepluginx ... hide facebook testcase	2015-06-23 22:19:10 +08:00
江龙	f3eb455669	hide facebook testcase	2015-06-23 22:14:27 +08:00
samuele3hu	5c5f3dcc79	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_7_test	2015-06-23 20:03:14 +08:00
samuele3hu	e2aa669b8d	Fix the LayerTest error about Lua	2015-06-23 20:02:26 +08:00
pandamicro	32accbf21b	Merge pull request #12488 from WenhaiLin/v3-37-androidApplicationFix ... Fixed Application may be created more than once on Android.	2015-06-23 19:43:39 +08:00
pandamicro	0b26f966b5	Merge pull request #12497 from VisualSJ/v3-aa ... [ci skip]add info into BlendFunc tests on canvas and tests data problem	2015-06-23 19:43:08 +08:00
VisualSJ	5472928aaa	add info into BlendFunc tests on canvas and tests data problem	2015-06-23 18:54:18 +08:00
yangxiao	c3593c9d64	merge cocos	2015-06-23 18:29:39 +08:00
yangxiao	251c81d7be	Merge branch 'newcode' into v3	2015-06-23 18:25:41 +08:00
WenhaiLin	f95245312a	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-37alpha0	2015-06-23 17:08:25 +08:00
pandamicro	ce508bab87	Merge pull request #12487 from pandamicro/v3 ... Fix TransitionTest issue that depth test haven't been disabled after transition	2015-06-23 16:59:08 +08:00
WenhaiLin	cbb073e905	Fixed Application may be created more than once on Android.	2015-06-23 16:58:38 +08:00
pandamicro	cd1233f801	Fix TransitionTest issue that depth test haven't been disabled after transition	2015-06-23 16:58:15 +08:00
Vincent Yang	27d011dd50	Fixbug: LabelTestNew New Label + CharMap's effect is wrong.	2015-06-23 16:02:38 +08:00
子龙山人	fca9b89a4c	Merge pull request #12480 from andyque/fix-rapidjson-assert-error ... fix rapidjson assert error	2015-06-23 15:34:47 +08:00
andyque	70b709f4a8	fix rapidjson assert error	2015-06-23 13:54:11 +08:00
pandamicro	4823cc3bc2	Merge pull request #12476 from super626/fps ... show fps in scene3d demo	2015-06-23 13:42:26 +08:00
子龙山人	d8a2695620	Merge pull request #12473 from WenhaiLin/v3-37-ParticleDemo-crashfix ... [cpp-tests] ParticleIssue12310:Fixed crash when tap left/right arrow to move to another test case.	2015-06-23 13:36:36 +08:00
pandamicro	b08325dd5b	Merge pull request #12475 from samuele3hu/v3_7_test ... [ci skip]Fix the some test cases error about Lua	2015-06-23 13:15:21 +08:00
yangxiao	a433d57807	show fps	2015-06-23 11:56:50 +08:00
WenhaiLin	a68874d3cb	Node: Particles --> ParticleIssue12310:Fixed crash when tap left/right arrow to move to another test case.	2015-06-23 11:00:23 +08:00
andyque	931011809d	fixed unintended spaces in string	2015-06-23 10:38:43 +08:00
samuele3hu	3b766e5236	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_7_test	2015-06-23 10:20:05 +08:00
samuele3hu	683c5b4cb2	Fix the LabeLTestNew error.	2015-06-22 22:32:21 +08:00
pandamicro	0f5c343e1e	Merge pull request #12460 from MSOpenTech/v3-winrt-readme ... Added Windows 10.0 UWP info to Readme	2015-06-22 13:05:51 +08:00
pandamicro	b1e24ee8f2	Merge pull request #12455 from natural-law/v3 ... Solve the error when build tests projects with cocos command on win32.	2015-06-22 13:04:17 +08:00
samuele3hu	bc964c96da	Fix the error about the Camera3D Test	2015-06-22 09:28:18 +08:00
samuele3hu	0181a84883	Fix the bugs about the particle3DTest	2015-06-22 09:27:34 +08:00
WenhaiLin	6bd46fcfcc	[ci skip]UIRichTextTest:Fixed text don't render properly in the Windows 8.1 Store App.	2015-06-20 17:07:11 +08:00
Dale Stammen	d438bd6f49	added app name to 150x150 windows tile	2015-06-19 09:23:50 -07:00
Bin Zhang	85fe9e8816	Solve the error when build tests projects with cocos command on win32.	2015-06-19 18:32:32 +08:00
子龙山人	8ca0f18575	Merge pull request #12446 from pandamicro/v3 ... Add auto bindings for navmesh	2015-06-19 17:21:00 +08:00
子龙山人	776dd1dd09	Merge pull request #12449 from WenhaiLin/v3-37-resoucesfix ... [ci skip]Fixed resources.	2015-06-19 16:30:05 +08:00
WenhaiLin	45de0b650a	[ci skip]Fixed resources.	2015-06-19 16:26:03 +08:00
子龙山人	869e3c5243	Merge pull request #12444 from WenhaiLin/v3-37-label-linewrapfix ... Label:Fixed line wrap error without space.	2015-06-19 15:08:13 +08:00
WenhaiLin	d32a317ea0	Label:Fixed line wrap error without space.	2015-06-19 13:39:19 +08:00
pandamicro	ca989e2aed	Fix physics3d js test issue	2015-06-19 10:35:45 +08:00
pandamicro	c6d4f283bb	Fix compilation issue in navmesh conversion	2015-06-19 08:11:45 +08:00
江龙	91bc19fb29	Merge branch 'v3_origin' into navmesh ... Conflicts: tests/js-tests/src/Physics3DTest/Physics3DTest.js	2015-06-18 23:50:19 +08:00
pandamicro	b757837239	Move NavMesh to jsb namespace	2015-06-18 22:57:41 +08:00