axmol

Commit Graph

Author	SHA1	Message	Date
andyque	6238ddebf3	Merge remote-tracking branch 'upstream/v3.7-release' into v3	2015-07-07 10:18:43 +08:00
WenhaiLin	4bd1fa7d37	Fixed crash cause by the case of file name on WIN32.	2015-07-07 10:08:47 +08:00
XiaoFeng	9a6ffd8904	Add bug test for PageView layout & CCNodeDraw::onDrawGLLine	2015-07-07 09:54:42 +08:00
子龙山人	a6b29666c9	Merge pull request #12674 from WenhaiLin/v3-38-issue12673 Label:Fixed the characters are displayed incorrect with "dark roast.ttf"	2015-07-07 09:50:00 +08:00
CocosRobot	4c88db3fb2	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-07-07 00:44:47 +00:00
Ricardo Quesada	ad1fc88fa8	compiles on Xcode 7	2015-07-06 16:30:29 -07:00
Ricardo Quesada	4c88be9520	removes -fno-excpetion and -fexception from cmake	2015-07-06 12:09:50 -07:00
CocosRobot	a4bce56cca	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-07-06 10:37:24 +00:00
VisualSj	3b69a1726f	Fixed a bug that action texture address error	2015-07-06 17:17:20 +08:00
jianglong0156	6f3b977c1e	add UserDefault api deleteValueForKey	2015-07-06 17:01:17 +08:00
XiaoFeng	214684b3be	Fix	2015-07-06 16:45:04 +08:00
XiaoFeng	9fab1e7702	Change to use auto & for each to enum sub items	2015-07-06 16:39:00 +08:00
CocosRobot	ae860bd6ee	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-07-06 08:29:03 +00:00
子龙山人	17207f14e5	Merge pull request #12689 from fusijie/refine_setAnimationInterval Refine setAnimationInterval from double to float.	2015-07-06 16:18:45 +08:00
Liam	51993d5733	update for reader	2015-07-06 16:14:41 +08:00
XiaoFeng	d6fc8ecc94	Fix when use percentage size & position to a UIWidget which parent is a layout component, when change simulator screen size, layout won't effect correctly.	2015-07-06 16:02:19 +08:00
Jacky	4499b60446	Refine setAnimationInterval from double to float.	2015-07-06 14:57:42 +08:00
Neo Kim	a01f31c75c	Change NULL to nullptr	2015-07-06 15:54:28 +09:00
Liam	fff4e2f34c	update for reader	2015-07-06 14:05:06 +08:00
Neo Kim	c4dc9b04fd	Add a guard filtering tries to set same value.	2015-07-06 14:54:28 +09:00
XiaoFeng	df2a2d253d	Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3.7-release	2015-07-06 10:31:09 +08:00
Neo Kim	0ff7aaef95	Modify loop iteration codes	2015-07-06 11:30:24 +09:00
Neo Kim	43308e258a	Fix an issue of not releasing Texture instance in ScrollViewBar	2015-07-06 11:29:39 +09:00
Neo Kim	a4803c6713	Remove unnecessary commented out code.	2015-07-05 21:30:13 +09:00
Neo Kim	3ab4285960	Refactor code	2015-07-04 16:06:05 +09:00
Neo Kim	6264f7fefb	Correct include-related build errors in some platforms	2015-07-04 15:03:05 +09:00
Neo Kim	ceeca575f3	Replace 'margin' of scroll bar with 'positionFromCorner'	2015-07-04 14:05:47 +09:00
Neo Kim	f667b085b8	Change not to show scroll bar when the scroll view is initiated.	2015-07-04 09:59:22 +09:00
Neo Kim	9548d85f08	Fix radio button group clear issue	2015-07-04 09:57:54 +09:00
Neo Kim	3b6cd4dffc	Modify indentation to comply with the convention	2015-07-04 09:56:53 +09:00
Neo Kim	86cbd59bfd	Add UIScrollViewBar.cpp into CMake and Windows project configuration.	2015-07-04 09:56:53 +09:00
Neo Kim	60c32f6fb5	Refactor some codes	2015-07-04 09:56:53 +09:00
Neo Kim	ec45be699d	Add UIScrollViewBar class documentation	2015-07-04 09:56:52 +09:00
Neo Kim	c093bb18e2	Add scroll bar manipulation methods into ScrollView	2015-07-04 09:56:52 +09:00
Neo Kim	9a11cfd496	Add a way of changing scroll bar width	2015-07-04 09:56:52 +09:00
Neo Kim	2cae17b462	Add scroll bar feature into ScrollView	2015-07-04 09:56:52 +09:00
CocosRobot	fbf98adc7a	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-07-03 14:48:11 +00:00
pandamicro	38ded61568	Merge pull request #12670 from yangws/issue_8256 Fixbug: CCTargetedAction executes callback twice.	2015-07-03 22:34:54 +08:00
CocosRobot	91dc2d22de	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-07-03 10:37:33 +00:00
WenhaiLin	c11e91e215	Label:Fixed the characters are displayed incorrect with "dark roast.ttf"	2015-07-03 18:08:32 +08:00
Liam	64b8660873	update for skybox reader	2015-07-03 17:52:42 +08:00
Vincent Yang	ca02f167c6	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3	2015-07-03 15:43:58 +08:00
Vincent Yang	1abeb8bf1e	Fixbug: CCTargetedAction executes callback twice.	2015-07-03 15:42:49 +08:00
pandamicro	f126eb3267	Merge pull request #12644 from WenhaiLin/v3-38-backevent-fix Fixed EventListenerKeyboard.onKeyPressed not firing for back button on Android.	2015-07-03 15:42:45 +08:00
WenhaiLin	91bc8f2e2d	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3.8	2015-07-03 14:59:12 +08:00
pandamicro	1f48beee1e	Reorganize code	2015-07-03 12:55:55 +08:00
XiaoFeng	993e420ce4	Fix drawLine & drawPoints won't use blendFunc bug	2015-07-03 11:30:38 +08:00
pandamicro	155b9b918c	Add retain/release for XMLHTTPReqest in JSB	2015-07-03 11:01:43 +08:00
pandamicro	1b22438792	Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into merge-v3.7 Conflicts: cocos/ui/UICheckBox.cpp	2015-07-03 10:23:49 +08:00
pandamicro	e7aeb335a3	Merge pull request #12609 from alexpeak/fixCCLabelPurgeResetOrder Ensure CCLabel atlases are purged before resetting	2015-07-02 19:01:50 +08:00
pandamicro	ecf7148f85	Merge pull request #12624 from WenhaiLin/v3.8 AudioEngine:Fixed play audio may fail when switch to new scene on iOS.	2015-07-02 18:47:44 +08:00
pandamicro	e7c6ae7b13	Merge pull request #12637 from super626/skybox Set Texturecube tex parameter to clamp to edge	2015-07-02 18:34:38 +08:00
子龙山人	91a8872cbd	Merge pull request #12647 from xiaofeng11/v3.7-release UISlider update	2015-07-02 18:01:38 +08:00
pandamicro	dbd72d0123	Merge pull request #12646 from VisualSJ/v3.7-release [ci skip] Fixed a bug that is don't analytical frame	2015-07-02 17:22:13 +08:00
子龙山人	5b971ee93d	Merge pull request #12607 from neokim/add_radio_button_and_group Add RadioButton and RadioButtonGroup widgets	2015-07-02 17:12:59 +08:00
Michael Sotnikov	363da2beab	Fixed: #12645 iOS: depth/stencil buffers attributes are ignored	2015-07-02 12:07:24 +03:00
XiaoFeng	668dc50e07	Fix when slider set to disable mode then clean slider ball disable texture, normal texture won't show	2015-07-02 16:45:17 +08:00
WenhaiLin	a28ad6939d	Fixed EventListenerKeyboard.onKeyPressed not firing for back button on Android.	2015-07-02 16:19:33 +08:00
pandamicro	d155d42c0e	Merge pull request #12617 from yangws/issue_8194 Fixbug :EventDispatcher wrong dispatch order	2015-07-02 14:42:30 +08:00
Sijie.Wang	7818bfcc7a	Fixed a bug that is don't analytical frame	2015-07-02 14:30:44 +08:00
Neo Kim	61df7bc827	Add class documentation	2015-07-02 15:20:06 +09:00
Neo Kim	ec589c8d6f	Correct the wrong comment for lua	2015-07-02 15:19:50 +09:00
Neo Kim	0e35ee597a	Add logic for not belonging radio button checking.	2015-07-02 15:01:24 +09:00
pandamicro	079ccbb0e2	Merge pull request #12639 from VisualSJ/v3.7-release Fixed a bug that is LayoutComponent position error	2015-07-02 13:58:15 +08:00
VisualSJ	a475caf35a	Fixed a bug that is LayoutComponent position error	2015-07-02 11:52:31 +08:00
Neo Kim	c4aa5a6274	Remove the code related to becoming parent node of radio buttons. Radio button group is not a parent node of radio buttons anymore.	2015-07-02 11:50:50 +09:00
Neo Kim	6550a9ccc2	Replace all tabs to 4 spaces to comply with the convention	2015-07-02 11:30:14 +09:00
XiaoFeng	9a905ede56	Fix check box front cross texture expand to normal size when change status between normal and disable frequency	2015-07-02 10:29:53 +08:00
Neo Kim	4b2bff4674	Change RadioButtonGroup not to be a node-parent of radio buttons but just a grouping node. And add one more test case.	2015-07-02 11:28:14 +09:00
CocosRobot	bf3c970534	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-07-01 14:12:18 +00:00
pandamicro	3b9fd5502e	Fix cc.isArray for JSB	2015-07-01 21:57:39 +08:00
zhang	48c3466774	Update LayerEx.lua	2015-07-01 20:25:45 +08:00
pandamicro	a95edbfb65	Merge pull request #12618 from super626/clippingnode2 Sprite3D Clipping	2015-07-01 18:56:16 +08:00
pandamicro	6b730b5fbd	Merge pull request #12619 from WenhaiLin/v3-37-labelfix Label:Fixed the top of character's texture may be tailored if enable outline effect.	2015-07-01 18:55:04 +08:00
songchengjiang	da5e077b55	texture set GL_CLAMP_TO_EDGE	2015-07-01 18:06:17 +08:00
Wenhai Lin	c06b5c5570	AudioEngine:Fixed play audio may fail when switch to new scene on iOS.	2015-07-01 17:19:28 +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
WenhaiLin	322bd30d7b	Label:Fixed the top of character's texture may be tailored if enable outline effect.	2015-07-01 14:57:01 +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
Vincent Yang	276ed46c01	Fixbug : issue 8194.	2015-07-01 14:39:35 +08:00
yangxiao	52daa2234c	add setForce2DQueue	2015-07-01 14:24:22 +08:00
yangxiao	269feeb1f9	remove stencil from Renderstate	2015-07-01 14:06:37 +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
Neo Kim	a64e50688e	Add the new files into CMake and Windows project configurations.	2015-07-01 12:21:42 +09:00
Vincent Yang	96b49277cc	[ci skip] add comment for UIWidget::_hittedByCamera.	2015-07-01 11:03:09 +08:00
Alex Peak	5328996a18	Fix event listener cleanup in destructor Event listeners should always be removed at destroy (move out of if-block)	2015-06-30 18:59:33 -07:00
Alex Peak	7cea464a11	Ensure CCLabel atlases are purged before resetting The current purge->reset behavior occurs per label according to scene graph priority. This has two disadvanages; firstly, any labels that are initialized but not part of the scene graph will not be reset. Secondly, any labels which share atlases in the FontAtlasCache may not be reset since each label will call releaseFontAtlas individually before resetting its fontConfig. This means that any shared atlases may not be released all the way to a reference count of 0 and the invalid atlas will not be deleted and reset from scratch. By putting a fixed priority on both the purge and reset steps we can ensure that firstly: all labels will be reset regardless of whether they have been added to the scene-graph. Secondly, ALL labels with the same atlas must call releaseFontAtlas before any others are allowed to rebuild their textures. This will prevent any old atlases from sticking around after a new GL context is created. This is a fix for Github issue #8305 https://github.com/cocos2d/cocos2d-x/issues/8305	2015-06-30 13:16:25 -07:00
Neo Kim	3f05ad2b98	Replace all tabs to 4 spaces to comply with the convention	2015-06-30 20:31:31 +09:00
Neo Kim	f5e7184f0b	Add new cpp files into Android.mk	2015-06-30 18:50:13 +09:00
Neo Kim	bed90606d3	Add RadioButton feature and a test case for it.	2015-06-30 18:50:13 +09:00
Neo Kim	a37015d083	To create radio button feature which uses almost same logic with CheckBox, extract the common logic from CheckBox and make it as AbstractCheckButton class.	2015-06-30 18:50:13 +09:00
子龙山人	40521ad1c4	Merge pull request #12600 from fusijie/fix_spritebatchnode_sort_error Fix SpriteBatchNode sort error.	2015-06-30 17:29:59 +08:00
Bin Zhang	d0db3aee98	Remove the plugin-x related files from the Xcode project of js-bindings .	2015-06-30 17:28:47 +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
Bin Zhang	bb77101f0b	Solve the error when building simulator for android.	2015-06-30 16:45:13 +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
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
yangxiao	2ed5ee123e	improve collider	2015-06-30 14:16:05 +08:00
Jacky	25bac2f6a9	Fix SpriteBatchNode sort error.	2015-06-30 14:12:18 +08:00
jianglong0156	185b4419be	merge job project into cocos2d-x project	2015-06-30 13:49:24 +08:00
Shin Hirota	221d33a431	Fixed iOS/JS-Bind callStaticMethod() with bool arg	2015-06-30 14:00:28 +09: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
pandamicro	92c869f408	Merge pull request #12594 from MSOpenTech/v3-winrt-js-keyboard V3 winrt js keyboard support	2015-06-30 07:24:17 +08:00
Dale Stammen	38b687f8d8	enable support for keyboard on winrt platforms to fix back button	2015-06-29 09:13:19 -07:00
Dale Stammen	7684c208e0	unsupported cocos2d-x image formats removed or updated	2015-06-29 08:41:44 -07:00
Dale Stammen	eb668f63ce	unsupported cocos2d-x image formats removed or updated	2015-06-29 08:39:31 -07:00
pandamicro	15c763d84a	Update engine version	2015-06-29 18:21:06 +08:00
songchengjiang	7733f0fe19	add interfaces	2015-06-29 17:20:28 +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
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
andyque	30d2129f0c	improve indent and getTime function	2015-06-29 11:52:53 +08:00
songchengjiang	070705949b	tab format	2015-06-29 11:48:43 +08:00
songchengjiang	7befab0f7b	add Physics3DCollider	2015-06-29 10:26:09 +08:00
zhang	43ea04da3c	fix onTouch begin don't return value fix only receive "begin" envent,can't receive "moved" "ended"	2015-06-28 13:18:33 +08:00
pandamicro	c055028485	Merge pull request #12566 from jianglong0156/winrtMouse Winrt mouse	2015-06-26 18:43:33 +08:00
pandamicro	88aeaa36f4	Merge pull request #12534 from super626/skybox Skybox improvement	2015-06-26 17:05:17 +08:00
子龙山人	260d5035bb	Merge pull request #12555 from WenhaiLin/v3-simpleaudio-AndroidL-Fix Fixed SimpleAudioEngine may cause application to crash on Android L(5.0.x)	2015-06-26 11:05:40 +08:00
Wenhai Lin	1875829ab4	[CppTests:ExtensionsTest-->CocoStudioComponentsTest]Fixed crash on Android 5.0.x	2015-06-26 10:16:52 +08:00
pandamicro	e9ee303445	Merge pull request #12547 from MSOpenTech/v3.7-winrt-audio V3.7 winrt audio fix	2015-06-26 09:47:11 +08:00
pandamicro	4b34963329	Merge pull request #12537 from andyque/fix-v3.7-scrollView-dpi use inch for childFocusCancelOffset in UIScrollView	2015-06-26 08:11:00 +08:00
kompjoefriek	6eca03fdd2	Merged changes from "Vibrate support in v4" into v3 branch.	2015-06-26 01:02:44 +02:00
Dale Stammen	61f4e280b4	Merge branch 'v3.7-release' into v3.7-winrt-audio	2015-06-25 12:46:20 -07:00
pandamicro	1ab369a70b	Merge pull request #12542 from andyque/fix-v3.7-stuio-percent-mode Fix v3.7 cocosStudio percent position bug	2015-06-25 21:37:12 +08:00
pandamicro	3136bef9e3	Fix convertDistanceFromPointToInch logic (add x, y)	2015-06-25 21:34:00 +08:00
pandamicro	e29284374b	Fix convertDistanceFromPointToInch logic	2015-06-25 20:57:23 +08:00
pandamicro	0275b54b63	Merge pull request #12540 from samuele3hu/v3_7_test Fix the compile error of js-template by using android-studio compile param.	2015-06-25 18:49:43 +08:00
samuele3hu	3a654b4615	Fix the compile error of js-template by using android-studio compile param.	2015-06-25 17:44:51 +08:00
jianglong0156	11ac928f59	winrt use touch event replace mouse event	2015-06-25 17:44:03 +08:00
jianglong0156	c60e9dfc9e	winrt not suppot mouse	2015-06-25 17:25:27 +08:00
andyque	d83f528327	use inch for childFocusCancelOffset in UIScrollView	2015-06-25 16:57:00 +08:00
andyque	0c1ee8b26a	fix studio json reader percentage mode bug	2015-06-25 16:14:22 +08:00
yangxiao	f4a81f0e53	optimize draw	2015-06-25 15:14:44 +08:00
yangxiao	13dbd44250	remove unused variable	2015-06-25 15:05:21 +08:00
yangxiao	63f948c822	modify skybox to projection space	2015-06-25 15:01:39 +08:00
pandamicro	ac3f2f235b	Merge pull request #12523 from andyque/fix-linux-audio-engine-crash add guard to audio engine pointer	2015-06-25 11:48:23 +08:00
子龙山人	f545794b56	Merge pull request #12525 from WenhaiLin/v3-37-warnfix [ci skip]Fixed warns	2015-06-25 11:02:02 +08:00
WenhaiLin	3cb29bbc65	[ci skip]Fixed warns	2015-06-25 10:53:41 +08:00
andyque	2bb7b96839	add guard to audio engine pointer	2015-06-25 10:17:31 +08:00
anniruddh	e89a6c1651	fixed issue #160	2015-06-24 17:50:11 -07:00
pandamicro	19c57daf92	Merge pull request #12511 from samuele3hu/v3_7_test Fix crash of the some Texture2D test case about s3tc on the nexus9(android 5.0.1)	2015-06-24 21:46:38 +08:00
pandamicro	f9db471026	Merge pull request #12495 from super626/v3 Fix terrain getIntersectionPoint	2015-06-24 18:36:52 +08:00
samuele3hu	63eb0d34f3	Fix crash of the some Texture2D test case about s3tc on the nexus9(android 5.0.1)	2015-06-24 16:11:36 +08:00
pandamicro	49e783820e	Merge pull request #12507 from dabingnn/v3_fixClearColor fix clearcolor bug which has no effect	2015-06-24 15:58:53 +08:00
yangxiao	77f1af91f9	opt getIntersectionPoint	2015-06-24 15:49:09 +08:00
yangxiao	086b01321c	code simplify	2015-06-24 14:10:38 +08:00
Huabing.Xu	ecfe35489c	fix clearcolor bug which has no effect	2015-06-24 11:40:23 +08:00
yangxiao	7546bfe9af	make getChunkByIndex protected	2015-06-24 10:56:46 +08:00
yangxiao	d1baacdf8a	fix terrain ray trace	2015-06-24 10:49:18 +08:00
pandamicro	04af5dfbe3	#12494 Upgrade platform constants for WP8 & WINRT	2015-06-23 23:23:25 +08:00
pandamicro	e574c38a6b	Merge pull request #12496 from WenhaiLin/v3-tagetplatform-fix Fixed cannot differentiate between Windows Phone Application and Windows Store Application by `Application::getTargetPlatform`	2015-06-23 22:26:54 +08:00
Namezero	dec49a8b11	Circle shape debug draw bug Circle shape debug draw didn't draw properly when rotated	2015-06-23 15:50:42 +02:00
pandamicro	72fde7efb8	Merge pull request #12500 from jianglong0156/webviewHide fix the bug:webview can not display	2015-06-23 21:11:33 +08:00
pandamicro	cc00cbedbe	Merge pull request #12482 from yangws/fixbug_20214 fixbug: cpp-test -> NewRenderer （drag the layer to test the result of…	2015-06-23 21:09:59 +08:00
江龙	7ff383e4d2	add the return value	2015-06-23 20:27:30 +08:00
pandamicro	29840df88e	Fix indent of Audio.cpp	2015-06-23 20:08:00 +08:00
pandamicro	1d4a496aaa	Merge pull request #12472 from MSOpenTech/v3-winrt-audio V3: WinRT Fix for issue 12448 cpp-tests[ win8.1-universal--window 8.1]:Audio - CocosDenshion:Crash	2015-06-23 20:01:18 +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
WenhaiLin	ed029d264f	Fixed cannot differentiate between Windows Phone Application and Windows Store Application by `Application::getTargetPlatform`	2015-06-23 18:40:39 +08:00
yangxiao	bfdb06e31b	add empty line	2015-06-23 18:31:20 +08:00
yangxiao	c3593c9d64	merge cocos	2015-06-23 18:29:39 +08:00
pandamicro	60372056ce	Merge pull request #12484 from andyque/fix-nine-patch-image-error fix nine patch image parser error on Windows.	2015-06-23 18:26:16 +08:00
yangxiao	251c81d7be	Merge branch 'newcode' into v3	2015-06-23 18:25:41 +08:00
pandamicro	2a0c2b6e32	Merge pull request #12250 from hawkwood/patch-10 Fails if file does not exist	2015-06-23 17:32:47 +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	4c7f33e66f	Merge pull request #12481 from jianglong0156/restartGameBug fix Restart game bug	2015-06-23 17:02:09 +08:00
WenhaiLin	cbb073e905	Fixed Application may be created more than once on Android.	2015-06-23 16:58:38 +08:00
XiaoYang	59e6b6fdc2	Merge pull request #352 from tangziwen/v3 Using ray-triangle intersect test instead of the newton method	2015-06-23 16:30:18 +08:00
pandamicro	ac138a3287	Merge pull request #12474 from xiaofeng11/v3_xiaofeng Update 3d reader for compatible with cocosstudio 3.1.2 version csd file	2015-06-23 16:27:32 +08:00
XiaoFeng	befe97a78b	Update js parser for compatible with CocosStudio 2.3.2 json format export	2015-06-23 16:24:53 +08:00
tangziwen	5b857f7d66	fix some bug	2015-06-23 16:11:00 +08:00
andyque	7fff2bd3c4	fix nine patch image parser error on Windows.	2015-06-23 15:42:58 +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
pandamicro	f617d6f1aa	Merge pull request #12478 from WenhaiLin/v3-37-label-sfFix Label:Fixed IllegalArgumentException on Android 2.3.x	2015-06-23 15:27:43 +08:00
Vincent Yang	4b768c5fd8	fixbug: cpp-test -> NewRenderer （drag the layer to test the result of culling）, some object will be culling before out of screen.	2015-06-23 15:22:27 +08:00
jianglong0156	90f9bf37cd	fix redmine issue #20277 RestartGameTest only used in native will crash	2015-06-23 14:41:41 +08:00
tangziwen	1e016dc6d8	Always get the minimum distance intersect point.	2015-06-23 14:41:20 +08:00
tangziwen	f71ca4f179	Using ray-triangle intersect test instead of the newton method	2015-06-23 14:27:19 +08:00
andyque	70b709f4a8	fix rapidjson assert error	2015-06-23 13:54:11 +08:00
WenhaiLin	79aa300448	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-37alpha0	2015-06-23 13:42:32 +08:00
WenhaiLin	b275ce2283	Label:Fixed IllegalArgumentException on Android 2.3.x	2015-06-23 13:38:06 +08:00
pandamicro	9445aeacb7	Merge pull request #12456 from super626/camera quaternion instead of euler angle	2015-06-23 13:16:39 +08:00
XiaoFeng	375e80bd70	Update 3d reader for compatible with cocosstudio 3.1.2 version csd file Update easing default speed	2015-06-23 11:31:16 +08:00
子龙山人	6bd61a3a5f	Merge pull request #12469 from WenhaiLin/v3-37-label-lineheightfix Label should be invisible when the line height is set to zero.	2015-06-23 11:02:48 +08:00
WenhaiLin	fbe1bd8253	Label should be invisible when the line height is set to zero.	2015-06-23 09:42:48 +08:00
Zhou Yuntao	507f221483	fix a problem where WebSocket messages will pile up if server sends them faster than client's frame rate	2015-06-22 20:58:37 +08:00
Neo Kim	9757be0f81	Remove debugging logs	2015-06-22 14:49:30 +09:00
Neo Kim	71c98da2aa	Apply ease out action on inertia scroll	2015-06-22 14:30:45 +09:00
Neo Kim	c4fa99444c	Simplify the inertia scroll implementation	2015-06-22 14:30:36 +09:00
Neo Kim	c70c923674	Separate the inertia scroll from auto scroll. And implement auto scroll and bounce back as one logic. The bounce back movement is one of auto scroll feature.	2015-06-22 14:30:30 +09:00
Neo Kim	7422b20da9	Refactor some functions	2015-06-22 14:27:19 +09:00
Neo Kim	85fc5b3f89	Change to comply to Cocos2d-x convention	2015-06-22 14:27:11 +09:00
Neo Kim	6c212a7ddb	Replace the existing bounce back feature with another one like iOS bounce-back. The inner container moves smoother when bouncing back. It does what the existing code did including scroll event dispatching and attenuating.	2015-06-22 14:27:00 +09:00
Neo Kim	1058ab9172	Add necessary member variables and methods	2015-06-22 14:26:51 +09:00
Neo Kim	a8f77710f5	Refactor some functions and remove redundant codes	2015-06-22 14:10:25 +09:00
Neo Kim	876c94f352	Remove the boundary of bouncing and apply half-movement when out of boundary like iOS bounce back.	2015-06-22 14:05:53 +09:00
Neo Kim	ff3f990142	Add isOutOfBoundary() functions	2015-06-22 14:05:53 +09:00
Neo Kim	c3c6eeb6c1	Refactor some functions	2015-06-22 14:05:52 +09:00
Neo Kim	a3ff9573b0	Remove duplicated logic in bounceScrollChildren()	2015-06-22 14:05:51 +09:00
Neo Kim	1971b01280	Make the event dispatch functions into one function after removing duplicated logic.	2015-06-22 14:05:50 +09:00
Neo Kim	31bf9f714d	Merge bouncing and non-bouncing logics as one.	2015-06-22 14:05:50 +09:00
Neo Kim	6a0609a687	Merge the logics for bouncing of VERTICAL, HORIZONTAL and BOTH in one function. VERTICAL and HORIZONTAL can be processed as BOTH.	2015-06-22 14:05:49 +09:00
Neo Kim	368b5e8f12	Remove duplicated logics in scrollChildrenBoth(), and extract meaningful logic into separate functions.	2015-06-22 14:05:49 +09:00
Anniruddh	4a15d57093	Fixed issue #168	2015-06-20 00:20:15 -07:00
yangxiao	d252250968	quaternion instead of euler angle	2015-06-19 18:46:14 +08:00
andyque	55b86b2e14	add more docs for samsung enhanced API	2015-06-19 18:09:42 +08:00
子龙山人	8ca0f18575	Merge pull request #12446 from pandamicro/v3 Add auto bindings for navmesh	2015-06-19 17:21:00 +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
pandamicro	7b1694bfeb	Merge pull request #12443 from VisualSJ/v3-aa [ci skip]Studio parser: Code for defense	2015-06-19 14:24:39 +08:00
WenhaiLin	d32a317ea0	Label:Fixed line wrap error without space.	2015-06-19 13:39:19 +08:00
VisualSJ	8fa755d0e4	Studio parser: Code for defense	2015-06-19 13:15:10 +08:00
VisualSJ	ea0ab5c738	Studio parser: Code for defense	2015-06-19 11:13:07 +08:00
pandamicro	8e9fed936c	Add auto bindings	2015-06-19 10:36:36 +08:00
pandamicro	276ce3a0a7	Update versions	2015-06-19 09:56:19 +08:00
pandamicro	c6d4f283bb	Fix compilation issue in navmesh conversion	2015-06-19 08:11:45 +08:00
pandamicro	f405d00336	Fix linux compilation	2015-06-19 01:14:16 +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
江龙	8fc5835dee	modify linux file	2015-06-18 23:29:04 +08:00
江龙	61db9ef103	modify cocos2d_specifics ， add navmesh head file。 modify template。add navmesh head file and register code	2015-06-18 23:21:53 +08:00
江龙	8c97fec5af	add navmesh project file path	2015-06-18 23:17:49 +08:00
jianglong0156	618d8f01e8	Merge pull request #9 from pandamicro/navmesh Improve bindings for navmesh	2015-06-18 23:15:05 +08:00
pandamicro	b757837239	Move NavMesh to jsb namespace	2015-06-18 22:57:41 +08:00
jianglong0156	56382aae37	winphone project	2015-06-18 22:50:24 +08:00
CocosRobot	ea2ec582f0	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-06-18 14:05:05 +00:00
Bin Zhang	a4ecfdb7e2	Build engine with LOCAL_ARM_MODE=arm when building JS projects for android.	2015-06-18 22:00:57 +08:00
CocosRobot	e2268bb16f	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-06-18 22:00:57 +08:00
WenhaiLin	e2f834e96b	Fixed warn	2015-06-18 22:00:56 +08:00
CocosRobot	c069da629e	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-06-18 22:00:56 +08:00
Huabing.Xu	b17702e6f1	fix compile error for linux	2015-06-18 22:00:55 +08:00
pandamicro	cd7252014a	Merge pull request #12432 from pandamicro/v3 Change physics3d api to jsb namespace	2015-06-18 21:53:39 +08:00
pandamicro	e09ba8080f	Fix create Sprite with PolygonInfo issue	2015-06-18 21:48:57 +08:00
jianglong0156	05c40b13f9	fix the win32 head error	2015-06-18 21:30:30 +08:00
pandamicro	10a8adad53	Change physics3d api to jsb namespace	2015-06-18 20:39:40 +08:00
pandamicro	491d89baec	Merge pull request #12429 from natural-law/v3 Build engine with LOCAL_ARM_MODE=arm when building JS projects for android.	2015-06-18 20:28:52 +08:00
jianglong0156	e0b66707f9	add nerviest android file	2015-06-18 19:30:05 +08:00
jianglong0156	4fe1542d17	add navmesh tests	2015-06-18 19:22:27 +08:00
Bin Zhang	d288b13957	Build engine with LOCAL_ARM_MODE=arm when building JS projects for android.	2015-06-18 17:22:30 +08:00
CocosRobot	6e849a158d	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-06-18 08:18:00 +00:00
pandamicro	aa566a3722	Merge pull request #12424 from pandamicro/physics3d Fix Physics3D test and js bindings	2015-06-18 16:09:49 +08:00
pandamicro	4d588c7837	Merge pull request #12423 from WenhaiLin/v3-37alpha0-warnfix Fixed warn	2015-06-18 15:09:36 +08:00
jianglong0156	85c40b6580	Merge pull request #8 from pandamicro/physics3d Physics3d	2015-06-18 14:54:32 +08:00
XiaoYang	96bb244d69	Merge pull request #351 from tangziwen/v3 fix terraintest and Terrain::getInstersectionPoint()	2015-06-18 14:47:49 +08:00
pandamicro	811173ea3b	Fix Physics3D test and js bindings	2015-06-18 14:33:16 +08:00
WenhaiLin	05522afaa1	Fixed warn	2015-06-18 14:24:52 +08:00
CocosRobot	b76db94725	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-06-18 05:43:02 +00:00
tangziwen	1989de7a04	fix terraintest and Terrain::getInstersectionPoint()	2015-06-18 12:20:44 +08:00
pandamicro	7952477469	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into physics3d	2015-06-18 12:05:01 +08:00
Huabing.Xu	92824537ac	fix compile error for linux	2015-06-18 11:15:45 +08:00
Vincent Yang	187437068f	Fixed bug: wrong usage of isVisitableByVisitingCamera, which should only effect draw call.	2015-06-18 10:32:30 +08:00
Vincent Yang	f8a5b1e18c	Fixed bug: UI component can't click correctly by moving UI and camera far away of origin.	2015-06-18 10:23:52 +08:00
pandamicro	3ffc0e6be6	Merge branch 'v3_navigation' of https://github.com/samuele3hu/cocos2d-x into physics3d	2015-06-18 09:20:37 +08:00
Dale Stammen	fd0605416e	moved clipper files to external/clipper filter in VS solution	2015-06-17 11:48:56 -07:00
Dale Stammen	9ef92b71dd	added missing external/clipper files. Removed obsolete files	2015-06-17 11:40:38 -07:00
pandamicro	a94b49bdef	Add nav mesh bindings	2015-06-17 23:41:12 +08:00
pandamicro	85e8a407b1	Merge branch 'navmesh' of https://github.com/jianglong0156/cocos2d-x into v3 # Conflicts: # tests/js-tests/project/Classes/AppDelegate.cpp # tools/tojs/genbindings.py	2015-06-17 19:58:24 +08:00
samuele3hu	683812d817	Update Physics3D test for js.	2015-06-17 18:50:55 +08:00
jianglong0156	b265033a41	add testcase and manual bindings	2015-06-17 18:38:18 +08:00
jianglong0156	897b5fd0e9	add navmesh test project file and binding file	2015-06-17 18:37:19 +08:00
pandamicro	bb275351f0	Merge pull request #12363 from super626/v3 Fix terrain lod computing bugs	2015-06-17 17:49:39 +08:00
yangxiao	12a352a1db	add comment	2015-06-17 16:32:08 +08:00
XiaoYang	5dd2aa2884	Merge pull request #349 from tangziwen/v3 fix camera position	2015-06-17 16:01:02 +08:00
tangziwen	e9c95229e0	fix camera position	2015-06-17 15:58:17 +08:00
pandamicro	b534f85679	Merge pull request #12394 from CocosRobot/update_lua_bindings_1434525200 [ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-06-17 15:38:17 +08:00
CocosRobot	22f04da582	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-06-17 07:18:18 +00:00
pandamicro	6f6c317f87	Merge pull request #12386 from WenhaiLin/v3-label-spacefix Label:Fixed wrong letter spacing with outline enabled	2015-06-17 15:16:49 +08:00
pandamicro	5ee22c4142	Merge pull request #12174 from pajeroquan/v3 Fix JNI object memory leak!	2015-06-17 15:14:36 +08:00
pandamicro	b1831ea5fb	Merge pull request #12384 from chengstory/GBKToUTF8_v3 GBKToUTF8	2015-06-17 15:09:15 +08:00
CocosRobot	55c7de75e9	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-06-17 06:48:41 +00:00
Wenhai Lin	cbd428f6ac	Label:Fixed wrong letter spacing with outline enabled	2015-06-17 13:57:23 +08:00
zhangcheng	1c983f1f39	GBKToUTF8	2015-06-17 13:16:06 +08:00
Jacky	3c5ab4f518	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon2 # Conflicts: # cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters	2015-06-17 13:04:24 +08:00
CocosRobot	6bed988354	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-06-17 03:47:36 +00:00
子龙山人	0915565b8d	Merge pull request #12373 from samuele3hu/v3_navigation Add the Lua bindings for NavMesh and the related test case.	2015-06-17 11:36:52 +08:00
Jacky	13e0fb22f5	fix compile on linux platform.	2015-06-17 11:34:19 +08:00
songchengjiang	c08a355a06	fix the bug of light replace atanf with atan2f	2015-06-17 11:17:46 +08:00
pandamicro	a2deddcf59	Merge pull request #12361 from dabingnn/v3_androidBugForVertexAttrib fix android background and foreground bug with VertexAttributeBinding	2015-06-17 09:34:47 +08:00
Dale Stammen	eb2bc78970	Merge branch 'v3' into v3-winrt-librecast	2015-06-16 07:13:53 -07:00
dkorchinskiy	5d4e8aa275	Fix crash on Windows if pass string more than 16kb to cocos2d::log	2015-06-16 16:56:06 +03:00
tangziwen	60115b1ce1	update	2015-06-16 17:46:21 +08:00
tangziwen	0eaf9b5acc	Fix camera's incorrect position in chunks' LOD calculating.	2015-06-16 17:29:43 +08:00
WuHao	6e138e7b9b	add clipper to cmakelist	2015-06-16 17:09:27 +08:00
WuHao	d3e0439972	Merge branch 'fix_spritepolygon2' of https://github.com/Wu-Hao/cocos2d-x into fix_spritepolygon	2015-06-16 16:15:57 +08:00
WuHao	3b56d2a66f	fix cmake for cmake platforms	2015-06-16 16:15:19 +08:00
Hao Wu	2ddad84c73	Merge pull request #17 from pandamicro/spritepolygon Remove jsb_cocos2dx_experimental in projects to fix compilation issue	2015-06-16 15:11:36 +08:00
pandamicro	e4d5db30eb	Remove jsb_cocos2dx_experimental in projects to fix compilation issue	2015-06-16 15:09:06 +08:00
pandamicro	3f8923648b	Merge pull request #12359 from super626/opt_navigation remove unused code, and use nullptr for pointer	2015-06-16 14:58:58 +08:00
Justin Hawkwood	90db6fe5d6	Added check that callback is set	2015-06-15 23:36:04 -07:00
Justin Hawkwood	9378b6704c	Moved file check to alternate location	2015-06-15 23:31:52 -07:00
Huabing.Xu	19982aae00	fix android background and foreground bug with VertexAttributeBinding	2015-06-16 14:04:50 +08:00
pandamicro	0866180918	Merge pull request #12162 from namezero111111/patch-4 JumpTo::clone() results in incorrect end position	2015-06-16 13:37:04 +08:00
samuele3hu	a547d6aa33	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_navigation Conflicts: tools/bindings-generator	2015-06-16 11:36:11 +08:00
WuHao	aeeed0f4ab	Merge remote-tracking branch 'origin' into fix_spritepolygon # Conflicts: # external/config.json	2015-06-16 11:19:20 +08:00
yangxiao	4d1aa56193	remove unused code, and use nullptr for pointer	2015-06-16 11:15:39 +08:00
Dale Stammen	8d8e7d6cb9	Merge branch 'v3' into v3-winrt-librecast	2015-06-15 19:27:40 -07:00
子龙山人	0b5c7d74b7	Merge pull request #12160 from namezero111111/patch-3 Blink::stop() access violation	2015-06-16 10:27:38 +08:00
子龙山人	271e3295eb	Merge pull request #12349 from WenhaiLin/v3-37-NotificationNode-crashfix Fixed NotificationNode might crash program when the program exits.	2015-06-16 09:53:39 +08:00
Dale Stammen	0781978788	added librecast. Updated build properties	2015-06-15 18:44:14 -07:00
andyque	b8826d9de4	improve the enum naming	2015-06-16 09:42:06 +08:00
Dale Stammen	03fc2eca5e	added missing navmesh files	2015-06-15 18:19:28 -07:00
Ricardo Quesada	b167ab3e78	StateBlock() is public	2015-06-15 17:43:37 -07:00
Ricardo Quesada	ca3da86da7	StateBlock::restore() is public It is possible to restore to default state	2015-06-15 14:12:44 -07:00
Dale Stammen	9262cc95bf	fixed project filters broken by recent additions of files	2015-06-15 11:38:52 -07:00
Ricardo Quesada	c17da7e90d	Removes not-needed draws	2015-06-15 10:40:47 -07:00
lite3	c249f7cb69	keep old behavior	2015-06-15 19:48:12 +08:00
andyque	a880dc86e9	improve comments	2015-06-15 19:36:20 +08:00
andyque	c1108db31e	Improve ui::Slider 1. Add two APIs to gain big precision 2. Add three type events in Slider's callback.	2015-06-15 18:31:21 +08:00
WenhaiLin	3c8d15f6f8	Fixed NotificationNode might crash program when the program exits.	2015-06-15 17:55:00 +08:00
WuHao	27d0f51e9b	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj build/cocos2d_tests.xcodeproj/project.pbxproj cocos/2d/libcocos2d.vcxproj.filters tools/cocos2d-console web	2015-06-15 16:13:36 +08:00
Hao Wu	b4ca8c1489	Merge pull request #15 from pandamicro/spritepolygon Add SpritePolygon JSB bindingsJSB bindings	2015-06-15 15:47:02 +08:00
子龙山人	86b6ea702a	Merge pull request #12342 from WenhaiLin/v3-37-android-studio-fix [ci skip]Android Studio projects:Fixed compile error.	2015-06-15 14:48:42 +08:00
WenhaiLin	518de1ff57	[ci skip]Android Studio projects:Fixed compile error.	2015-06-15 14:42:45 +08:00
CocosRobot	8ec924c206	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-06-15 05:46:51 +00:00
pandamicro	0216d05eee	Merge pull request #12102 from super626/navigation2 3D Navigation	2015-06-15 13:39:05 +08:00
pandamicro	c9c05ff982	Merge pull request #12314 from xiaofeng11/v3_xiaofeng Fix when button reader bug	2015-06-15 13:13:39 +08:00
yangxiao	16a0ddc74e	rename CCNavMeshTool to CCNavMeshUtils	2015-06-15 12:52:55 +08:00
pandamicro	d0db40c4a6	Merge pull request #12080 from linshun/v3 issue #12078 added audio, network, physics, platform and storage group.	2015-06-15 12:45:11 +08:00
pandamicro	852b9b42b9	Remove jsb_cocos2dx_experimental_manual	2015-06-15 10:46:57 +08:00
linshun	efed0da8bc	issue #12078 : added subgroup of physics 2d.	2015-06-15 10:28:37 +08:00
pandamicro	707e9d4d7b	Merge pull request #12205 from ffskyfan/v3 Update extension.h, amend a really dangerous macros that may cause memory allocation error	2015-06-14 20:09:57 +08:00
Ricardo Quesada	5c419ff7bc	compiles on windows	2015-06-12 20:49:20 -07:00
pandamicro	032f231ed4	Add bindings for AutoPolygon and PolygonInfo	2015-06-13 11:14:57 +08:00
Ricardo Quesada	9b7c12aa38	updates invalidate documentation	2015-06-12 17:44:48 -07:00
Ricardo Quesada	a8cf72dc43	pass bits to invalidate	2015-06-12 17:14:09 -07:00
Ricardo Quesada	4278bf51b1	Adds RenderState::StateBlock::invalidate(); handy function to restore the GL state to the default one. Only use it if calling GL calls directly	2015-06-12 16:47:08 -07:00
Ricardo Quesada	32aae46343	fixes	2015-06-12 15:37:29 -07:00
Ricardo Quesada	2a3347dd49	RenderState: default state fixes parts of cocos2d code calls GL directly. This should be avoided since v3.7 since the `RenderState::StateBlock::_defaultState` won't know that and the state will be invalid. In order to fix this issue, after calling GL directly, you should update the `_defaultState` manually.	2015-06-12 15:03:48 -07:00
子龙山人	38cd74933d	Merge pull request #12320 from CocosRobot/update_lua_bindings_1434115258 [ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-06-12 22:42:40 +08:00
pandamicro	9806c09b0e	Merge pull request #12299 from WenhaiLin/v3-label-cropped Label:the texture of character have not cropped if character cross the axis-aligned bounding-box.	2015-06-12 21:33:09 +08:00
CocosRobot	60d68ab4de	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-06-12 13:27:20 +00:00
pandamicro	f9057b3f32	Merge pull request #12284 from pandamicro/v3 Fix template android compilation issue on physics3d	2015-06-12 21:10:40 +08:00
子龙山人	c01d1fe00a	Merge pull request #12310 from WenhaiLin/v3-particlefile-key Fixed ParticleSystem may using wrong texture if the particle PLIST file created via ParticleDesigner.	2015-06-12 16:44:12 +08:00
Jacky	29c108bdef	Merge remote-tracking branch 'origin' into fix_spritepolygon2 # Conflicts: # cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters	2015-06-12 16:28:41 +08:00
XiaoFeng	8d19ea7320	Fix when button set to disabled mode and won't have a disable texture will cause simulator won't show button in disabled gray mode	2015-06-12 15:47:34 +08:00
pandamicro	e9d648f151	Fix physics 3d macro include issue	2015-06-12 15:41:46 +08:00
pandamicro	19ef0e0983	Fix indent	2015-06-12 13:01:13 +08:00
pandamicro	df1219c92d	Update manual conversion for sprite polygon	2015-06-12 12:56:37 +08:00
WenhaiLin	9f5a36b817	Fixed ParticleSystem may using wrong texture if the particle PLIST file created via ParticleDesigner.	2015-06-12 11:03:32 +08:00
子龙山人	7a9b48bd83	Merge pull request #12214 from andyque/optimize-ui-memory-usage Optimize ui memory usage	2015-06-12 10:11:21 +08:00
子龙山人	463198b3ad	Merge pull request #12307 from MSOpenTech/v3-winrt-viewport V3: Removed obsolete winrt override of setViewPortInPoints	2015-06-12 09:53:59 +08:00
pandamicro	b1b9c808eb	Merge pull request #12074 from samuele3hu/v3_material Issue #10570: Make getItemForTouch of Menu virtual.	2015-06-12 08:21:18 +08:00
pandamicro	9acc51a5eb	Merge pull request #12301 from jianglong0156/webviewCrash fix webview crash in android	2015-06-12 08:12:14 +08:00
Dale Stammen	0f64a2d192	removed obsolete override of setViewPortInPoints	2015-06-11 07:59:52 -07:00
pandamicro	12de53726d	Merge pull request #12182 from VisualSJ/v3-jsb [ci skip] Synchronization studio parser	2015-06-11 17:35:15 +08:00
jianglong0156	c317eb428a	fix webview crash in android	2015-06-11 17:28:02 +08:00
WenhaiLin	5aa31ea83a	Label:the texture of character have not cropped if character cross the axis-aligned bounding-box.	2015-06-11 17:16:44 +08:00
yangxiao	44c2b0d5ad	merge cocos	2015-06-11 15:54:42 +08:00
samuele3hu	17b1dee363	Merge branch 'fix_spritepolygon2' of https://github.com/Wu-Hao/cocos2d-x into v3_update_spritepolygon	2015-06-11 14:39:35 +08:00
samuele3hu	1b20e463d8	Update the Lua binding about the Polygon and update the test case.	2015-06-11 14:38:38 +08:00
pandamicro	8e3e928efd	Merge pull request #12040 from geron-cn/v3 fix bug: fix actiontimeline can not step to last frame when loop play	2015-06-11 14:36:08 +08:00
子龙山人	03814a569d	Merge pull request #12256 from WenhaiLin/v3-simpleaudio-fix SimpleAudioEngine:Fixed thread safety problem on android.	2015-06-11 14:30:36 +08:00
CocosRobot	94a47fabcf	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-06-11 06:16:36 +00:00
pandamicro	6dfe937cae	Merge pull request #11892 from dabingnn/v3FrameBufferObject V3 frame buffer object	2015-06-11 14:04:30 +08:00
Vincent Yang	097bf455c2	Rename CCRenderBufferObject to CCRenderBuffer in windows projects.	2015-06-11 11:45:10 +08:00
VisualSJ	2d12d6a295	Plist file parsing (action-2.x.js)	2015-06-11 11:14:10 +08:00
Jacky	a32fec8471	change clipper version to 6.1.3.	2015-06-11 10:45:37 +08:00
pandamicro	70606caa14	Fix template android compilation issue on physics3d	2015-06-10 19:37:52 +08:00
Jacky	4b5bcc06a1	remove draw points and add expand precision.	2015-06-10 18:54:53 +08:00
lijinlong	370845a738	luabinding enumerateChildren bug 第一次调用enumerateChildren的回调时将lua handler释放了，下次再进入回调时报错，将handler释放提到enumerateChildren调用完成后	2015-06-10 17:15:01 +08:00
samuele3hu	8935ad0226	Merge branch 'fix_spritepolygon2' of https://github.com/Wu-Hao/cocos2d-x into v3_update_spritepolygon	2015-06-10 13:54:32 +08:00
子龙山人	b666b373c7	Merge pull request #12261 from iris-wy/v3 fix bug #12200	2015-06-10 11:39:22 +08:00
Jacky	b41c60dbdb	Merge remote-tracking branch 'origin/v3' into fix_spritepolygon2 # Conflicts: # external/config.json	2015-06-10 10:23:43 +08:00
Huabing.Xu	10352c40b2	Merge branch 'v3' into v3FrameBufferObject # Conflicts: # cocos/2d/CCCamera.h	2015-06-10 10:16:42 +08:00
anniruddh.koppal	3f4d1c4ed3	Fixed merge conflict issue	2015-06-09 14:06:24 -07:00
yangxiao	7f26ccb9ba	code style	2015-06-09 14:06:09 -07:00
tangziwen	fc34881ab9	fix Terrain::getIntersectionPoint	2015-06-09 13:23:33 -07:00
Justin Hawkwood	852639cfe7	Added empty string check	2015-06-09 09:19:04 -07:00
Dale Stammen	0cb2f87d3e	Merge branch 'v3' into v3-winrt-ogg	2015-06-09 08:21:09 -07:00
子龙山人	a202387800	Merge pull request #12247 from stari4ek/v3-outline-inner-holes improve rendering of letter's inner shapes when outline is used	2015-06-09 23:11:39 +08:00
Jacky	88b3fc3c7e	fix memory leakage about operation=	2015-06-09 18:45:55 +08:00
iris-wy	79b3d70b60	fix bug #12200 solve warning ""Service Intent must be explicit: Intent { act=com.enhance.gameservice.IGameTuningService }""	2015-06-09 18:43:46 +08:00
Huabing.Xu	67a94c4485	compiles on android and linux	2015-06-09 17:57:07 +08:00
XiaoFeng	20a6151f4c	Fix indent	2015-06-09 17:40:42 +08:00
Huabing.Xu	b79eec0b20	fix grid bug for viewport	2015-06-09 17:24:30 +08:00
Huabing.Xu	ef4978f0cd	move viewport to experimental namespace	2015-06-09 16:21:50 +08:00
Jacky	d8369dda94	fix on the wp8 universal.	2015-06-09 16:00:51 +08:00
Huabing.Xu	3e331128c6	file rename CCFrameBufferObject->CCFrameBuffer	2015-06-09 15:32:12 +08:00
WenhaiLin	6fec9c40b0	SimpleAudioEngine:Fixed thread safety problem on android.	2015-06-09 15:07:35 +08:00
XiaoFeng	f6083f3490	Fix issue 10258 & 10408	2015-06-09 14:38:48 +08:00
Huabing.Xu	97b387560b	revert some accidental changes	2015-06-09 14:06:11 +08:00
yangxiao	e433ad305b	decopule physics and navmesh from Director	2015-06-09 13:49:07 +08:00
Jacky	74aed5ae85	fix on the android.	2015-06-09 13:47:29 +08:00
Jacky	562d4b9a78	fix on the windows.	2015-06-09 11:23:37 +08:00
Huabing.Xu	9acab65e4f	rename FrameBufferObject->FrameBuffer Move FrameBufferObject related class to experimental namespace	2015-06-09 10:59:43 +08:00
Justin Hawkwood	eca488b85a	Fails if file does not exist This adds a callback with nullptr if the file does not exists. Checking this before checking cache means that if a file is cached then deleted, the async call will fail. To allow a cached but deleted file to return the texture, move the isFileExist check to ALTERNATIVE. If leaving check where it is, on failure should it also check if the file was cached and remove it?	2015-06-08 17:14:15 -07:00
Dale Stammen	a2b677d300	Merge branch 'v3' into v3-winrt-ogg	2015-06-08 08:22:46 -07:00
Michael Sotnikov	dae8f788c1	improve rendering of inner shapes when outline is used	2015-06-08 12:56:43 +03:00
子龙山人	57e92df8ee	Merge pull request #12099 from stari4ek/v3-12097-video-android-search-path Fixed: #12097 VideoPlayer on Android ignores search paths	2015-06-08 17:22:14 +08:00
子龙山人	54e23f15e6	Merge pull request #12179 from WenhaiLin/v3-37-physics-ap Node:Fixed the anchor point can only be Vec2::ANCHOR_MIDDLE after setting physics body.	2015-06-08 16:12:56 +08:00
VisualSJ	3306c7b072	Fixed control LayoutComponent positioning bug	2015-06-08 15:41:33 +08:00
WuHao	a67e570ef7	deleted more leftover comments, placed polygon test further down the tests	2015-06-08 15:40:18 +08:00
WuHao	e175815c70	deleted some leftover comments in sprite	2015-06-08 15:17:46 +08:00
WuHao	2650de030c	modified tests to show current epsilon	2015-06-08 15:08:16 +08:00
子龙山人	272f40a3cf	Merge pull request #12242 from CocosRobot/update_lua_bindings_1433744214 [ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-06-08 14:27:50 +08:00
pandamicro	1b75d4a192	Merge pull request #12212 from super626/sprite3d call setTransparent	2015-06-08 14:21:40 +08:00
CocosRobot	4fc0366e4d	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-06-08 06:21:14 +00:00
子龙山人	03892caed5	Merge pull request #12206 from super626/fixphysics3d2 3D Physics: remove addChildToPhysics	2015-06-08 14:13:38 +08:00
WuHao	a555b2fb52	added documentation for auto polygon	2015-06-08 13:59:44 +08:00
WuHao	0808b6aff9	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon Conflicts: cocos/2d/MarchingSquare.cpp	2015-06-08 13:59:26 +08:00
VisualSJ	060ab85f22	Fixed UIText color settings bug	2015-06-08 13:58:08 +08:00
lite3	f1d879f7ed	remove old path When added existing new searchPath	2015-06-08 13:34:45 +08:00
yangxiao	3fa17c28df	add comment	2015-06-07 22:02:23 -07:00
yangxiao	f9cc7fec0e	code style	2015-06-07 22:02:15 -07:00
yangxiao	076c3a8d90	get set gravity	2015-06-07 22:02:06 -07:00
tangziwen	87dab42255	fix Terrain::getIntersectionPoint	2015-06-07 22:01:38 -07:00
子龙山人	c5ba7eef8b	Merge pull request #12019 from super626/v3 getIntersectionPoint failed when there is no intersection on the terrain	2015-06-08 11:26:19 +08:00
Dale Stammen	2002054463	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-winrt-ogg	2015-06-07 20:19:52 -07:00
Huabing.Xu	133ef90c09	Merge branch 'v3Viewport' into v3FrameBufferObject # Conflicts: # cocos/renderer/CCFrameBufferObject.h	2015-06-06 18:16:22 +08:00
Jacky	3e62dd0473	remove unused file and code.	2015-06-06 13:31:25 +08:00
CocosRobot	835e56e80a	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-06-05 23:13:03 +00:00
Dale Stammen	d4c9a81908	Merge branch 'v3' into v3-winrt-ogg	2015-06-05 16:03:54 -07:00
Ricardo Quesada	453a3d93bc	samplers are treated as uniforms	2015-06-05 14:55:33 -07:00
Dale Stammen	47b5085ade	Merge branch 'v3' into v3-winrt-ogg	2015-06-05 05:36:15 -07:00
andyque	1954f6c55c	fix enum class wrong indentation	2015-06-05 17:23:32 +08:00
andyque	56b7037c5f	optimize uislider memory usage	2015-06-05 17:16:10 +08:00
yangxiao	8e558db3d6	call setTransparent	2015-06-05 16:25:09 +08:00
CocosRobot	9178eeca73	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-06-05 08:11:21 +00:00
pandamicro	399ecfcb9f	Merge pull request #12176 from super626/fixphysics3d rename syncToNode and syncToPhysics	2015-06-05 16:02:45 +08:00
andyque	6390f063fe	optimize UILoadingBar memory usage	2015-06-05 15:57:39 +08:00
子龙山人	c5c96042ef	Merge pull request #12181 from namezero111111/patch-5 TintBy::clone() incorrect cast	2015-06-05 15:27:43 +08:00
yangxiao	d50c1823d4	merge cocos	2015-06-05 14:25:37 +08:00
andyque	a7141bab38	improve imageView memory usage	2015-06-05 14:19:05 +08:00
yangxiao	761944f507	remove addChildToPhysicsWorld for 3d object	2015-06-05 13:54:09 +08:00
pandamicro	fa71a6e352	Merge pull request #12204 from jianglong0156/issue1756 default support curl gzip. and add the gzip test in xmlhttprequest Issue1756	2015-06-05 13:17:53 +08:00
ffskyfan	b8a022238f	Update extension.h #define MALLOC(TYPE,COUNT) ((TYPE)_malloc(sizeof(TYPE) COUNT, __FILE__, __LINE__)) It is a really dangerous macros here. If use it like this "MALLOC(Type, n+2)", it will alloc sizeof(TYPE) * COUNT + 2 byte memory.but I want it alloc sizeof(TYPE) * (COUNT + 2) byte. It is a typical macro unwind error.	2015-06-05 12:14:27 +08:00
jianglong0156	8d011fd457	formate the space	2015-06-05 11:45:05 +08:00
andyque	91ddb802e1	optimize ui::CheckBox memory consumption	2015-06-05 10:32:22 +08:00
CocosRobot	9e3fa92803	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-06-05 01:51:34 +00:00
Dale Stammen	3f3ace05a7	added ogg support for Windows 10 UWP	2015-06-04 14:42:11 -07:00
pandamicro	e0eff26674	Fix component function execution issue in JSB	2015-06-05 00:03:21 +08:00
pandamicro	25e047eb41	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into skipComponentFns	2015-06-04 23:29:45 +08:00
pandamicro	461f2f88f4	Merge pull request #12197 from CocosRobot/update_lua_bindings_1433422057 [ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-06-04 22:08:03 +08:00
pandamicro	6216e74a38	Merge pull request #12165 from gyf19/v3 HttpClient Android supports gzip	2015-06-04 22:00:13 +08:00
CocosRobot	8865bd488e	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-06-04 12:52:41 +00:00
pandamicro	af756c50dc	Merge pull request #12184 from pandamicro/v3 Fix issue that __JSDownloaderDelegator::onError get called twice	2015-06-04 20:42:35 +08:00
pandamicro	e75dee6e7c	Remove C++ invocation functions of Component	2015-06-04 20:10:10 +08:00
pandamicro	2da754dcf2	Merge pull request #12157 from chengstory/v2_addOnEnterAndOnExitToCCNode Add onEnter and onExit of components to CCNode's onEnter and onExit function	2015-06-04 18:39:52 +08:00
Jacky	afa422d898	fixed copy constructor and operation = bug.	2015-06-04 18:27:58 +08:00
pandamicro	9576adeafb	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3	2015-06-04 17:53:00 +08:00
pandamicro	ba1191f98f	Merge pull request #12132 from pandamicro/v3_origin cocos2d/cocos2d-js#1658: Fix js_load_remote_image issue with multithread	2015-06-04 17:51:11 +08:00
VisualSJ	a91fdd6b8e	Synchronization studio parser - (fixed: resPath and custom easing animation)	2015-06-04 16:59:42 +08:00
VisualSJ	587bd475e9	Synchronization studio parser - (fixed: resPath and custom easing animation)	2015-06-04 16:23:06 +08:00
WuHao	5b572ab803	Polyinfo is no longer a pointer	2015-06-04 16:20:00 +08:00
Namezero	19f95c5542	TintBy::clone() incorrect cast TintBy::clone() incorrectly casts the GLshort members to GLubyte, resulting in an object that isn't a clone and an incorrect tint.	2015-06-04 10:13:34 +02:00
pandamicro	2c168130ed	Fix jsbinding calls for CCComponent	2015-06-04 15:59:05 +08:00
pandamicro	86d372222c	Merge branch 'v2_addOnEnterAndOnExitToCCNode' of https://github.com/chengstory/cocos2d-x into compJSB	2015-06-04 15:54:58 +08:00
Huabing.Xu	d35a8a3a9e	add default FBO	2015-06-04 15:53:13 +08:00
WuHao	0a51c9bd27	Finished AutoPolygon and Sprite	2015-06-04 15:43:31 +08:00
pandamicro	83f7f30c1c	Fix issue that __JSDownloaderDelegator::onError get called twice	2015-06-04 15:03:20 +08:00
WenhaiLin	bd718bb85f	Node:Fixed the anchor point can only be Vec2::ANCHOR_MIDDLE after setting physics body.	2015-06-04 14:57:37 +08:00
zhangcheng	6a53cfdc76	1, modify space format.	2015-06-04 14:08:47 +08:00
zhangcheng	8d3d3a0348	1, Add onAdd and onRemove function to replace onEnter and onCancel used in onAdd and onRemove of ComponentContainer.	2015-06-04 14:06:31 +08:00
pandamicro	9c23126d9e	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3	2015-06-04 13:14:34 +08:00
yangxiao	ded5c36271	Merge branch 'navigation2' of https://github.com/super626/cocos2d-x into navigation2	2015-06-04 12:46:12 +08:00
yangxiao	8b5333a5c9	Merge branch 'newcode' into navigation2	2015-06-04 12:44:39 +08:00
yangxiao	73d815b0ab	rename syncToNode and syncToPhysics	2015-06-04 12:04:41 +08:00
samuele3hu	fbd5a09cfd	issue #10323 : Fix the compile error when COCOS2D_DEBUG>=2.	2015-06-04 11:58:22 +08:00
anniruddh.koppal	84fad34daf	Added ogg support to audio engine. Fixed issues #150 and #151	2015-06-03 20:57:14 -07:00
pajeroquan	956101bb72	Fix JNI object memory leak! Fix JNI object memory leak!	2015-06-04 11:54:53 +08:00
Huabing.Xu	ad1f7c472c	add render buffer render target for color attachment	2015-06-04 11:18:35 +08:00
子龙山人	831ca47b13	Merge pull request #12158 from WenhaiLin/v3-letter-space Label:Fixed letter spacing may be wrong.	2015-06-04 10:51:25 +08:00
zhangcheng	55995ece1a	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v2_addOnEnterAndOnExitToCCNode	2015-06-04 10:38:39 +08:00
zhukaixy	f891a0b124	configure navi for winodow phone	2015-06-04 10:00:15 +08:00
samuele3hu	3bae5620d6	Merge branch 'navigation2' of https://github.com/super626/cocos2d-x into v3_navigation	2015-06-04 09:40:54 +08:00
子龙山人	95934bf310	Merge pull request #12168 from MSOpenTech/v3-winrt-js-fix V3: Fixes for Windows 8.1 Universal App JavaScript	2015-06-04 09:22:21 +08:00
CocosRobot	76b151c281	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-06-03 20:25:32 +00:00
Ricardo Quesada	6a19661a80	Merge pull request #12150 from ricardoquesada/material_custom_uniforms Material custom uniforms	2015-06-03 13:08:04 -07:00
Dale Stammen	18ce48dc2a	/NODEFAULTLIB:MSVCRT to fix linker warning	2015-06-03 09:26:15 -07:00
Dale Stammen	38c9490f4d	don't delete rendering thread. SpiderMonkey needs to stay on same thread	2015-06-03 09:19:05 -07:00
gyf19	164e4c8314	HttpClient Android supports gzip	2015-06-03 19:41:14 +08:00
Namezero	c09e280b58	JumpTo::clone() results in incorrect end position JumpTo::clone() passes incorrect value to (_delta) to create() rather than _endPosition	2015-06-03 13:14:11 +02:00
Namezero	89915a084c	Blink::stop() access violation Blink::stop() is calles twice when inside a Repeat action. This results in an access violation	2015-06-03 12:39:16 +02:00
samuele3hu	0cccd6e765	Fix compile error on the Linux and update the test cases	2015-06-03 18:12:21 +08:00
WenhaiLin	ffa7dc6b5a	Label:Fixed letter spacing may be wrong.	2015-06-03 16:28:44 +08:00
子龙山人	883f250f6a	Merge pull request #12137 from WenhaiLin/v3-text-line-height Fixed the text line height calculation is wrong with system font on Android.	2015-06-03 16:24:38 +08:00
zhangcheng	a51a32fa9d	1, add onEnter and onExit of components to CCNode's onEnter and onExit function.	2015-06-03 15:10:48 +08:00
Ricardo Quesada	b8957b176a	fixes win compilation issues	2015-06-02 23:31:57 -07:00
zhukaixy	76ad42bb0b	configure recast project for win8.1 project	2015-06-03 14:31:12 +08:00
Chris Hannon	574cfb4ade	Merge branch 'v3-update-sio' of https://github.com/hannon235/cocos2d-x into merge-up Signed-off-by: Chris Hannon <himynameschris@gmail.com> Conflicts: cocos/network/SocketIO.cpp	2015-06-02 21:11:43 -04:00
Ricardo Quesada	872e4f5a4f	removes logging	2015-06-02 17:50:34 -07:00
Chris Hannon	fe6275adf5	[v3-update-sio] fixes nested switch brackets - best practice would be to replace these with functions in the future Signed-off-by: Chris Hannon <himynameschris@gmail.com>	2015-06-02 20:17:34 -04:00
Chris Hannon	6bcf325630	[v3-update-sio] updates usage of log function to CCLOG macros, ensures correct data type is passed to log function Signed-off-by: Chris Hannon <himynameschris@gmail.com>	2015-06-02 20:17:34 -04:00
Chris Hannon	5af28838d2	[v3-update-sio] updates SocketIO network extension to support v1.x socket.io servers as well as maintain backwards compat. for 0.9.x servers Signed-off-by: Chris Hannon <himynameschris@gmail.com>	2015-06-02 20:17:33 -04:00
Ricardo Quesada	5f6f38616a	Merge remote-tracking branch 'cocos2d/v3' into material_custom_uniforms	2015-06-02 17:05:05 -07:00
Ricardo Quesada	87a3a1844a	Adds support for Autobindings in Shader ...part of Material	2015-06-02 16:56:59 -07:00
samuele3hu	a20681aa21	Add Lua-bindings for NavMesh	2015-06-02 18:37:57 +08:00
pandamicro	613e0f73b7	Merge pull request #12095 from jianglong0156/videoplayer add videoplayer jsb	2015-06-02 17:35:56 +08:00
WenhaiLin	88697bf136	Remove unused function.	2015-06-02 16:38:06 +08:00
WenhaiLin	67d0088103	Fixed the text line height calculation is wrong with system font on Android.	2015-06-02 16:23:40 +08:00
yangxiao	3d4606921b	merge cocos	2015-06-02 14:27:31 +08:00
jianglong0156	ac71777e97	add webview and videoplayer protect contidition.	2015-06-02 13:50:55 +08:00
jianglong0156	c46fea1f7a	Merge branch 'v3' into videoplayer	2015-06-02 11:26:48 +08:00
jianglong0156	97d0265e32	gzip test	2015-06-02 10:23:30 +08:00
pandamicro	4c6f67fd7e	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 Conflicts: tools/bindings-generator web	2015-06-02 10:12:22 +08:00
子龙山人	2c611693c6	Merge pull request #12123 from WenhaiLin/v3-UserDefault-robustness Improve UserDefault's robustness on Android.	2015-06-02 10:11:19 +08:00
子龙山人	40ea6e3e41	Merge pull request #12103 from samuele3hu/v3_http_leak Fix the memory leak of HttpClient on the iOS/Mac platform.	2015-06-02 10:11:03 +08:00
WuHao	3c5326ba1f	removed spritePolygon, merge into sprite and draft of AutoPolygon	2015-06-02 10:10:09 +08:00
pandamicro	fdec552ed7	Fix cocos2d/cocos2d-js#1658 : Fix js_load_remote_image issue with multithread and improve Downloader	2015-06-02 10:08:13 +08:00
子龙山人	0ab6472ee6	Merge pull request #12107 from MSOpenTech/v3-uwp V3: Windows 10.0 Universal App (UWP) support	2015-06-02 10:00:40 +08:00
江龙	a8b640f751	add videoplayer project	2015-06-02 09:04:15 +08:00
yangxiao	5bf09a676e	setRadius and setGeight implementation	2015-06-01 17:38:35 +08:00
WenhaiLin	9d8225aae8	Improve UserDefault's robustness on Android.	2015-06-01 15:09:11 +08:00
Huabing.Xu	27d0f6328f	origin code of viewport	2015-06-01 14:26:08 +08:00
linshun	09b52331d1	issue #12078 : added renderer group and removed core and support group.	2015-06-01 13:43:56 +08:00
子龙山人	d7534c26a3	Merge pull request #12106 from WenhaiLin/v3-audio-ios-phonecall AudioEngine:Fixed audio can not resume if it is interrupted cause by an incoming phone call.	2015-06-01 11:19:01 +08:00
子龙山人	4e914a01da	Merge pull request #12098 from WenhaiLin/v3-simpleaudio-lagged Fixed SimpleAudioEngine::playEffect() lagged on Android 5.0.x	2015-06-01 11:17:26 +08:00
Huabing.Xu	739923a4a3	Merge branch 'v3' into v3Viewport	2015-06-01 09:41:45 +08:00
Dale Stammen	e0c65c203a	Merge branch 'v3' into v3-uwp	2015-05-29 08:09:05 -07:00
WenhaiLin	59435f8749	AudioEngine:Fixed audio can not resume if it is interrupted cause by an incoming phone call.	2015-05-29 21:41:54 +08:00
samuele3hu	c3ea65e66b	Merge branch 'navigation2' of https://github.com/super626/cocos2d-x into v3_navigation	2015-05-29 18:25:15 +08:00
WuHao	3d62805d04	Merge branch 'v3' into fix_spritepolygon # Conflicts: # build/cocos2d_libs.xcodeproj/project.pbxproj # cocos/2d/MarchingSquare.cpp	2015-05-29 18:10:41 +08:00
samuele3hu	ae6cb678c6	Fix the memory leak of HttpClient on the iOS/Mac platform.	2015-05-29 17:13:49 +08:00
yangxiao	c782d63bef	add 3d navigation	2015-05-29 16:45:33 +08:00
Jacky	e69a6116fa	make SpritePolygonInfo extend from Ref.	2015-05-29 16:44:06 +08:00
yangxiao	618f63cb35	replace windows folder sperator	2015-05-29 16:43:36 +08:00
yangxiao	410d09525f	setTransparent for mesh command	2015-05-29 16:38:42 +08:00
yangxiao	db2b2cf0b8	getTrianglesList for obj file	2015-05-29 16:37:37 +08:00
Huabing.Xu	b5e76c7521	Merge branch 'v3_origin' into v3FrameBufferObject	2015-05-29 15:59:38 +08:00
Huabing.Xu	f76585f046	Merge branch 'v3' into v3FrameBufferObject	2015-05-29 15:59:15 +08:00
Huabing.Xu	9bf15877e5	add applyViewport in camera.	2015-05-29 15:52:06 +08:00
子龙山人	039c0036be	Merge pull request #12072 from iris-wy/v3 Add enhance service API	2015-05-29 15:32:06 +08:00
Michael Sotnikov	b430353cd8	Fixed: #12097 VideoPlayer on Android ignores search paths	2015-05-29 10:17:40 +03:00
Jacky	8df4920f6e	fixed file name.	2015-05-29 15:03:36 +08:00
WenhaiLin	9c31aafba0	Fixed SimpleAudioEngine::playEffect() lagged on Android 5.0.x	2015-05-29 14:52:25 +08:00
CocosRobot	3a1b52cafd	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-05-29 06:31:00 +00:00
子龙山人	a165790ba9	Merge pull request #12083 from yangws/v3 Add opengl version project/unproject function in camera.	2015-05-29 14:21:56 +08:00
Huabing.Xu	2f32fcabba	Merge branch 'v3FrameBufferObject' into v3Viewport	2015-05-29 14:10:49 +08:00
Huabing.Xu	b2579a754a	refactor, use Camera::apply() to apply Rendertarget and Viewport	2015-05-29 14:08:20 +08:00
Huabing.Xu	1fb0ba112b	init code for viewport	2015-05-29 13:47:29 +08:00
CocosRobot	892816de3a	[AUTO]: updating luabinding & jsbinding automatically	2015-05-29 05:46:22 +00:00
子龙山人	035420893e	Merge pull request #12076 from andyque/update-changelog-v3 Fix a memory issue in AudioEngine	2015-05-29 11:44:45 +08:00
jianglong0156	722b6b1baf	add video player binding files	2015-05-29 11:39:47 +08:00
子龙山人	a968bc2d15	Merge pull request #12062 from jianglong0156/jsWebviewTest Js webview test	2015-05-29 11:35:30 +08:00
jianglong0156	8b52563a8a	add videoplayer config ini and fix the url bug	2015-05-29 11:10:39 +08:00
Vincent Yang	b714dde0ea	Add opengl version project/unproject function in camera.	2015-05-29 10:44:48 +08:00
Huabing.Xu	22ddf53539	Merge branch 'v3FrameBufferObject' into v3	2015-05-29 10:38:42 +08:00
Dale Stammen	8584f5f399	removed old WP8 files	2015-05-28 15:03:36 -07:00
Dale Stammen	2a71407501	fixed double to float conversion compiler warning	2015-05-28 15:00:49 -07:00
Dale Stammen	05d33ac0c8	removed old WP8 files	2015-05-28 14:08:25 -07:00
Dale Stammen	dadbbc18d6	added Windows 10 UWP project files	2015-05-28 13:51:25 -07:00
Dale Stammen	60f672599b	added winrt networking files	2015-05-28 13:48:13 -07:00
Dale Stammen	962393233f	removed old winrt property sheets	2015-05-28 13:12:37 -07:00
jianglong0156	9a62d06091	add video player test and auto bindings	2015-05-28 18:10:07 +08:00
子龙山人	a76018041e	Merge pull request #12077 from WenhaiLin/v3-label-mlinefix Text:Fixed the scale factor may be incorrect with multiline text.	2015-05-28 17:20:33 +08:00
Huabing.Xu	2d6d1b7a8c	add android background and foreground switch support for framebufferobject	2015-05-28 17:08:36 +08:00
MAUSMAUSgames	847cba026c	added _flags to Action, change API to stopActionsByFlags	2015-05-28 09:52:49 +02:00
linshun	543b6c2b07	issue #12078 : added storage group.	2015-05-28 15:48:08 +08:00
linshun	ef39251d14	issue #12078 : added platform group	2015-05-28 15:47:40 +08:00
linshun	56c848e341	issue #12078 : added physics group.	2015-05-28 15:47:03 +08:00
linshun	2a02510a9c	issue #12078 : Added network group.	2015-05-28 15:46:36 +08:00
linshun	77639bc88e	issue #12078 : Added audio group.	2015-05-28 15:46:02 +08:00
子龙山人	f6f8796dfa	Merge pull request #11762 from WenhaiLin/v3-audioengine-i11697 AudioEngine:Fixed program may freeze if `AudioEngine::stop` or `AudioEngine::stopAll()` is invoked frequently on Android.	2015-05-28 14:52:20 +08:00
jianglong0156	ab124978aa	web view can not run in mac, remove it from project file	2015-05-28 14:46:29 +08:00
jianglong0156	379f536330	improve test case, remove the invalid testcase	2015-05-28 14:02:07 +08:00
yangxiao	2e27bfd6c7	add comment	2015-05-28 12:40:16 +08:00
WenhaiLin	c60112a634	Text:Fixed the scale factor may be incorrect with multiline text.	2015-05-28 11:56:43 +08:00
jianglong0156	1dbaa5bb11	fix error log output	2015-05-28 11:56:07 +08:00
andyque	578fda54ba	fix a memory issue in AudioEngine. This PR also update AUTHORS and CHANGELOG files.	2015-05-28 11:49:27 +08:00
samuele3hu	9a4a545025	Issue #10570 : Make getItemForTouch of Menu virtual.	2015-05-28 11:41:49 +08:00
iris-wy	bbfc33dfd2	format format	2015-05-28 11:03:49 +08:00
子龙山人	001614a9c5	Merge pull request #11908 from flashjay/patch-1 fix: luaLoadChunksFromZIP should just remove .lua or .luac extension	2015-05-28 10:58:46 +08:00
iris-wy	9e477303f1	delete useless TAG delete useless TAG	2015-05-28 10:55:10 +08:00
waiter	67a323e14a	Fix a bug in Scheduler which may case Force Close Fix a bug in Scheduler which may case Force Close	2015-05-28 10:53:46 +08:00
iris-wy	0007799794	modify Enhance API modify Enhance API	2015-05-28 10:47:12 +08:00
jianglong0156	c0b42fdfec	modify addEventListener to setEventListener	2015-05-28 10:12:58 +08:00
Dale Stammen	9ee4b4af1e	Merge branch 'v3' into v3-winrt-audio	2015-05-27 11:54:21 -07:00
anniruddh.koppal	4501a53cfa	Added MP3 support to simple audio engine	2015-05-27 10:57:26 -07:00
子龙山人	6f16965b06	Merge pull request #12060 from CocosRobot/update_lua_bindings_1432717405 [AUTO]: updating luabinding & jsbinding automatically	2015-05-27 22:43:28 +08:00
子龙山人	88c26d9c5d	Merge pull request #12059 from andyque/add-button-bmfont-test add ui::Button BMFont title test	2015-05-27 22:42:46 +08:00
pandamicro	37f2d84675	Merge pull request #12056 from musikov/v3-jsb-cccolor-fix cc.Color() and cc.color() don't replace 0 alpha with 255 no more	2015-05-27 21:31:29 +08:00
yangxiao	a5976a43f7	code style	2015-05-27 18:19:44 +08:00
Huabing.Xu	9ffbe39f18	DepthStencil RenderTarget could be null, which can be used to detach the old DepthStencil RenderTarget	2015-05-27 18:16:05 +08:00
yangxiao	c68efaa79a	Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3	2015-05-27 18:09:08 +08:00
yangxiao	28b9b86b0b	get set gravity	2015-05-27 18:07:31 +08:00
jianglong0156	7402295205	improve event key	2015-05-27 18:02:01 +08:00
jianglong0156	2dd7b9575b	iOS project add web view project	2015-05-27 17:53:50 +08:00
CocosRobot	3bf58ab401	[AUTO]: updating luabinding & jsbinding automatically	2015-05-27 09:08:33 +00:00
Huabing.Xu	9d4e50f3a5	add optional params for RenderTarget creation	2015-05-27 16:59:54 +08:00
子龙山人	b8fd5ba290	Merge pull request #12052 from CocosRobot/update_lua_bindings_1432713396 [AUTO]: updating luabinding & jsbinding automatically	2015-05-27 16:59:50 +08:00
andyque	74f0b3b436	add bmfont test	2015-05-27 16:58:52 +08:00
子龙山人	e044b1ab11	Merge pull request #11785 from geron-cn/fixbug fix crash when run TestTimelineFrameEvent in cpp-test	2015-05-27 16:28:13 +08:00
子龙山人	62832586d0	Merge pull request #12049 from samuele3hu/v3_material issue #12046: Add Lua bindings for material systems and related test cases	2015-05-27 16:26:26 +08:00
Mykyta Usikov	355381e0d8	cc.Color() and cc.color() don't replace 0 alpha with 255 no more	2015-05-27 11:25:04 +03:00
子龙山人	ca8ca35fd6	Merge pull request #12054 from andyque/Feature_Add_Title_Alignment_for_Button [ci skip]Feature add title alignment for button	2015-05-27 16:09:06 +08:00
andyque	44babe18fb	add missing comments and fix back compatibility.	2015-05-27 16:07:37 +08:00
CocosRobot	3851e8356e	[AUTO]: updating luabinding & jsbinding automatically	2015-05-27 08:00:53 +00:00
子龙山人	616ac0058c	Merge pull request #12016 from namezero111111/v3 ui::TextField::getTextColor() missing	2015-05-27 15:53:09 +08:00
samuele3hu	9934d73548	issue #12046 : Add Lua bindings for material systems and related test cases.	2015-05-27 15:37:59 +08:00
jianglong0156	83f34c23d8	fixed the code error	2015-05-27 15:22:03 +08:00
jianglong0156	579f122cb1	add webview jsb eventType	2015-05-27 15:11:12 +08:00
jianglong0156	521ce15cb6	add webview autobindings. modify webtest. adapt the web interface	2015-05-27 11:46:26 +08:00
Huabing.Xu	471547e0b0	refactor FrameBufferObject to FrameBufferObject and RenderTarget	2015-05-27 11:40:12 +08:00
子龙山人	b2132eb127	Merge pull request #11921 from felixjingga/uibutton-support-bmfont Uibutton support bmfont	2015-05-27 11:19:46 +08:00
子龙山人	b8fdb152fd	Merge pull request #12026 from andyque/fix-android-9-patch-asset-issue fix assert failure of NinePatchImageParser and rapidjson	2015-05-27 11:17:31 +08:00
子龙山人	2cfeed2c49	Merge pull request #12031 from yangws/v3_bugfixTerrain Fix bug: terrain can't move to other position except origin point in world coord.	2015-05-27 10:48:02 +08:00
geron-cn	c19adbdc3c	fix bug: fix actiontimeline can not step to last frame when loop play	2015-05-27 10:24:50 +08:00
CocosRobot	824456b073	[AUTO]: updating luabinding & jsbinding automatically	2015-05-26 21:56:01 +00:00
Dale Stammen	06a5f7ed7a	moved CCNinePath files to base folder in solution	2015-05-26 09:48:25 -07:00
Dale Stammen	d146f26144	define RAPIDJSON_ENDIAN=RAPIDJSON_LITTLEENDIAN to fix broken ARM builds	2015-05-26 09:46:15 -07:00
Namezero	9808f6aa91	Update UITextField.h	2015-05-26 12:55:57 +02:00
Vincent Yang	d7ad7221e4	ciskip add doc for camera::getnear/farplane().	2015-05-26 18:14:37 +08:00
Vincent Yang	8105e9c714	Fix bug: terrain can't move to other position except origin point.	2015-05-26 17:51:26 +08:00
jianglong0156	7820610f13	Merge branch 'modifyTestResource' into jsWebviewTest Conflicts: cocos/scripting/js-bindings/proj.ios_mac/cocos2d_js_bindings.xcodeproj/project.pbxproj tests/js-tests/project.json tests/js-tests/src/GUITest/UIWebViewTest/UIWebViewTest.js tools/tojs/genbindings.py	2015-05-26 17:49:17 +08:00
andyque	8d78fd31b7	add assert to make program more robust	2015-05-26 17:25:42 +08:00
andyque	c668001e73	fix assert failure of NinePatchImageParser and rapidjson	2015-05-26 17:20:10 +08:00
Vincent Yang	246913c092	Fix bug: skybox can't move to other position except origin point in world space.	2015-05-26 17:14:26 +08:00
Namezero	8bc7d08d3f	added alignment getters	2015-05-26 09:34:13 +02:00
Namezero	2be136dc8e	alignment getters added	2015-05-26 09:33:11 +02:00
Huabing.Xu	83bae15caf	Merge branch 'v3FrameBufferObject' of github.com:dabingnn/cocos2d-x into v3FrameBufferObject # Conflicts: # cocos/2d/libcocos2d.vcxproj.filters # cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters	2015-05-26 12:06:05 +08:00
minggo	104f11fe4c	Merge pull request #12010 from CocosRobot/update_lua_bindings_1432542799 [AUTO]: updating luabinding & jsbinding automatically	2015-05-26 09:33:37 +08:00
Namezero	4c380bfaf0	Update UITextField.cpp	2015-05-25 21:06:27 +02:00
Namezero	dfb479d480	Update UITextField.h	2015-05-25 21:05:49 +02:00
Huabing.Xu	c22a8e81ce	Merge branch 'v3' into v3FrameBufferObject	2015-05-25 16:56:22 +08:00
minggo	bcc1bf8d32	Merge pull request #11983 from dabingnn/v3_SpriteWithTrianglesCommand use trianglescommand for sprite	2015-05-25 16:48:22 +08:00
CocosRobot	7fa68d9b3a	[AUTO]: updating luabinding & jsbinding automatically	2015-05-25 08:37:59 +00:00
minggo	999de9072a	Merge pull request #12003 from minggo/remove-unneeded-function remove uneeded function	2015-05-25 16:33:38 +08:00
minggo	273ac5d00a	Merge pull request #12002 from WenhaiLin/v3-texturecache-unbindfix Fixed TextureCache::unbindImageAsync fails to unbind all asynchronous callback for a specified bound image.	2015-05-25 16:29:43 +08:00
Felix J	d5a7163b29	don't update content size if not necessary refactor a little so we don't need to update the content size if bmfont is used, but still updating the _fontSize.	2015-05-25 14:45:26 +07:00
minggo	203203a92d	Merge pull request #12001 from andyque/upgrade-rapidjson-to-1.0.2 upgrade rapidjson to 1.0.2	2015-05-25 15:18:15 +08:00
Felix J	219d8193c4	remove else clause Removing the else clause cause BMFont cannot set its font size	2015-05-25 12:48:56 +07:00
andyque	81070a5299	fix lua project compile error	2015-05-25 13:42:54 +08:00
WenhaiLin	234ad668ec	Fixed TextureCache::unbindImageAsync fails to unbind all asynchronous callback for a specified bound image.	2015-05-25 11:47:37 +08:00
andyque	81d562803b	upgrade rapidjson to 1.0.2	2015-05-25 11:43:03 +08:00
minggo	db0caf68c6	remove uneeded function	2015-05-25 09:50:48 +08:00
MAUSMAUSgames	98c3ba6f4b	using Action::_tag as flag field adding options to use tag as flag field to Node::stopAllActionsByTag and ActionManager::removeAllActionsByTag	2015-05-24 17:30:26 +02:00
samuele3hu	074216bef9	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_physics3d Conflicts: templates/lua-template-default/frameworks/runtime-src/Classes/lua_module_register.h tests/lua-tests/src/mainMenu.lua	2015-05-24 22:46:05 +08:00
anniruddh.koppal	b2eb946c14	Added MP3 support	2015-05-23 19:13:12 -07:00
minggo	cad1b911c4	Merge pull request #11990 from xiaofeng11/v3 Remove missing resource notice label from all UI widget	2015-05-23 08:05:45 +08:00
XiaoFeng	e94bcbd28c	Remove missing resource label from all UI widget	2015-05-22 18:21:59 +08:00
minggo	311f453ea0	Merge pull request #11973 from dabingnn/v3_fixCameraVisitError Fix visiting scene error with multiple camera	2015-05-22 17:16:30 +08:00
Huabing.Xu	6d9f850e2c	use trianglescommand for sprite	2015-05-22 15:54:56 +08:00
CocosRobot	f18b8bfd95	[AUTO]: updating luabinding & jsbinding automatically	2015-05-22 06:55:54 +00:00
minggo	1eb8d59666	Merge pull request #11966 from samuele3hu/v3_httpclient fix the memory leak of s_requestSentinel for httpclient and adjust the global static var into the object to avoid some unexpected result.	2015-05-22 14:47:44 +08:00
minggo	698428e0a1	Merge pull request #11971 from joshuastray/physics Physics3d js binding	2015-05-22 14:42:34 +08:00
minggo	11f8f0fc21	Merge pull request #11963 from CocosRobot/update_lua_bindings_1432259998 [AUTO]: updating luabinding & jsbinding automatically	2015-05-22 14:41:28 +08:00
minggo	27b7f2dd19	Merge pull request #11969 from WenhaiLin/v3-TMXTiledMap-crash TileMap:Fixed crash if referring a non-existent layer in TMX.	2015-05-22 14:37:23 +08:00
Huabing.Xu	0644efc55e	isVisitableByVisitingCamera should not affect the calculation of transform	2015-05-22 13:59:45 +08:00
joshuastray	b1169c7d56	win32 and universal compile	2015-05-22 11:58:28 +08:00
WenhaiLin	fdde58386f	experimental::TileMap:Fixed crash if referring a non-existent layer in TMX.	2015-05-22 11:14:34 +08:00
minggo	bf25a0429d	Merge pull request #11964 from WenhaiLin/v3-console-crash [ci skip]Add comment.	2015-05-22 11:05:54 +08:00
WenhaiLin	2f558b5793	Merge branch 'tmx-crash-fix' of https://github.com/dumganhar/cocos2d-x into v3-support-android-studio	2015-05-22 11:01:13 +08:00
samuele3hu	27e7101322	fix the memory leak of s_requestSentinel for httpclient and adjust the global static var into the object to avoid some unexpected result.	2015-05-22 10:47:52 +08:00
joshuastray	1366f615dd	mac && ios works	2015-05-22 10:43:37 +08:00
WenhaiLin	a94a6baf87	[ci skip]Add comment.	2015-05-22 10:35:34 +08:00
CocosRobot	59807629d9	[AUTO]: updating luabinding & jsbinding automatically	2015-05-22 02:04:38 +00:00
minggo	d5d329b74f	Merge pull request #11946 from andyque/v3-final-android-9-patch-feature add Android 9-patch image format support	2015-05-22 09:52:12 +08:00
minggo	678b279754	Merge pull request #11953 from MSOpenTech/v3-winrt-settings V3: Windows 8.1 Universal App CCUserDefault implementation	2015-05-22 09:44:41 +08:00
minggo	36089b9bc3	Merge pull request #11950 from WenhaiLin/v3-console-crash Console:Fixed crash	2015-05-22 09:42:41 +08:00
tangziwen	fb1a7f1e8b	fix Terrain::getIntersectionPoint	2015-05-22 09:07:57 +08:00
Dale Stammen	6c02e46865	fix deprecated method	2015-05-21 13:30:51 -07:00
Dale Stammen	382d681250	added winrt version of CCUserDefault	2015-05-21 11:23:36 -07:00
Dale Stammen	2e5b604d2f	added CC_PLATFORM_WINRT to comments	2015-05-21 11:23:20 -07:00
Dale Stammen	992e292338	added winrt version of CCUserDefault	2015-05-21 11:21:46 -07:00
joshuastray	342734e3b5	Merge remote-tracking branch 'upstream/v3' into physics	2015-05-21 21:15:42 +08:00
WenhaiLin	158181d4eb	Console:Fixed crash	2015-05-21 18:14:21 +08:00
joshuastray	83237b8dbd	add physics3d js manual binding and tests	2015-05-21 18:05:49 +08:00
andyque	0352a7a3ea	add Android 9-patch image format support commit c214c4a7a457275785d6377031b5a267d543ffbb Author: andyque <guanghui8827@126.com> Date: Mon May 18 17:16:09 2015 +0800 Add Android 9-patch format support. Squashed commit of the following: commit a5a5a7a8f25b5bddae0ba21c56676a3f8d84102a Author: andyque <guanghui8827@126.com> Date: Mon May 18 17:08:05 2015 +0800 finish refactoring commit 730bf817f833de56999c616779fc0279890e14bf Author: andyque <guanghui8827@126.com> Date: Mon May 18 11:47:08 2015 +0800 refactoring 9-patch commit b45be6d54ac6e70a3fb9aa3eb700b252e4e72a54 Author: andyque <guanghui8827@126.com> Date: Mon May 18 09:42:06 2015 +0800 refactor commit 384110193f1d581c4a0fb7a2c771c55f1db63cbf Author: andyque <guanghui8827@126.com> Date: Fri May 15 17:59:21 2015 +0800 fix lua and Android compile error commit 2877538fb3a436f95400b2ad637ea147b9df81d7 Author: andyque <guanghui8827@126.com> Date: Fri May 15 11:32:43 2015 +0800 Add Android 9-patch image format support. The 9-patch format is used for creating Scale9Sprite.	2015-05-21 16:04:37 +08:00
andyque	03e8f16a8a	add vs2015 support	2015-05-21 13:55:01 +08:00
CocosRobot	ad301891f0	[AUTO]: updating luabinding & jsbinding automatically	2015-05-21 02:46:49 +00:00
minggo	22f0e2fbbf	Merge pull request #11918 from WenhaiLin/v3-37 AudioEngine: Fixed play with a large audio file may fail on Win32	2015-05-21 10:36:08 +08:00
minggo	69b6c9a3e5	Merge pull request #11906 from samuele3hu/v3_check Give more detailed tips by adding function name for luaval_to_object and update the bindings-generator submodule	2015-05-21 10:35:38 +08:00
CocosRobot	cb6abaa14c	[AUTO]: updating luabinding & jsbinding automatically	2015-05-21 01:52:51 +00:00
minggo	f1eae8f724	Merge pull request #11929 from namezero111111/patch-1 Fixed missing const-correctness	2015-05-21 09:38:24 +08:00
子龙山人	9ac23a5436	Merge pull request #11933 from kobake/fix-typo-angel Fix typo: "angel" to "angle"	2015-05-21 09:37:53 +08:00
minggo	bfbc8d28f2	Merge pull request #11928 from MSOpenTech/v3-winrt-bullet3d V3: Windows 8.1 Universal App version of Bullet 3D physics lib	2015-05-21 09:36:42 +08:00
kobake	d6f7a0a8a1	Fix typo. angel -> angle	2015-05-21 09:22:59 +09:00
Ricardo Quesada	f2d3ecad48	Removes state from MeshCommand. MeshCommand can be reused from other objects either by passing a `Material` or a `RenderState::StateBlock`	2015-05-20 15:57:26 -07:00
Dale Stammen	d70a9bf369	resolve full path for audio file	2015-05-20 11:18:54 -07:00
Namezero	89152ef514	Fixed missing const-correctness	2015-05-20 17:19:42 +02:00
Dale Stammen	209e7c62f4	added libbullet to Windows 8.1 Universal App projects	2015-05-20 08:01:01 -07:00
Dale Stammen	46a69cf00b	ignore warning 4996	2015-05-20 07:59:17 -07:00
Dale Stammen	3523173594	removed CC_PLATFORM_WP8	2015-05-20 07:58:39 -07:00
Dale Stammen	aa7876aefc	remove deprecated methods	2015-05-20 07:55:10 -07:00
Dale Stammen	14e812c7d4	enable CC_USE_3D_PHYSICS for CC_PLATFORM_WINRT	2015-05-20 07:53:49 -07:00
Dale Stammen	1b9a36f041	removed CC_PLATFORM_WP8 code	2015-05-20 07:52:59 -07:00
Dale Stammen	cada493685	remove deprecated methods	2015-05-20 07:51:52 -07:00
WenhaiLin	a569d877ba	[ci skip]Remove unnecessary code.	2015-05-20 18:05:46 +08:00
felixjingga	9c264ab64b	include algorithm header file	2015-05-20 16:42:48 +07:00
felixjingga	ee13dd82b8	fix compile error, and fix check of the fontname	2015-05-20 16:34:45 +07:00
WenhaiLin	02946a55a1	Fixed crash.	2015-05-20 17:13:04 +08:00
felixjingga	dcf4492ff0	add implementation detail to support BMFont	2015-05-20 15:56:07 +07:00
felixjingga	2d0fc637fc	add BMFont FontType to support BMFont	2015-05-20 15:50:20 +07:00
WenhaiLin	81dc551fe9	AudioEngine: Fixed play with a large audio file may fail on Win32.	2015-05-20 15:13:31 +08:00
minggo	7024d3129c	Merge pull request #11893 from MSOpenTech/v3-winrt-audio New audio engine support in winrt win8.1-universal	2015-05-20 13:40:41 +08:00
minggo	79f70c49ce	Merge pull request #11905 from WenhaiLin/v3-37 Remove unnecessary files.	2015-05-20 13:39:36 +08:00
James Chen	07f6774cee	Crash fix for referring a non-existent layer in tmx.	2015-05-20 11:29:52 +08:00
minggo	ba694beccb	Merge pull request #11895 from super626/v3 fix #10767	2015-05-20 11:20:47 +08:00
minggo	dbf1b415a5	Merge pull request #11898 from WenhaiLin/v3-console-crash Console:Fixed crash	2015-05-20 11:19:38 +08:00
joshuastray	712ba4f64c	add physics3d auto binding	2015-05-20 10:36:26 +08:00
HuaYang Huang	acb29ed5a8	fix: luaLoadChunksFromZIP should just remove .lua or .luac extension last version may filter modules like 'framework.luaj', 'framework.luaoc'	2015-05-20 10:36:05 +08:00
samuele3hu	dec9acfd87	Give more detailed tips by adding function name for luaval_to_object and update the bindings-generator submodule	2015-05-20 10:26:54 +08:00
WenhaiLin	df3548673f	Remove unnecessary files.	2015-05-20 10:19:32 +08:00
Ricardo Quesada	ae413a6f6d	Merge pull request #11904 from ricardoquesada/meshcommand_fixes MeshCommand uses StateBlock	2015-05-19 18:51:03 -07:00
Ricardo Quesada	ac54dad9a0	MeshCommand uses StateBlock When MeshCommand is used with GLProgramState, it will use the StateBlock internally, instead of the manual and error prone way of keeping state	2015-05-19 18:13:18 -07:00
Ricardo Quesada	5d90a8725e	Merge pull request #11903 from ricardoquesada/cleaner_code_properties Terrain uses StateBlock	2015-05-19 18:07:50 -07:00
Ricardo Quesada	5924a917a1	Terrain uses StateBlock cleaner code, conforms to new way of setting the state	2015-05-19 17:18:44 -07:00
CocosRobot	61aad4581a	[AUTO]: updating luabinding & jsbinding automatically	2015-05-19 23:02:24 +00:00
anniruddh.koppal	8432323450	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-winrt-audio	2015-05-19 16:01:10 -07:00
Ricardo Quesada	c28c1ffbfb	Merge pull request #11901 from ricardoquesada/cleaner_code_properties Properties fixes	2015-05-19 15:48:08 -07:00
Jacky	bbaa60bbbb	change to autopolygon.	2015-05-20 06:07:50 +08:00
Ricardo Quesada	aa027fbe0f	Properties fixes `createNonRefCounted` instead of `CrateWithoutAutorelease` `readlines()` code is easier to read. Same performance	2015-05-19 13:51:52 -07:00
WenhaiLin	80367e978d	Console:Fixed crash	2015-05-19 18:33:06 +08:00
tangziwen	8d791390ff	fix crash when visiting camera is not exist	2015-05-19 14:47:28 +08:00
anniruddh.koppal	ea345717c7	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-winrt-audio	2015-05-18 23:40:28 -07:00
Vincent Yang	8d3ade78ca	Add CC_DLL to Class FrameBufferObject.	2015-05-19 13:50:10 +08:00
Vincent Yang	628619a694	Add CCFrameBufferObject files to win32 and win8 vcproj.	2015-05-19 11:53:08 +08:00
minggo	bb3ad7d249	Merge pull request #11677 from tankorsmash/patch-1 Fix setSprite never updating progress on ProgressTimer	2015-05-19 11:42:20 +08:00
Jacky	514c8ae965	move sprite polygon logic to sprite polygon cache.	2015-05-19 11:25:53 +08:00
Wenhai Lin	17f2fcd201	Add more comment.	2015-05-19 11:01:23 +08:00
anniruddh.koppal	3a8d2ffc9e	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-winrt-audio	2015-05-18 19:23:48 -07:00
anniruddh.koppal	e0b3091dcf	Merge branch 'v3' of https://github.com/MSOpenTech/cocos2d-x into v3-winrt-audio Conflicts: tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems.filters	2015-05-18 19:21:48 -07:00
minggo	38773e2164	Merge pull request #11869 from samuele3hu/v3_updateccs Fix the bug that tableCellSizeForIndex of tableview get the wrong result in the Lua	2015-05-19 09:26:09 +08:00
dkorchinskiy	03aa73d68f	Feature #11886 add title alignment for button	2015-05-18 13:33:48 +03:00
minggo	e3e78b039a	Merge pull request #11851 from andyque/fixIssue11769 Copy missing text color property of ui::Text.	2015-05-18 18:14:29 +08:00
Huabing.Xu	75f740add5	linux works	2015-05-18 18:08:15 +08:00
Huabing.Xu	5634609e05	android works	2015-05-18 18:06:59 +08:00
samuele3hu	349f9bde11	Fix the compile error in the release mode	2015-05-18 17:43:20 +08:00
minggo	e700ef6d30	Merge pull request #11856 from WenhaiLin/v3-support-android-studio Add Android Studio support	2015-05-18 16:17:24 +08:00
WenhaiLin	26f094b1a7	Remove unnecessary files	2015-05-18 16:02:05 +08:00
Jacky	bcfa29a7d7	fixed memory leakage.	2015-05-18 15:52:46 +08:00
Jacky	d21f85787e	fixed memory leakage, remove unused header, fixed reference args.	2015-05-18 15:10:41 +08:00
CocosRobot	3e08ec4c11	[AUTO]: updating luabinding & jsbinding automatically	2015-05-18 07:04:27 +00:00
WenhaiLin	6dd3108e42	Rename module	2015-05-18 15:01:20 +08:00
minggo	f30cb9ac19	Merge pull request #11877 from CocosRobot/update_lua_bindings_1431927557 [AUTO]: updating luabinding & jsbinding automatically	2015-05-18 14:48:42 +08:00
minggo	7b76d5fc41	Merge pull request #11871 from walzer/v3 fixed #11821, after release StateBlock::_defaultState, set it to null.	2015-05-18 14:47:16 +08:00
Huabing.Xu	f96e704f7d	Merge branch 'v3' into v3FrameBufferObject Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj cocos/cocos2d.h cocos/renderer/CCGLProgramCache.cpp	2015-05-18 13:48:50 +08:00
CocosRobot	9572de26d4	[AUTO]: updating luabinding & jsbinding automatically	2015-05-18 05:43:08 +00:00
minggo	c2f245733c	Merge pull request #11872 from xiaofeng11/v3 Fix ArmatureAnimation crash	2015-05-18 13:32:52 +08:00
minggo	8068a2c220	Merge pull request #11836 from dabingnn/v3_CameraMaskFor2DAnd3DRendering V3 camera mask for2 d and3 d rendering	2015-05-18 13:32:26 +08:00
XiaoFeng	be20666b65	Fix ArmatureAnimation crash	2015-05-18 12:08:26 +08:00
walzer	02f295dfbf	fixed #11821 , after release StateBlock::_defaultState, set it to null, because developers would reconstruct it.	2015-05-18 10:44:49 +08:00
Huabing.Xu	384041a950	improve the perfermance of clear background for camera	2015-05-18 10:31:17 +08:00
samuele3hu	da2314b00a	Fix the bug that tableCellSizeForIndex of tableview get the wrong result in the Lua	2015-05-18 09:41:35 +08:00
minggo	2dbe375380	Merge pull request #11868 from joshuastray/bullet-preprocessor-macro add CC_ENABLE_BULLET_INTEGRATION=1 to js project	2015-05-18 09:33:00 +08:00
Vladimir Perminov	d2b58dd39b	CaptureScreen save file in thread Check already working Start save file in AsyncTaskPool::TaskType::TASK_IO	2015-05-17 20:48:49 +03:00
Vladimir Perminov	bfb3fbb1c0	Revert _checkPath	2015-05-17 19:24:57 +03:00
joshuastray	ead74ac89e	add CC_ENABLE_BULLET_INTEGRATION=1 to js project	2015-05-17 23:11:17 +08:00
Vladimir Perminov	295e8532d2	FileUtilsWin32 correct use all unicode version winapi Move to FileUtilsWin32 implements: isDirectoryExistInternal isDirectoryExist createDirectory removeDirectory removeFile renameFile And use common convert to wide char.	2015-05-17 12:40:14 +03:00
anniruddh.koppal	2db5a89b87	Added new audio engine with wav support	2015-05-15 18:17:52 -07:00
unknown	91432f0ddf	fixed include paths for arm builds	2015-05-15 15:35:36 -07:00
Jacky	19c5d2dc84	fixed some memory leakage and pixel cutting.	2015-05-15 17:18:19 +08:00
WenhaiLin	dc8492948e	Add Android Studio support	2015-05-15 16:37:43 +08:00
samuele3hu	71595898ed	Update the Lua binding for Physics3D ,related test cases and the template project	2015-05-15 16:25:07 +08:00
andyque	be62b3a8e2	Copy missing text color property of ui::Text.	2015-05-15 16:04:34 +08:00
iris-wy	68ec7c8ca1	Add enhance service API Add enhance service API	2015-05-15 14:29:22 +08:00
minggo	70cefb1589	Merge pull request #11845 from MSOpenTech/v3-winrt-js-fix V3: WinRT added ignore warning 4996 to Universal App libcocos2d-jsb	2015-05-15 11:34:44 +08:00
minggo	5e776381aa	Merge pull request #11820 from Dimon4eg/v3 Fix crash in web view if illegal character in url (Android only)	2015-05-15 10:12:54 +08:00
Huabing.Xu	fbe49f538d	remove WP8 code which is added by accident when resolve merge conflicts	2015-05-15 10:06:44 +08:00
Dale Stammen	46c69c7793	added ignore warning 4996 to hide the 200 deprecated warnings in libcocos2d-jsb	2015-05-14 19:00:53 -07:00
Huabing.Xu	c994f28914	Merge branch 'v3' into v3_CameraMaskFor2DAnd3DRendering	2015-05-15 09:55:51 +08:00
samuele3hu	fa63471c0a	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_physics3d Conflicts: tests/cpp-tests/Classes/Physics3DTest/Physics3DTest.cpp	2015-05-15 09:31:53 +08:00
samuele3hu	8db62c82f8	Add Lua bindings for Physics3D and related test cases	2015-05-15 09:28:03 +08:00
Ricardo Quesada	989848a358	fixes memory leak improves performance a little bit	2015-05-14 17:24:27 -07:00
minggo	9f3284d62f	Merge pull request #11833 from super626/v3 getTriangleList to bundle and add terrain to 3d render queue	2015-05-14 18:16:27 +08:00
minggo	0a3e6338f1	Merge pull request #11834 from pandamicro/v3_origin Sync fixes in Cocos2d-JS	2015-05-14 13:38:18 +08:00
Huabing.Xu	84540c1ff4	Merge branch 'v3' into v3_CameraMaskFor2DAnd3DRendering Conflicts: cocos/renderer/CCGLProgramCache.cpp tests/cpp-tests/Classes/controller.cpp	2015-05-14 11:55:10 +08:00
Huabing.Xu	57a3fa256a	Fix memory leak for FrameBufferObject	2015-05-14 11:19:13 +08:00
pandamicro	4146a6edf4	Fix incorrect property of cc.Texture2D	2015-05-14 10:41:10 +08:00
pandamicro	2685df73f2	Fix spine crash issue	2015-05-14 10:40:37 +08:00
pandamicro	8577055d5a	Implement localStorage.clear on Android	2015-05-14 10:40:25 +08:00
Huabing.Xu	e6e0a1d15c	refactor: FrameBufferObject will contain an Texture2D instead of inheriting from Texture2D	2015-05-14 10:36:49 +08:00
CocosRobot	006f9fcd36	[AUTO]: updating luabinding & jsbinding automatically	2015-05-14 02:30:32 +00:00
yangxiao	e659373648	add getTriangleList to bundle	2015-05-14 10:30:20 +08:00
yangxiao	0f0f85b33c	terrain to 3d render queue	2015-05-14 10:29:50 +08:00
minggo	cbab1074fa	Merge pull request #11819 from cpascal/fix_defined Fix compile error: using any of CC_USE_JPEG=0, CC_USE_PNG=0, CC_USE_TIFF=0, CC_USE_WIC=0	2015-05-14 10:21:38 +08:00
minggo	7732cd6e77	Merge pull request #11814 from super626/issue9767 add issue9767 test	2015-05-14 10:20:09 +08:00
minggo	1eaacd27c5	Merge pull request #11818 from joshuastray/fix-js-compilation fix script binding code generation	2015-05-14 10:19:27 +08:00
Ricardo Quesada	fde5f8d63c	Adds better sample adds clone support as well	2015-05-13 17:39:39 -07:00
Ricardo Quesada	aeea7ade14	RenderState can be part of Material and Technique	2015-05-13 14:12:37 -07:00
Ricardo Quesada	e95de4de62	fixes mipmap issue with parsing Sampler	2015-05-13 10:24:32 -07:00
dkorchinskiy	9d7e5e5edc	Fix crash in web view if illegal character in url (Android only)	2015-05-13 14:56:07 +03:00
cpascal	134355d763	Fix compile error: using any of CC_USE_JPEG=0, CC_USE_PNG=0, CC_USE_TIFF=0, CC_USE_WIC=0 When I don't want to use TIF file, Cocos2d-x ccConfig.h's style is.. #define CC_USE_TIF 0 But CCImage.cpp just check wheather defined or not..	2015-05-13 20:52:32 +09:00
cpascal	7e9019f9d6	Revert "Fixed ogg filepath has unicode in Win32" This reverts commit `382fd48b6a`.	2015-05-13 20:49:46 +09:00
joshuastray	4699b0cfb5	fix script binding code generation	2015-05-13 17:51:30 +08:00
Huabing.Xu	8311cf8920	Fix clearcolor overwrite bug change test case for FrameBufferObject	2015-05-13 17:40:10 +08:00
cpascal	14f8b02d9b	Merge remote-tracking branch 'upstream/v3' into v3	2015-05-13 18:28:38 +09:00
Huabing.Xu	6097b4ddd2	add clearAllFBOs function in FrameBufferObject	2015-05-13 17:17:54 +08:00
minggo	1007c0bfdb	Merge pull request #11813 from CocosRobot/update_lua_bindings_1431504407 [AUTO]: updating luabinding & jsbinding automatically	2015-05-13 17:05:27 +08:00
minggo	3d0c7705f7	Merge pull request #11763 from Dimon4eg/v3 Fix web view leak on iOS	2015-05-13 17:02:50 +08:00
yangxiao	ec69a34c51	add issue9767 test	2015-05-13 16:16:45 +08:00
CocosRobot	6bf984f3d3	[AUTO]: updating luabinding & jsbinding automatically	2015-05-13 08:11:34 +00:00
Huabing.Xu	42514ee62f	FrameBufferObject works	2015-05-13 14:24:53 +08:00
Ricardo Quesada	f23b15c6d3	Merge pull request #11810 from ricardoquesada/api_fixes More material samples	2015-05-12 23:03:40 -07:00
minggo	384c20f390	Merge pull request #11805 from super626/physics3d2 pass parameter by reference	2015-05-13 13:39:49 +08:00
Ricardo Quesada	c693573d77	more samples and API fixes	2015-05-12 22:24:52 -07:00
Ricardo Quesada	a83c10fdbf	Merge pull request #11807 from ricardoquesada/material_vertexattrib Adds support of VertexAttribBinding per Pass	2015-05-12 21:05:02 -07:00
Ricardo Quesada	d23ff0ea2c	Adds support of VertexAttribBinding per Pass	2015-05-12 19:58:09 -07:00
yangxiao	f2eacc154b	use reference param	2015-05-13 10:13:46 +08:00
minggo	5c227f4c92	Merge pull request #11528 from hobogenized/my_fix_branch Minor changes in variable names to fix Xcode warnings	2015-05-13 10:03:33 +08:00
minggo	56d21b6040	Merge pull request #11680 from kaplad/vk_fix_logical_bug Fix a logical bug that may make wrong behavior	2015-05-13 09:41:20 +08:00
minggo	a587b28e38	Merge pull request #11792 from super626/v3 particle3d can not be seen when added to scene with terrain	2015-05-13 09:38:21 +08:00
minggo	5e87bd307b	Merge pull request #11798 from WenhaiLin/v3-support-vs2015 Add support for visual studio 2015.	2015-05-13 09:37:12 +08:00
minggo	b51f78aa42	Merge pull request #11797 from super626/physics3d2 fix wrong indent and add const	2015-05-13 09:36:51 +08:00
minggo	b0c7531897	Merge pull request #11795 from CocosRobot/update_lua_bindings_1431410101 [AUTO]: updating luabinding & jsbinding automatically	2015-05-13 09:35:25 +08:00
Dale Stammen	f1fe802442	updated winrt keyboard support to support physical keyboard	2015-05-12 09:20:10 -07:00
pandamicro	3190d0e5fb	Add localStorage.clear test case	2015-05-12 19:02:22 +08:00
pandamicro	c7f3c2fa8b	Fix Scale9Sprite's inheritance issue triggered by its constructor	2015-05-12 18:04:01 +08:00
pandamicro	ef0854545b	Fix cc.EventMouse constants issue	2015-05-12 18:02:36 +08:00
pandamicro	c9ee849a2c	Add localStorage.clear in JSB	2015-05-12 18:02:14 +08:00
WenhaiLin	461241839d	Fixed compile error on visual studio 2015.	2015-05-12 17:04:56 +08:00
WenhaiLin	e53a977439	Add support for visual studio 2015.	2015-05-12 16:46:09 +08:00
Huabing.Xu	f0acf7ee7b	original version of frame buffer object	2015-05-12 16:43:17 +08:00
WenhaiLin	c70bac7bb4	Add support for visual studio 2015.	2015-05-12 16:26:28 +08:00
yangxiao	806d64dced	fix wrong indent and add const	2015-05-12 16:13:14 +08:00
CocosRobot	dbb51e2367	[AUTO]: updating luabinding & jsbinding automatically	2015-05-12 05:59:42 +00:00
minggo	cdfce7fcae	Merge pull request #11791 from CocosRobot/update_lua_bindings_1431407875 [AUTO]: updating luabinding & jsbinding automatically	2015-05-12 13:51:32 +08:00
minggo	398d36b58a	Merge pull request #11788 from joshuastray/spritepolygon SpritePolygon binding and tests for js	2015-05-12 13:46:22 +08:00
CocosRobot	a7fb56de69	[AUTO]: updating luabinding & jsbinding automatically	2015-05-12 05:23:45 +00:00
Ricardo Quesada	1937431596	Material uses new file format The new file format is easier to read and less error prone It also fixes many bugs and adds new test cases	2015-05-11 21:31:33 -07:00
yangxiao	4d71175318	resove conflict	2015-05-12 12:12:29 +08:00
joshuastray	7a4ca3fe6a	add new files to project	2015-05-12 10:40:51 +08:00
jianglong0156	80326aa40e	add webiew jsb code	2015-05-12 10:30:51 +08:00
Huabing.Xu	cc0b3ffd2e	Merge branch 'v3' into v3_addClearforCamera Conflicts: cocos/renderer/CCGLProgramCache.cpp tests/cpp-tests/Classes/controller.cpp	2015-05-12 09:49:15 +08:00
minggo	5d0fc22d28	Merge pull request #11782 from WenhaiLin/v3-label-outline Label:Fixed the characters with outline not on the same base line.	2015-05-12 09:46:26 +08:00
geron-cn	3e0b0a0feb	fix crash when run TestTimelineFrameEvent in cpp-test	2015-05-11 23:04:26 +08:00
Vladislav Kaplun	f67b4761da	Fix a logical bug that may wrong behavior	2015-05-11 15:15:00 +03:00
WenhaiLin	7e0dc7482b	Label:Fixed the characters with outline not on the same base line.	2015-05-11 18:05:03 +08:00
joshuastray	234f4db8a0	add SpritePolygon binding && js tests	2015-05-11 17:04:23 +08:00
CocosRobot	e325a3b746	[AUTO]: updating luabinding & jsbinding automatically	2015-05-11 08:33:55 +00:00
minggo	1129949722	Merge pull request #11772 from CocosRobot/update_lua_bindings_1431309376 [AUTO]: updating luabinding & jsbinding automatically	2015-05-11 16:24:22 +08:00
minggo	bcd57c3d90	Merge pull request #11776 from samuele3hu/v3_physics3d Add macro limitation for Physic3D related	2015-05-11 16:09:19 +08:00
samuele3hu	9e9494ded0	Add limited macro for related Physic3D	2015-05-11 15:34:37 +08:00
songchengjiang	f25c02f230	fix bugs of terrain	2015-05-11 12:02:32 +08:00
CocosRobot	b5e9986d17	[AUTO]: updating luabinding & jsbinding automatically	2015-05-11 02:00:41 +00:00
Dale Stammen	351a898a70	removed CC_PLATFORM_WP8	2015-05-08 09:19:13 -07:00
cpascal	382fd48b6a	Fixed ogg filepath has unicode in Win32 In Win32, you can't play ogg file if the path contains unicode. mpg123 library accepts utf8 filepath, but ogg(Vorbisfile) library accepts ACP(ANSI CodePage) in Win32 environment.	2015-05-08 21:48:21 +09:00
dkorchinskiy	a71ef98275	Fix web view leak on iOS	2015-05-08 15:19:14 +03:00
WenhaiLin	07f5ec755a	AudioEngine:Fixed program may freeze if `AudioEngine::stop(int audioID)` or `AudioEngine::stopAll()` is invoked frequently on Android.	2015-05-08 18:29:45 +08:00
yangxiao	2391558c96	add physics3d support	2015-05-08 15:49:33 +08:00
Huabing.Xu	713831ca76	fix rendering of camera clear quad	2015-05-08 14:21:23 +08:00
minggo	bf93289718	Merge pull request #11751 from samuele3hu/v3_7_remove_vs2012 Remove vs2012 support in v3	2015-05-08 14:11:13 +08:00
minggo	14cebf7150	Merge pull request #11750 from CocosRobot/update_lua_bindings_1431050321 [AUTO]: updating luabinding & jsbinding automatically	2015-05-08 10:42:31 +08:00
minggo	d587ffd5c0	Merge pull request #11736 from samuele3hu/v3_7_js issue 10411:Bug in Physics manual Lua binding	2015-05-08 10:04:55 +08:00
CocosRobot	4195c4b250	[AUTO]: updating luabinding & jsbinding automatically	2015-05-08 02:03:02 +00:00
minggo	5140afe24c	Merge pull request #11715 from cnsoft/cnsoft-patch-1 try to fix a nullptr bug.	2015-05-08 09:55:13 +08:00
minggo	09ddf15b9f	Merge pull request #11740 from joshuastray/fix-debu fix jsb debugger bug	2015-05-08 09:29:40 +08:00
Huabing.Xu	f064587ae5	refactor camera clear to immediate rendering	2015-05-07 18:32:32 +08:00
Jialong Zhai	be923b5901	fix jsb debugger bug	2015-05-07 18:24:30 +08:00
samuele3hu	23e4e0d4e3	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_7_remove_vs2012	2015-05-07 16:21:03 +08:00
samuele3hu	0d53065476	issue 10411:Bug in Physics manual Lua binding	2015-05-07 16:15:24 +08:00
minggo	775236b531	Merge pull request #11729 from samuele3hu/v3_7_js Update the configure of js-tests and js-template on the win32 platform	2015-05-07 15:48:35 +08:00
Huabing.Xu	67ec758d15	add clear feature when before draw scene with a camera	2015-05-07 15:09:06 +08:00
minggo	65ec7f9545	Merge pull request #11728 from WenhaiLin/v3-label-pos Label: Fixed position is wrong if label content is changed after invoking `getLetter(letterIndex)`	2015-05-07 13:42:28 +08:00
minggo	a718c11eb6	Merge pull request #11724 from andyque/fix-binding-generator fix upstream compile error	2015-05-07 11:47:20 +08:00
samuele3hu	243da71082	Update the project configure of js-tests and js-template on the win32 platform	2015-05-07 11:38:43 +08:00
WenhaiLin	03a1167902	Merge branch 'v3-label-pos' of https://github.com/WenhaiLin/cocos2d-x into v3.7	2015-05-07 11:31:59 +08:00
Wenhai Lin	d09bd21da4	Label: Fixed position is wrong if label content is changed after invoking `getLetter(letterIndex)`	2015-05-07 11:20:22 +08:00
minggo	f76dd57bf7	Merge pull request #11727 from samuele3hu/v3_7_js Add $(EngineRoot)external for cocos2d_headers.props	2015-05-07 11:17:10 +08:00
samuele3hu	87db3aba78	Add $(EngineRoot)external for cocos2d_headers.props	2015-05-07 11:11:33 +08:00
andyque	db95034798	fix android compile error	2015-05-07 10:37:19 +08:00
minggo	83a887f6a0	Merge pull request #11714 from ryule/v3 javaactivity-android.cpp needs JNIEXPORT for -fvisibility=hidden	2015-05-07 09:37:58 +08:00
minggo	fb112995d8	Merge pull request #11491 from milos1290/tween Adding FloatAction to animate any property over time.	2015-05-07 09:34:44 +08:00
minggo	ba1e77d656	Merge pull request #11720 from WenhaiLin/v3-label-outline Label:Fixed outline doesn't match with the characters exactly.	2015-05-07 09:30:37 +08:00
minggo	b60a31f12d	Merge pull request #11721 from samuele3hu/v3_7_js Fix the compile error for libSpine on the win32 platform	2015-05-07 09:30:15 +08:00
Ricardo Quesada	c2bbc06340	compiles on win32	2015-05-06 08:46:48 -07:00
samuele3hu	b2c361f1a1	Fix the compile error for libSpine on the win32 platform	2015-05-06 23:30:08 +08:00
WenhaiLin	b1803d40db	Label:Fixed outline doesn't match with the characters exactly.	2015-05-06 17:17:30 +08:00
cnsoft	62741e3ff8	fix a nullptr bug. get model from : http://pan.baidu.com/s/1sjofSWd pass: 9xis it will crash in cocos studio or client.	2015-05-06 14:38:38 +08:00
Jongryul Kook	dfe30e159f	Need JNIEXPORT for -fvisibility=hidden	2015-05-06 14:24:48 +09:00
Ricardo Quesada	fe59b093b5	adds love to header files	2015-05-05 21:48:05 -07:00
samuele3hu	cc4fe9b746	Modify the configuration about js-tests.	2015-05-06 10:52:23 +08:00
minggo	6351863b3c	Merge pull request #11696 from WenhaiLin/v3-label-shadow-glerror Label:Fixed shadow effect cause OpenGL error on IOS.	2015-05-06 09:53:39 +08:00
minggo	37302d6d8f	Merge pull request #11704 from MSOpenTech/v3-winrt-fix V3: WinRT updated output name to libcocos2d_v3.7	2015-05-06 09:41:11 +08:00
CocosRobot	8470ab606b	[AUTO]: updating luabinding & jsbinding automatically	2015-05-06 01:07:26 +00:00
Ricardo Quesada	26bca75e0e	Merge pull request #11708 from ricardoquesada/no_exceptions No throws in cocos2d-x code	2015-05-05 17:57:28 -07:00
Ricardo Quesada	10b71464a7	No throws in cocos2d-x code	2015-05-05 17:17:41 -07:00
Ricardo Quesada	90c9dffc1a	cleanup Material Code - removes unused code - removes experimental code	2015-05-05 15:59:41 -07:00
Dale Stammen	22951e8a6a	updated output name to libcocos2d_v3.7	2015-05-05 14:54:33 -07:00
Ricardo Quesada	ce95bfe059	Squashed commit of the following: commit 3676fd8b4fe09be74fe10a6e2b8d6043cd016a2a Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue May 5 11:46:57 2015 -0700 compiles on win32 commit 0b8d30a3f8b2656e714846a62ca8a94b303efbdc Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue May 5 11:01:04 2015 -0700 compiles on windows! commit 8cad22273ec2d9b74ef22196afcb8aa2f2bd8a6c Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue May 5 10:20:13 2015 -0700 windows fix CALLBACK is defined in windows. Use CALLBACK_FN instead commit 33eff5c09c30e5ba6c8e61a69d1be0696d0b5d15 Merge: 17c5102 `f843466` Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue May 5 09:51:02 2015 -0700 Merge remote-tracking branch 'cocos2d/v3' into material_system commit 17c5102215e60c9e9b8b69ceb6b61b84b657ec91 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon May 4 17:05:49 2015 -0700 Material system works Ok. Deftaul states are being applyied to RenderState::StateBlock::_default state as well! commit 3f5285102ef95c77c505d0f2174f8f77b9bd86e1 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon May 4 15:52:09 2015 -0700 more fixes for material blending works as expected commit 347eaea42248eb07bc77844dcee56dcbcf0fbcb2 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon May 4 12:14:00 2015 -0700 compiles on Android compiles on Android commit 5feef67410a6e8408414230887c177a5cc3d8c35 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon May 4 11:01:46 2015 -0700 Cmakefiles works with Cmake again commit 1366da20efd4f63f683ac9264e18aa71d84bcc71 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sat May 2 18:17:50 2015 -0700 Particle3D working Ok with its own uniforms commit c6cfa32e1f693e6d71d00e0cd9dd9610ca1e7663 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 1 17:32:00 2015 -0700 MeshCommand now works 100% on Material! commit 92d641e29675ffc58daba48fcdcc5ec6459be02f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 1 15:49:14 2015 -0700 multiple meshes work Ok commit 842927d18b5605b2fd1bd3a679fc25418c7eeab8 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 1 13:43:56 2015 -0700 Adds `clone` to GLProgramState commit c4b8e222f8e852254b1f23f0e17c16dfca7cc5ca Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 30 18:54:34 2015 -0700 adds comment about the glprogramstate bug commit 2d008ec90557025507e0b17284e60b39fc9b42d3 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 30 18:28:39 2015 -0700 some uniforms moved to Material commit 11f59f87079a6cb698c7e9b5a55735f6d51cf420 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 30 16:52:07 2015 -0700 depth test moved to Material! commit 4dabb53641c293bfe8c417fe3491ec33b33ffc4e Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 30 13:12:28 2015 -0700 Material/Technique/Pass subclass of RenderState Inheritance of RenderState. Code from GamePlay3D commit a8b888dc30cf7ab4fae186acec2a366dfb967116 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 30 12:05:26 2015 -0700 same as v3 commit c026de5318a2a03beed1de6d7a0efda431569a5c Merge: 4561e3f `254a4b0` Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 30 11:37:40 2015 -0700 Merge remote-tracking branch 'cocos2d/v3' into material_system commit 4561e3f5763849872d888a3be9ebbdcfb1a7bf9d Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 29 18:02:21 2015 -0700 fixes on blending commit 1b4cd8fd1c7b2a489b6a52ab6d42548eb7c7fac0 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 29 17:51:05 2015 -0700 better defaults for StateBlock commit 3a661c35908aa075754d7b9dfac45be1af3b38e9 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 29 17:46:36 2015 -0700 RenderState::bind() binds lots of states commit 074d5fb4a485e4ac32996c345e314594806e3cf0 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 29 16:40:07 2015 -0700 Adds REnderState parsing in .material commit 7c0f098b7e2e198aa4a821bfbdec661eeba2587e Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 29 16:06:31 2015 -0700 RenderState added into RenderState Code based on GamePlay3D. Adds GamePlay3d License. commit 04a6295ca5839e2e1202881b8a10733685c113d6 Merge: 52c916f `5671818` Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 29 11:27:55 2015 -0700 Merge branch 'v3' into material_system commit 52c916fb4df04558433b1370102a5e9269f73607 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Apr 28 18:15:12 2015 -0700 order files alphabetically order files alphabetically commit a5f54f0c1ca5d997a87e0231ce1b28d3c8d9ca64 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Apr 28 17:46:07 2015 -0700 Adds cmake and android support commit 2432b1dd2ec3c7db78d4d9e5e7b9fbe491b95884 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Apr 28 16:33:50 2015 -0700 for some reason the callback was crashing ... bug in the callback code? in any case, we didn't need it and it was making the code slower. commit 7844d32d04cb411ddae139d9598adcb04b899606 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Apr 28 14:00:24 2015 -0700 more little fixes commit 2992a5e0f4a8dfac87d6aab37e101154f8b41519 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Apr 28 12:11:28 2015 -0700 MeshCommand using Material internally works commit 67a435d66b4e554b4d24e462ca2ad42408157e69 Merge: 6dee7ca `b9a994f` Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Apr 28 10:34:03 2015 -0700 Merge remote-tracking branch 'cocos2d/v3' into material_system commit 6dee7cac6a51b4c123aabb111b0f8951082b1507 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Apr 27 17:41:27 2015 -0700 improved readebility of MeshCommand code commit 3a57eb200f7cba4a17f512060dd3f121d83e32fd Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Apr 27 15:41:07 2015 -0700 mesh supports Material `Mesh` supports `Material` Now `MeshCommand` needs to implement it correctly. commit 2fc745c787555fbd5c6b100b0a2833ef0e65ad73 Merge: 05b16f5 `bd5f4e0` Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Apr 27 11:23:28 2015 -0700 Merge branch 'v3' into material_system commit 05b16f5c6f783ff38b4ae54528f9b949d8bb39a4 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Apr 24 17:40:48 2015 -0700 Adding Material into Mesh WIP. commit bc62f1a146ff9ad9864d8ff317f6a9540760066a Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Apr 24 16:39:54 2015 -0700 cosmetic commit 2f86d50cee15c6af20abb512368aa36dc4ed3ccf Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Apr 24 16:26:41 2015 -0700 moves even more code form Sprite3D to Mesh commit 04643bed3c277f0a775e962a5c87f550b1a59e74 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Apr 24 16:15:21 2015 -0700 Moves "draw" from `Sprite3D` to `Mesh` commit 4bf884cdcb1a8df7522adeab364368493aba11e0 Merge: 2f305fc `2199bf1` Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Apr 24 15:00:50 2015 -0700 Merge remote-tracking branch 'cocos2d/v3' into material_system commit 2f305fc68ad847fd4bdf855611c6f6f6a4bf63d2 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Apr 24 14:46:28 2015 -0700 cosmetic commit a697b43a96e5f9440787aa2a1c4e178d98b2e5bc Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 23 16:44:21 2015 -0700 revert my changes... ...actually the GLProgramState code was Ok... ouch commit 36323c62eae2f8dbdcd7e13075758752cce44132 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 23 15:40:54 2015 -0700 parsing GLProgramState validates the attributes commit a406d6236a78244f73e81ded0b4148199a8677e5 Merge: 3be7fde `cf177bb` Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 23 12:10:31 2015 -0700 Merge remote-tracking branch 'cocos2d/v3' into material_system commit 3be7fdee9d88a14916b4f25b1c0b6f50cb619c04 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 22 17:45:34 2015 -0700 little progress on Sprite3D + Material GLProgramState needs to decouple Uniforms from Attributes in `applyGLProgram`. binding the attributes is something that needs to be done at a different order. Perhaps the attributes are part of a VAO or something else. the method `applyAttributes()` has a variable to avoid that... but everything looks very hackish. commit f82496c61c9cb5a0787f883a4fb2d475889fa711 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 22 15:46:02 2015 -0700 doesn't crash :) but doesn't show anything either commit 0593fb09dc987aa2dd22af3a6c3aa8241fedfe5f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 22 13:35:45 2015 -0700 adding sprit3d test commit e716da63fe053b48db06f2aed9e0280256dd5f1b Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 22 12:10:32 2015 -0700 MeshCommand: initial draw with Material commit d758041d81c3e6275997205e6395c46006bcc4ca Merge: 8cdc99f `ca1a95f` Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 22 10:41:05 2015 -0700 Merge remote-tracking branch 'cocos2d/v3' into material_system commit 8cdc99fca664b0c9c2a536d431ffcc7844d69b3e Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Apr 21 21:57:28 2015 -0700 adding Material to MeshCommand commit 0121872709c5e584b9b9f102e0f8dfc9c836841b Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Apr 21 19:39:09 2015 -0700 pre commit before merging MeshCommand commit 06c0ac2a67e303bde98dff75ac436ec22de59263 Merge: 736feb1 `0287b42` Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Apr 21 18:19:00 2015 -0700 Merge remote-tracking branch 'cocos2d/v3' into material_system commit 736feb1b6495b7411525afb130015bdb31b5c471 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Apr 20 17:22:03 2015 -0700 Pass conforms to create()/init() pattern commit 6103ffbb8479681b6665e81f0572bc3287919d07 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Apr 20 17:04:19 2015 -0700 defines are strings better error checking when creating objects autorelase added in Pass, Material, Technique commit 1efcbab63c7ca4259d50825144184baee1b577ac Merge: 5b233bc `fd3e38b` Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Apr 20 11:23:47 2015 -0700 Merge remote-tracking branch 'cocos2d/v3' into material_system commit 5b233bc879bd65123092d366257843465ec1d306 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Apr 17 15:31:37 2015 -0700 blur effect works with alpha commit 836d3c4a0dcc3a363e1b0290e628b7ac2a973c89 Merge: e4c1dd2 `425b2b6` Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Apr 17 15:04:35 2015 -0700 Merge remote-tracking branch 'cocos2d/v3' into material_system commit e4c1dd23d8b28f2631efe30f6cc9da9eda4501bb Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Apr 17 15:04:07 2015 -0700 Material, Technique, Pass: they have parent commit 7c3f258a1c9e4ff319db4e3eebfd39006d673d91 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 16 21:48:06 2015 -0700 multipass works commit b73ede73b72d8305f6f9d7898b4a5aa2336e9e32 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 16 17:31:04 2015 -0700 yeah! more materials... a lot to do yet commit d54d24ed185071ce1350bbf71914a64c9f6f228e Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 16 17:06:46 2015 -0700 yeah! works! commit 1e70cb553148e6c136df42a789bf85184e73762d Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 16 16:43:54 2015 -0700 simple test of material system works!!! commit c8581dfe9e970a3004254987416d75cccc644ccd Merge: 83aeec4 `5d5fa3d` Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 16 13:51:45 2015 -0700 Merge remote-tracking branch 'cocos2d/v3' into material_system commit 83aeec41c7933ee46f5763ad64dcdc71a50885dc Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 15 18:04:23 2015 -0700 JSON file curated fixes minor bugs commit 35f669e7fad6257ff6e60023e95ec757fdfe23f5 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 15 17:22:36 2015 -0700 parsers shaders! including uniforms commit 3f58bad0b2bc7ebbcfcf74e1eb02048f9d574340 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Apr 14 23:24:18 2015 -0700 Material parses texture commit 1f678faf9d6c25f6405591f052da511281be8768 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Apr 14 18:22:33 2015 -0700 material parsing almost working commit 9a79c45fe4d735a772d5e6d9e1f8bcb02546560d Merge: d0ff296 `d54ddbd` Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Apr 14 09:23:23 2015 -0700 Merge branch 'v3' into material_system commit d0ff2960f4f9edc4714f9d3edf921f3365d305c7 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Apr 13 18:42:42 2015 -0700 json parsing broken ha... I need to parse the content of the file, to the name of the file. to be fixed tomorrow commit e5aab39e5774d997f848155fc7209e9fbbd03bbc Merge: 81e93fa `bc34554` Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Apr 13 10:19:11 2015 -0700 Merge branch 'v3' into material_system commit 81e93faac9d80888e975ee19d7412c54daf439a0 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Apr 10 17:41:12 2015 -0700 Adds more dummy files for material commit 5552a1e099bcf960d962c5369973ea663f802895 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Apr 10 17:01:16 2015 -0700 adds empty test commit 7027c85fb24109f1ed4c50877dbec35618b5b39c Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Apr 10 15:36:24 2015 -0700 more material fixes multiple passes added in renderer commit db6745ead9879c6ce66b1921f32bf927421c54d9 Merge: 58d2412 `8a160d7` Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Apr 10 11:52:30 2015 -0700 Merge branch 'v3' into material_system commit 58d241266bdbd88162bb7ae9a7e868af173e6375 Merge: 0eccb23 `b409f20` Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 9 15:42:35 2015 -0700 Merge branch 'v3' into material_system commit 0eccb236aa933eb471416258c5bb55a7ca3a24f0 Merge: 83494de `967f35a` Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 9 15:18:34 2015 -0700 Merge branch 'cpp_compiles_on_mac' into material_system commit 83494dedd0f4e7092f0267187cf07bd7de7723c2 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 9 15:09:59 2015 -0700 compiles on Mac commit cca5b060164182b67df21fa330dce938e17fb324 Merge: dfc3740 `09c50c4` Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 9 13:54:59 2015 -0700 Merge branch 'v3' into material_system commit dfc374099ca02e547478d24fa8fd61817a85862c Merge: fa2152b `64c45fa` Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 8 14:16:27 2015 -0700 Merge branch 'v3' into material_system commit fa2152b3402e3519d35f98309c4acc03b6790370 Merge: 90b7b6f `b648d1f` Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Apr 3 10:15:28 2015 +0800 Merge branch 'v3' into material_system commit 90b7b6f6540edff156e22fdf38021a5c83194deb Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Apr 3 10:13:24 2015 +0800 little changes to pass commit 7f8b83017f03572a3698f431b6af497d62fcfa25 Merge: 7460614 `0779d05` Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 2 08:36:43 2015 +0800 Merge branch 'v3' into material_system commit 7460614dd8b7eff5d8c759be54dd205333b26033 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 2 08:23:17 2015 +0800 small changes commit fa0354e74983795adafad3bedc9c50f6e8e328c9 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Mar 26 18:20:46 2015 -0700 initial Material system	2015-05-05 13:07:32 -07:00
WenhaiLin	8f6277c540	Label:Fixed shadow effect cause OpenGL error on IOS.	2015-05-05 18:30:33 +08:00
minggo	902c033838	Merge pull request #11683 from WenhaiLin/v3-label-i10576 Label:Fixed the character positions could be wrong if `getLetter(letterIndex)` get called.	2015-05-05 18:19:33 +08:00
minggo	99911b6f3f	Merge pull request #11694 from CocosRobot/update_lua_bindings_1430804693 [AUTO]: updating luabinding & jsbinding automatically	2015-05-05 17:17:55 +08:00
samuele3hu	f1b5729183	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_7_remove_vs2012	2015-05-05 16:14:57 +08:00
samuele3hu	037c17fe5d	Remove vs2012 support in v3	2015-05-05 16:11:26 +08:00
CocosRobot	534868368e	[AUTO]: updating luabinding & jsbinding automatically	2015-05-05 05:48:55 +00:00
CocosRobot	6ef35d48ae	[AUTO]: updating luabinding automatically	2015-05-05 03:31:53 +00:00
minggo	701d5fa827	Merge pull request #11673 from vovkasm/dev/v3-cleanup Fix warnings in v3.	2015-05-05 11:26:10 +08:00
minggo	5a7cf31663	Merge pull request #11682 from CocosRobot/update_lua_bindings_1430789665 [AUTO]: updating luabinding automatically	2015-05-05 11:17:06 +08:00
zhangbin	23ed3dbe4c	Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3	2015-05-05 10:53:04 +08:00
zhangbin	b4f2d94109	Update js bindings & js tests.	2015-05-05 10:50:19 +08:00
minggo	e75936b778	Merge pull request #11669 from samuele3hu/v3.7 Update cocos2dx_3d.ini and cocos2dx.ini for generating Lua bindings code to support CC_CONSTRUCTOR_ACCESS equal to public	2015-05-05 09:37:56 +08:00
CocosRobot	4414536612	[AUTO]: updating luabinding automatically	2015-05-05 01:36:54 +00:00
minggo	564918c604	Merge pull request #11659 from WenhaiLin/v3.7 Label:Fixed crash.	2015-05-05 09:30:54 +08:00
WenhaiLin	26c9be7881	Add FileUtils::getSuitableFOpen[window-universal]	2015-05-04 16:06:04 +08:00
WenhaiLin	1839564fbb	Merge branch 'v3-dev-get-suitable-f-open' of https://github.com/perminovVS/cocos2d-x into v3.7	2015-05-04 10:16:47 +08:00
WenhaiLin	22c46b5c14	Label:Fixed the character positions could be wrong if `getLetter(letterIndex)` get called.	2015-05-04 10:07:37 +08:00
TankorSmash	88833213ca	Fix setSprite never updating progress on ProgressTimer Basically whenever you set a new sprite on a ProgressTimer, the new sprite is hidden. Calling setPercentage once with the same value doesn't work because the new percentage is the same as the old one. I've got a workaround setting the percentage to 0 and then back to the old value, but this change seems to solve that issue entirely.	2015-05-03 14:35:50 -04:00
WenhaiLin	004cb5464e	Fixed crash	2015-05-03 22:15:58 +08:00
Vladimir Timofeev	fd3e44b72b	Fix warning in the ClippingNode class. Do not define the setProgram(Node,GLProgram) helper function on 'non OpenGL ES' platforms.	2015-05-01 12:36:19 +03:00
Vladimir Timofeev	912956a3b3	Correct field initialization order in spine (Xcode warnings).	2015-05-01 12:20:11 +03:00
Vladimir Timofeev	0aecc15a25	Correct field initialization order in various places (Xcode warnings)	2015-05-01 12:19:30 +03:00
Vladimir Timofeev	2d8c687d6e	Fix the Frame class: * Field initialization order (warning in Xcode) * Make conditions with && and \|\| more readable for programmers (warning in Xcode)	2015-05-01 11:51:20 +03:00
Vladimir Timofeev	ad494a7131	Make a UserDefault destructor to be virtual. Because the UserDefault has virtual functions and allow programmers to inherit from, it must have a virtual destructor to allow a child object to destroy correctly.	2015-05-01 11:45:47 +03:00
samuele3hu	f4b57511b0	Update cocos2dx_3d.ini and cocos2dx.ini for generating Lua bindings code to support CC_CONSTRUCTOR_ACCESS equal to public	2015-04-30 17:18:12 +08:00
WenhaiLin	7472bafee3	Label:When you invoking `getLetter(letterIndex)` and `setString(text)` in sequence, and `letterIndex` greater than the length of `text`, it might crash your program.	2015-04-30 15:13:41 +08:00
CocosRobot	2b916b3b80	[AUTO]: updating luabinding automatically	2015-04-30 06:56:36 +00:00
minggo	4acd231f89	merge v3.6	2015-04-30 13:46:08 +08:00
minggo	79a6f2f510	Merge pull request #11652 from MSOpenTech/v3.6-winrt-fix V3.6 Windows Phone 8.1 fix for issues 11606 and 11607	2015-04-30 09:41:52 +08:00
Dale Stammen	904abeab87	added CC_WINDOWS_PHONE_8_1 to preprocessor defines	2015-04-29 09:48:14 -07:00
Dale Stammen	f64012d77b	special shaders for Windows Phone 8.1 with no gl_PointSprite	2015-04-29 09:47:44 -07:00
WenhaiLin	1950498b0a	Replace tab with space.	2015-04-29 18:41:10 +08:00
WenhaiLin	8f3566add9	Merge branch 'v3.6' of https://github.com/WenhaiLin/cocos2d-x into v3.6	2015-04-29 18:37:18 +08:00
Wenhai Lin	1d9ff11837	VideoPlayer:Fixed can't play video on Android 2.3.x	2015-04-29 18:32:59 +08:00
minggo	9586cdf2c8	Merge pull request #11650 from xiaofeng11/v3.6 Fix a logical bug that may cause null pointer been used	2015-04-29 16:21:17 +08:00
XiaoFeng	9d0741544c	Fix a logical bug that may cause null pointer been used	2015-04-29 15:58:44 +08:00
minggo	d768c8c5f4	Merge pull request #11645 from xiaofeng11/v3.6 Fix wrong shadow & outline color bug for text component	2015-04-29 14:16:26 +08:00
XiaoFeng	49b465f0f4	Fix wrong shadow & outline color bug for text component	2015-04-29 10:46:23 +08:00
minggo	d0cf310a0b	Merge pull request #11643 from super626/v3.6 missing texture color	2015-04-29 10:33:32 +08:00
yangxiao	59988fdcc0	missing texture color	2015-04-29 10:30:18 +08:00
minggo	37c9a9cb98	Merge pull request #11636 from super626/v3.6 fix bug some 3d sprite crash when texture missing on release mode	2015-04-29 09:35:37 +08:00
yangxiao	e424cb4777	fix bug some 3d sprite crash when texture missing on release mode	2015-04-28 23:55:23 +08:00
minggo	21987592d2	Merge pull request #11632 from WenhaiLin/v3.6 Fixed warns and crash on Win32.	2015-04-28 21:18:42 +08:00
CocosRobot	1f02af4a94	[AUTO]: updating luabinding automatically	2015-04-28 12:21:56 +00:00
minggo	48729b653f	Merge pull request #11630 from samuele3hu/v3.6_test1 Add Lua-bindings for SpritePolygon and related test case	2015-04-28 20:13:52 +08:00
WenhaiLin	ce7e36f76e	Fixed warns and crash on Win32.	2015-04-28 20:10:56 +08:00
samuele3hu	5819159889	Add Lua-bindings for SpritePolygon and related test case	2015-04-28 18:19:57 +08:00
Milos Jakovljevic	0343fd4061	Changing the name of the Action, adding more comments	2015-04-28 11:48:19 +02:00
minggo	85e58dce55	Merge pull request #11598 from HueyPark/v3.6 Fix android http client memory leak	2015-04-28 16:38:21 +08:00
minggo	164cf78844	Merge pull request #11620 from WenhaiLin/v3.6 Fixed compile error on VS 2012.	2015-04-28 13:36:16 +08:00
minggo	692ed1e4ad	Merge pull request #11625 from xiaofeng11/v3.6 Fix simulator crash when miss some armature resource	2015-04-28 13:34:32 +08:00
XiaoYang	8920491287	Merge pull request #314 from lvlonggame/v3 fix bug: set sprite name	2015-04-28 12:00:24 +08:00
XiaoFeng	27e3dce628	Fix simulator crash when miss some armature resource	2015-04-28 11:54:36 +08:00
samuele3hu	2a59180da3	Merge branch 'v3.6' of https://github.com/cocos2d/cocos2d-x into v3.6_test1	2015-04-28 11:30:01 +08:00
samuele3hu	c801d1868c	Update Sprite3DTest and VideoPlayerTest about Lua	2015-04-28 11:27:50 +08:00
andyque	854fcdf2bf	fix spritepolygon	2015-04-28 11:26:21 +08:00
andyque	a6a2dddfe9	fix spritepolygon	2015-04-28 10:51:26 +08:00
WenhaiLin	41e2d84116	Fixed compile error on VS 2012.	2015-04-28 10:35:21 +08:00
minggo	99482d4e48	Merge pull request #11614 from xiaofeng11/v3.6 Fix simulator crash when add animation under a user defined lua extension	2015-04-28 09:45:44 +08:00
minggo	a32a1029f5	Merge pull request #11617 from lvlonggame/v3 fix bug: set sprite name	2015-04-28 09:35:04 +08:00
minggo	ce9f40fb9a	Merge pull request #11619 from samuele3hu/v3.6_test1 Fix the bugs about cubeMap & Skybox lua test case and update the Android.mk about SpritePolygon	2015-04-28 09:32:30 +08:00
samuele3hu	dc765aee25	Merge branch 'v3.6' of https://github.com/cocos2d/cocos2d-x into v3.6_test1	2015-04-28 09:19:03 +08:00
samuele3hu	51bcac9e84	Fix the bugs about cubeMap & Skybox lua test case and update the Android.mk about SpritePolygonTest	2015-04-28 09:17:00 +08:00
lvlong	cecea92fde	fix bug: set sprite name	2015-04-27 19:12:44 +08:00
CocosRobot	a7edda72f5	[AUTO]: updating luabinding automatically	2015-04-27 09:47:08 +00:00
XiaoFeng	28264c0742	Fix simulator crash when add animation under a user defined lua extension	2015-04-27 17:42:20 +08:00
minggo	5197044e8c	Merge pull request #10679 from loadrunner/physics_sensor added sensor property to shapes	2015-04-27 17:40:08 +08:00
WuHao	597d2289c0	Merge branch 'v3.6' of https://github.com/cocos2d/cocos2d-x into v3.6	2015-04-27 17:31:50 +08:00
WuHao	a046f74c4d	fix anchor point bug	2015-04-27 17:30:38 +08:00
WuHao	dcf8f674bc	Merge branch 'v3.6' of https://github.com/Wu-Hao/cocos2d-x into v3.6 Conflicts: cocos/2d/SpritePolygon.cpp cocos/2d/SpritePolygonCache.cpp	2015-04-27 17:18:26 +08:00
minggo	ee29888d8e	[ci skip] update version	2015-04-27 16:46:03 +08:00
WuHao	815c6a9b74	merge the start and end points	2015-04-27 16:33:54 +08:00
minggo	2d2f0aac59	fix indent	2015-04-27 16:25:24 +08:00
minggo	8c4cecca0d	fix indent and translate Chinese comment to English	2015-04-27 16:22:54 +08:00
CocosRobot	09a6cc19b7	[AUTO]: updating luabinding automatically	2015-04-27 07:48:42 +00:00
minggo	c0b2433bb5	Merge branch 'v3' of https://github.com/qiutaoleo/cocos2d-x into check-filename-case-on-windows	2015-04-27 15:45:23 +08:00
samuele3hu	3de665b9cd	Update SpritePolygon	2015-04-27 15:19:26 +08:00
minggo	c9bacd58e8	Merge pull request #11591 from Wu-Hao/v3.6 V3.6	2015-04-27 14:22:21 +08:00
WuHao	c7e990dcae	Merge branch 'v3.6' of https://github.com/Wu-Hao/cocos2d-x into v3.6 Conflicts: cocos/2d/SpritePolygon.cpp	2015-04-27 13:39:41 +08:00
WuHao	9f2ea5fbb9	fixed some SpritePolygon create, added more tests	2015-04-27 13:34:47 +08:00
samuele3hu	d7dbb910d0	Update SpritePolygonCache	2015-04-27 11:57:36 +08:00
samuele3hu	cf53d13f6f	Update SpritePolygon.cpp	2015-04-27 11:07:08 +08:00
samuele3hu	6f17dcecf2	Update config.json for 3rd-party-libs and SpritePolygonCache	2015-04-27 11:01:47 +08:00
minggo	0a8f533e80	Merge pull request #11590 from super626/v3 Animate3D Quality control	2015-04-27 10:58:10 +08:00
WuHao	c2cefadb6f	Merge branch 'v3.6' of https://github.com/Wu-Hao/cocos2d-x into v3.6	2015-04-27 10:44:56 +08:00
WuHao	cd0ebc1801	fix the info struct	2015-04-27 10:44:23 +08:00
CocosRobot	09cddb4d4b	[AUTO]: updating luabinding automatically	2015-04-27 02:25:05 +00:00
minggo	c500d6b0a7	Merge pull request #11588 from WenhaiLin/v3-jsb [js-tests]Fixed crash.	2015-04-27 10:20:07 +08:00
minggo	033cfaa30b	Merge pull request #11592 from fusijie/add_EaseRateAction_create_method Add EaseRateAction::create() method.	2015-04-27 10:16:38 +08:00
samuele3hu	bd5ca083e9	Fix the compile error of SpritePolygonTest on the win32 and wp8.1	2015-04-26 23:08:14 +08:00
HueyPark	25a9c90b54	Fix android http client memory leak	2015-04-26 20:52:09 +09:00
Danut Chereches	5f692962b9	fixed 'seperate' typo issue #8408	2015-04-25 00:02:39 +03:00
Jacky	633c1aed75	Add EaseRateAction::create() method.	2015-04-24 18:31:44 +08:00
WuHao	9496a48800	Merge branch 'v3.6' of https://github.com/cocos2d/cocos2d-x into v3	2015-04-24 18:29:23 +08:00
WuHao	c1d10ffa1c	fixed poly2tri creation method, added testCase	2015-04-24 18:28:28 +08:00
WuHao	5620da1adf	fixed anchor point issue, removed rect rotated property	2015-04-24 18:17:12 +08:00
XiaoYang	d7deabc3ad	Merge pull request #311 from lvlonggame/v3 animate 3d quality	2015-04-24 17:54:28 +08:00
WuHao	0e318dd8dc	fixed UV issue, also taking account of contentScaleFactor, made test case better	2015-04-24 17:39:43 +08:00
WenhaiLin	5e5cd5faa1	[js-tests]Fixed crash on Win32/Universal.	2015-04-24 17:12:46 +08:00
minggo	0198c8707b	Merge pull request #11572 from super626/v3 Fix memory leak	2015-04-24 16:42:33 +08:00
songchengjiang	2aee4abd66	fix https://github.com/cocos2d/cocos2d-x/issues/11203 fix the error of CCBundle3D	2015-04-24 15:31:50 +08:00
lvlong	a379196340	modify comments	2015-04-24 14:06:20 +08:00
Chris Hannon	da74d1be93	[v3-update-sio] updates usage of log function to CCLOG macros, ensures correct data type is passed to log function Signed-off-by: Chris Hannon <himynameschris@gmail.com>	2015-04-24 00:17:43 -04:00
Chris Hannon	e1923f3dbf	[v3-update-sio] updates SocketIO network extension to support v1.x socket.io servers as well as maintain backwards compat. for 0.9.x servers Signed-off-by: Chris Hannon <himynameschris@gmail.com>	2015-04-24 00:17:43 -04:00
lvlong	8e51a561b1	modify some about animate3D quality!	2015-04-24 11:49:28 +08:00
XiaoFeng	07725ce84d	fix	2015-04-24 11:40:15 +08:00
minggo	2245272922	Merge pull request #11560 from natural-law/v3-jsb Add js related files.	2015-04-24 11:11:16 +08:00
zhangbin	252e5e1183	Make the lua projects temporarily works well.	2015-04-24 10:17:38 +08:00
pandamicro	6b4f8cc0ab	Fix local storage get item issue when item inexist	2015-04-23 19:06:06 +08:00
WuHao	07349ff588	initial cpp test	2015-04-23 18:03:03 +08:00
XiaoFeng	faddbd8e71	Add function to texture cache for studio to check if texture have been already loaded	2015-04-23 16:50:28 +08:00
WuHao	ada7ced0a8	change getVecCount to ssize_t	2015-04-23 16:40:11 +08:00
zhangbin	61cf0ad28b	Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3-jsb	2015-04-23 15:46:19 +08:00
lvlong	59b7ab8154	fix bug: animation curve memory leak ！	2015-04-23 14:35:37 +08:00
WuHao	1ee87140b1	renamed PolySprite to SpritePolygon	2015-04-23 14:34:56 +08:00
zhangbin	dcca32bd82	Update the CMakeLists & the remote url of submodule js-bindings.	2015-04-23 14:23:19 +08:00
Dale Stammen	ac8755868d	need to call Cleanup() if app is terminating	2015-04-22 19:13:12 -07:00
Dale Stammen	b78f830ed8	cleaned up Draw()	2015-04-22 19:11:42 -07:00
Dale Stammen	4119b0f10d	cleaned up Draw()	2015-04-22 19:11:29 -07:00
Dale Stammen	22daece170	made Cleanup() public	2015-04-22 19:08:11 -07:00
hobogenized	30b2821729	Reverting spine files	2015-04-22 22:07:52 -04:00
Dale Stammen	c3335551b8	added EGL_PLATFORM_ANGLE_ENABLE_AUTOMATIC_TRIM_ANGLE	2015-04-22 19:07:48 -07:00
samuele3hu	7c77bc9587	Add the PolySprite support and adjust the project setting on the different platform	2015-04-23 00:51:47 +08:00
minggo	1f5e5b5058	Merge pull request #11536 from xiaofeng11/v3 Update Node3DReader compatibility	2015-04-22 10:25:49 +08:00
minggo	44fefde83d	Merge pull request #11537 from CocosRobot/update_lua_bindings_1429611994 [AUTO]: updating luabinding automatically	2015-04-22 10:25:31 +08:00
Dale Stammen	0f3ff6f762	Merge branch 'v3' into v3-winrt-typo-fix	2015-04-21 18:18:00 -07:00
Dale Stammen	84a47000b5	rename -win to -winrt	2015-04-21 18:17:18 -07:00
Dale Stammen	aec086a473	convert BGR and RGB to GUID_WICPixelFormat24bppRGB	2015-04-21 18:16:54 -07:00
Dale Stammen	516966a96f	check for PixelFormat::DEFAULT	2015-04-21 18:11:56 -07:00
Dale Stammen	a2ed8e7234	disable INCREMENTAL for ARM builds. Fixes lnk2013 error	2015-04-21 08:38:19 -07:00
Dale Stammen	0c47df5df2	fixed typo. Changed KEY_BACKSPACE to KEY_ESCAPE in comments	2015-04-21 06:21:32 -07:00
lvlong	4f96037e15	1. Merge branch 'v3' of github.com:super626/cocos2d-x into v3 2. fix bug: memory leak!	2015-04-21 19:38:38 +08:00
CocosRobot	30ccbe3526	[AUTO]: updating luabinding automatically	2015-04-21 10:29:17 +00:00
pipu	fcd48ce2c3	Reset method purge() definition.	2015-04-21 18:16:38 +08:00
pipu	04cde1c52c	Modify that serialize base attribute for Node3DReader.	2015-04-21 18:05:46 +08:00
minggo	80bc3bf021	Merge pull request #11523 from MSOpenTech/v3-winrt-backbutton V3 Windows Phone 8.1 back button support	2015-04-21 17:10:01 +08:00
lvlong	cae82fcdeb	fix bug: memory leak	2015-04-21 15:02:09 +08:00
hobogenized	e2aaa88f1e	Attempting to fix build error; removed extraneous comment	2015-04-21 01:56:02 -04:00
hobogenized	33f642c298	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into my_fix_branch	2015-04-21 01:51:52 -04:00
hobogenized	9b34e60896	Renamed another shadowed variable since ii was already taken	2015-04-21 00:12:51 -04:00
zhangbin	8abd2269bd	Update js bindings.	2015-04-21 11:46:00 +08:00
hobogenized	b7b6307703	Using ii instead of currIndex for brevity	2015-04-20 23:13:53 -04:00
hobogenized	22df7df76a	Renamed shadowed variables to reduce confusion when reading source code	2015-04-20 22:57:55 -04:00
minggo	f6276dd4b3	Merge pull request #10983 from perminovVS/v3-texture-init-check-error Clean possible GL error init Texture2D	2015-04-21 09:50:54 +08:00
Dale Stammen	83b68ef693	added comment on how back button event is handled	2015-04-20 18:36:58 -07:00
minggo	7a1a021974	Merge pull request #11517 from andyque/fix-widget-gray-shader-issue Fix widget gray shader issue	2015-04-21 09:34:18 +08:00
minggo	fa6735e68f	Merge pull request #11518 from perminovVS/v3-dev-optimize-vec3-v2.1 Optimize Vec3 use constructor default.	2015-04-21 09:33:05 +08:00
Dale Stammen	50f381f070	added CCLOG message to describe how to handle Windows Phone back button event	2015-04-20 18:30:52 -07:00
minggo	3e9fd67ab2	Merge pull request #11520 from super626/v3 Improve Animate3D	2015-04-21 09:30:43 +08:00
Dale Stammen	4169ebf5c8	Windows Phone 8.1 back button and terminate app support	2015-04-20 10:43:34 -07:00
Dale Stammen	e00b0dfbd9	Merge branch 'v3' into v3-winrt-backbutton	2015-04-20 08:17:16 -07:00
yangxiao	7c37123dbd	remove fade in animation if no running animation	2015-04-20 19:45:31 +08:00
yangxiao	e8b21589fc	avoid some remap	2015-04-20 19:33:16 +08:00
htl	2476f2b52d	fixed win32 application return code	2015-04-20 18:27:21 +08:00
yangxiao	1a50610c00	Merge branch 'newcode' into v3	2015-04-20 18:21:07 +08:00
zhangbin	6ee624796a	Merge branch 'v3-jsb' of github.com:natural-law/cocos2d-x into v3-jsb	2015-04-20 18:09:57 +08:00
zhangbin	a1b5fa5a8e	Solve the error in js template.	2015-04-20 18:09:39 +08:00
Vladimir Perminov	6ef1e7e3d0	Optimize Vec3 use constructor default. Make Vec3 vec3(Vec3::ZERO); to Vec3 vec3;	2015-04-20 12:56:43 +03:00
andyque	484153aff7	remove ui shaders in windows platform	2015-04-20 17:54:49 +08:00
yangxiao	bc62338b36	map use node instead of sprite	2015-04-20 17:49:01 +08:00
minggo	15fe283c2e	Merge pull request #11515 from xiaofeng11/v3 update compatibility for upgraded node3d come with 2.2.5 version	2015-04-20 17:05:32 +08:00
andyque	6fb29ad1b0	remove uishader settings	2015-04-20 17:04:49 +08:00
andyque	e02dad3489	fix ui grayscale shader memory release issue	2015-04-20 17:00:40 +08:00
minggo	cdf00408a7	Merge pull request #11513 from andyque/fix-wp8.1-include-path fix freetype include path on win-8.1	2015-04-20 16:01:55 +08:00
pipu	388e4b3a93	Modify that parse position for Node3DReader.	2015-04-20 15:56:36 +08:00
andyque	1e514f0a2b	fix freetype include path on win-8.1	2015-04-20 15:54:31 +08:00
minggo	76613fc85f	Merge pull request #11506 from CocosRobot/update_lua_bindings_1429508341 [AUTO]: updating luabinding automatically	2015-04-20 15:51:57 +08:00
minggo	8f88afa123	Merge pull request #11510 from xiaofeng11/v3 Bug fix	2015-04-20 15:50:44 +08:00
CocosRobot	87e29db218	[AUTO]: updating luabinding automatically	2015-04-20 05:40:58 +00:00
minggo	fc16bc6154	Merge pull request #11501 from samuele3hu/v3_studio2 Add Lua bindings for WebView and related test case	2015-04-20 13:36:08 +08:00
samuele3hu	9477e89723	Fix the compile error on the win32	2015-04-20 11:46:48 +08:00
pipu	4b320a1677	Modify that parse text shadow and outline.	2015-04-20 11:39:43 +08:00
minggo	bb4e749a93	Merge pull request #11489 from dumganhar/clean-order [Director FIX]: Clean all schedulers and remove all eventlisteners after exiting scene	2015-04-20 10:47:37 +08:00
minggo	c7fe7704d4	Merge pull request #11499 from perminovVS/v3-dev-user-default-only-delegate UserDefault::setDelegate	2015-04-20 10:36:56 +08:00
samuele3hu	4f22a1470b	Update the project setting	2015-04-20 10:11:39 +08:00
WenhaiLin	dc768dbd8c	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-jsb-merge	2015-04-20 10:06:48 +08:00
samuele3hu	067ad6ad60	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_studio2 Conflicts: cocos/scripting/lua-bindings/proj.android/Android.mk cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj	2015-04-20 10:05:02 +08:00

... 19 20 21 22 23 ...

10633 Commits