30686 Commits

All Branches

Search

Author	SHA1	Message	Date
Jacky	34d1cc0b1d	refactory Effects test case.	2015-07-08 21:56:14 +08:00
Jacky	a59828605b	Support TileGrid rectangle.	2015-07-08 17:47:04 +08:00
Jacky	4a9e9f3744	completed api.	2015-07-08 17:26:29 +08:00
Jacky	260ce177d7	refine GridNode with rect.	2015-07-08 15:57:27 +08:00
pandamicro	740346335f	Merge pull request #12620 from yangws/v3_scene3dtest ... Fix bug: wrong usage of function isVisiableByVisitingCamera, which should only effect draw call.	2015-07-02 10:14:26 +08:00
子龙山人	8f7098e2c8	Merge pull request #12611 from andyque/add-project-template-to-jenkins ... finish template daily build.	2015-07-01 17:26:12 +08:00
pandamicro	012b0b7083	Merge pull request #12612 from jianglong0156/callStaticMethodWithBool ... Call static method with bool add testcase	2015-07-01 17:10:23 +08:00
Vincent Yang	cb0e93fc08	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_scene3dtest	2015-07-01 14:58:06 +08:00
Vincent Yang	d26c08de46	Merge branch 'v3_scene3d_fixvisitingcamera' into v3_scene3dtest	2015-07-01 14:47:42 +08:00
pandamicro	2774d6ff1d	Merge pull request #12602 from yangws/v3_scene3dtest ... Fixed bug: UI component can't click correctly by moving UI and camera far away of origin.	2015-07-01 14:46:35 +08:00
jianglong0156	b05b481b1c	Merge branch 'v3' into callStaticMethodWithBool	2015-07-01 11:46:26 +08:00
pandamicro	4d95c8778b	Merge pull request #12598 from shinhirota/v3 ... Fixed iOS/JS-Bind callStaticMethod() with bool arg	2015-07-01 11:34:03 +08:00
andyque	53817618b7	finish template daily build. ... 1. daily build doesn't clean when build finished. 2. add options to template daily build	2015-07-01 11:24:46 +08:00
Vincent Yang	96b49277cc	[ci skip] add comment for UIWidget::_hittedByCamera.	2015-07-01 11:03:09 +08:00
jianglong0156	9e9625feca	add bool parm in android	2015-07-01 10:57:43 +08:00
jianglong0156	2ef2016c39	add call reflection with bool test case	2015-07-01 10:41:24 +08:00
jianglong0156	d6c039f528	Merge branch 'v3' of https://github.com/shinhirota/cocos2d-x into callStaticMethodWithBool	2015-07-01 10:30:13 +08:00
子龙山人	40521ad1c4	Merge pull request #12600 from fusijie/fix_spritebatchnode_sort_error ... Fix SpriteBatchNode sort error.	2015-06-30 17:29:59 +08:00
子龙山人	077241eecf	Merge pull request #12599 from jianglong0156/jsbProjectMerge ... merge the jsb project into cocos2d project	2015-06-30 17:04:12 +08:00
子龙山人	d5d68223f1	Merge pull request #12604 from WenhaiLin/v3.8-audio-iosfix ... AudioEngine:Fixed play audio may fail(error code:-1) on iOS	2015-06-30 16:30:05 +08:00
子龙山人	3b4d134050	Merge pull request #12603 from jianglong0156/autoPolygonFileEncode ... change the file encoding,	2015-06-30 16:29:44 +08:00
jianglong0156	1f4e65e401	Merge pull request #10 from andyque/testMergeJSB ... update daily build and pr build	2015-06-30 16:26:57 +08:00
andyque	a6451c6c5e	update daily build and pr build	2015-06-30 16:24:03 +08:00
Wenhai Lin	e124593a5c	AudioEngine:Fixed play audio may fail(error code:-1) on iOS	2015-06-30 15:38:24 +08:00
jianglong0156	bc341edf1f	change the file encoding, ... It display a coded warning in current encoding, leading to incredbuild unusable	2015-06-30 15:33:54 +08:00
Vincent Yang	2ba6f266ad	Fixed bug: UI component can't click correctly by moving UI and camera far away of origin.	2015-06-30 14:32:14 +08:00
Jacky	25bac2f6a9	Fix SpriteBatchNode sort error.	2015-06-30 14:12:18 +08:00
jianglong0156	329aab4a7a	delete invalid project file	2015-06-30 13:52:00 +08:00
jianglong0156	f20f8a2777	delete invalid project files	2015-06-30 13:51:13 +08:00
jianglong0156	185b4419be	merge job project into cocos2d-x project	2015-06-30 13:49:24 +08:00
pandamicro	c0ff3abef6	Merge pull request #12419 from yangws/v3_scene3dtest ... Modify Scene3DTest to composite 2D/3D scene by moving UI and camera f…	2015-06-30 13:44:20 +08:00
Shin Hirota	221d33a431	Fixed iOS/JS-Bind callStaticMethod() with bool arg	2015-06-30 14:00:28 +09:00
Vincent Yang	1105111fab	Merge v3 branch.	2015-06-30 11:59:56 +08:00
子龙山人	29cccf631e	Merge pull request #12550 from kompjoefriek/v3-vibrate ... Vibrate support in v3	2015-06-30 10:28:59 +08:00
子龙山人	950cb840c2	Merge pull request #12582 from super626/listview ... fix camera mask of listview	2015-06-30 10:25:57 +08:00
子龙山人	265c9b55e0	Merge pull request #12586 from fusijie/add-autoculling-bug-testcase ... add auto culling test case.	2015-06-30 09:33:36 +08:00
jianglong0156	aac1da2016	Merge branch 'jsbProjectMerge' of https://github.com/jianglong0156/cocos2d-x into jsbProjectMerge	2015-06-29 17:58:58 +08:00
jianglong0156	3c13cdd62c	add space project	2015-06-29 17:58:38 +08:00
jianglong0156	8711ffddce	delete js-tests project in win8.1 and wp8	2015-06-29 17:44:27 +08:00
Jacky	0be9763a9c	add auto culling test case.	2015-06-29 17:25:13 +08:00
jianglong0156	ba768c45ac	add js-test into cocos2d project in win8	2015-06-29 17:23:19 +08:00
jianglong0156	58f7d568cd	remove js project in win32	2015-06-29 17:14:22 +08:00
pandamicro	08bdf84183	Merge pull request #12584 from jianglong0156/tilemapTestCaseConflict ... resolve the conflict that the 3d testcase show error after click the the titlemap testcase	2015-06-29 17:07:13 +08:00
子龙山人	c997284825	Merge pull request #12352 from andyque/add-two-events-to-ui-slider ... Improve ui::Slider	2015-06-29 17:01:27 +08:00
子龙山人	aa86ed9a04	Merge pull request #12466 from neokim/feature/elastic_scrollview ... Enhance ScrollView with easing out scrolling	2015-06-29 16:59:24 +08:00
jianglong0156	bbf4476ff3	add win32 js-test project into cocos2d-x project	2015-06-29 16:48:09 +08:00
jianglong0156	fd54b9941d	resolve the titlemap testcase conflict with the 3d testcase.	2015-06-29 16:34:54 +08:00
Neo Kim	71fc49b6a6	Merge pull request #1 from andyque/testElasticScrollView ... Test elastic scroll view	2015-06-29 16:38:44 +09:00
yangxiao	a56a5d24b6	fix camera mask of listview	2015-06-29 14:41:03 +08:00
andyque	60834e6f0c	Merge branch 'v3' into v3-finish-android-9-patch-image-format ... Conflicts: cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters	2015-06-29 12:05:52 +08:00