3804 Commits

Author	SHA1	Message	Date
Huabing.Xu	d06d575e6e	Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_comments	2015-03-24 23:01:18 +08:00
Huabing.Xu	133955dba1	[ci skip]update comments CCGrid.h CCGrabber.h CCGLBufferNode.h	2015-03-24 21:34:20 +08:00
WenhaiLin	9dd778edb0	[ci skip]Update comments	2015-03-24 20:23:51 +08:00
zhukaixy	3b8a796404	config project config file for cocos2d-win8.1-universal	2015-03-24 16:01:06 +08:00
WenhaiLin	2caff4e64d	[ci skip]Update comments	2015-03-24 14:12:58 +08:00
minggo	6cc8fb4348	Merge pull request #11092 from fusijie/cocosapi ... [ci skip]update headers' module name.	2015-03-24 11:27:54 +08:00
Jacky	af12891cfc	[ci skip]update headers' module name.	2015-03-24 10:34:41 +08:00
minggo	2dfc0e11db	Merge pull request #11081 from VisualSJ/v3-docs ... [ci skip] Add javascript notes...	2015-03-23 22:18:34 +08:00
minggo	67e0cd20d2	Merge pull request #11080 from SuYaoHui/cocosapi ... [ci skip]Action,Sprite,TmxTiledMap,UTF8,GLView....	2015-03-23 22:18:00 +08:00
VisualSJ	b5fa6d2e95	[ci skip] Add javascript notes... ... cocos/2d/CCMotionStreak.h cocos/2d/CCParticleBatchNode.h cocos/2d/CCParticleExamples.h cocos/2d/CCParticleSystem.h cocos/2d/CCParticleSystemQuad.h cocos/2d/CCTransition.h cocos/2d/CCTransitionPageTurn.h cocos/base/CCConfiguration.h cocos/base/CCTouch.h	2015-03-23 20:27:13 +08:00
SuYaohui	d8a033c2ef	Action,Sprite,TmxTiledMap,UTF8,GLView	2015-03-23 18:37:28 +08:00
minggo	c587d19e8b	Merge pull request #11059 from SuYaoHui/cocosapi ... add comments.	2015-03-23 16:24:22 +08:00
minggo	4143eae713	Merge pull request #11061 from fusijie/cocosapi ... add comments.	2015-03-23 16:23:51 +08:00
SuYaohui	6310e75071	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into cocosapi	2015-03-23 11:35:30 +08:00
minggo	dda85fcb02	Merge pull request #11027 from tangziwen/doc ... add 3D doc, fixed typo	2015-03-23 10:45:41 +08:00
Jacky	cc09b84153	add comments.	2015-03-21 18:02:56 +08:00
SuYaohui	367fb6ed4c	add comments.	2015-03-21 17:06:26 +08:00
dingpinglv	ef56088886	Issue: Added js Annotates to CCNode.h	2015-03-21 11:07:39 +08:00
dingpinglv	b30b6db09b	Issue: added js annotates to CCLayer.h	2015-03-21 10:23:42 +08:00
tangziwen	814490ab44	add 3D doc, fixed typo	2015-03-20 17:20:22 +08:00
minggo	d28e5d61b6	Merge pull request #10998 from dingpinglv/Iss_Annotate ... [ci skip] Added js annotates to -x	2015-03-19 22:09:43 +08:00
minggo	8e019de83b	Merge pull request #11003 from fusijie/cocosapi ... [ci skip]add comments to CCLayer & CCNode & CCConfiguration.	2015-03-19 22:09:20 +08:00
minggo	0648ac7ca0	Merge pull request #11004 from SuYaoHui/cocosapi ... [ci skip]NodeGrid,Config,NS,ApplicationProtocol,ProgressTimer	2015-03-19 21:47:32 +08:00
dingpinglv	de73f25e42	Corrected some wrong indent in CCScene.h and CCSpriteFrameCache.h	2015-03-19 21:44:44 +08:00
SuYaohui	5e236fd753	progressTimer,ApplicationProtocol	2015-03-19 21:42:31 +08:00
Jacky	85c04ff605	[ci skip]add comments to CCLayer & CCNode & CCConfiguration.	2015-03-19 21:41:40 +08:00
SuYaohui	c295952c71	NodeGrid,Config,NS,ApplicationProtocol	2015-03-19 21:03:28 +08:00
dingpinglv	c03703ddab	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Iss_Annotate	2015-03-19 21:01:17 +08:00
dingpinglv	069791a0a2	Corrected a wrong indent in CCSpriteFrameCache.h	2015-03-19 21:00:33 +08:00
dingpinglv	67169443df	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Iss_Annotate ... Conflicts: cocos/audio/include/SimpleAudioEngine.h	2015-03-19 20:28:29 +08:00
Vincent Yang	93ccdae7df	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3	2015-03-19 20:22:59 +08:00
Vincent Yang	ca4c71bf0e	Add MainPageWhiteBook.h, and move doxygen_modules.h to docs.	2015-03-19 20:21:40 +08:00
minggo	1539b5de78	Merge pull request #10991 from VisualSJ/v3-docs ... Add javascript notes...	2015-03-19 20:09:41 +08:00
minggo	f3e518b103	Merge pull request #10985 from dabingnn/v3_fixRenderTextureCrash ... fix crash problem when switch to a new scene after call RenderTexture::s...	2015-03-19 20:00:31 +08:00
dingpinglv	7a50af4407	Issue : added js annotate to CCLight.h	2015-03-19 19:54:46 +08:00
dingpinglv	194c8d8f17	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Iss_Annotate	2015-03-19 19:46:01 +08:00
VisualSJ	f87b06a1c8	Add javascript notes... ... cocos/2d/CCAction.h cocos/2d/CCActionCamera.h cocos/2d/CCActionCatmullRom.h cocos/2d/CCActionInstant.h cocos/2d/CCActionInterval.h cocos/2d/CCActionManager.h cocos/audio/include/AudioEngine.h cocos/audio/include/SimpleAudioEngine.h	2015-03-19 18:41:11 +08:00
Huabing.Xu	8b04a15ee8	fix crash problem when switch to a new scene after call RenderTexture::saveToFile()	2015-03-19 16:39:45 +08:00
zhangbin	f196d213ee	Solve the error format of comments in header files.	2015-03-19 15:59:58 +08:00
minggo	a8471dd507	Merge pull request #10978 from natural-law/v3 ... [ci skip] Update comments of some header files.	2015-03-19 13:42:48 +08:00
zhangbin	d755a7b46a	Update comments of some header files.	2015-03-19 13:41:21 +08:00
minggo	1d37016912	Merge pull request #10962 from dingpinglv/Iss_Annotate ... [ci skip] added js annotate to classes	2015-03-19 11:56:07 +08:00
minggo	aec86d7e61	Merge pull request #10967 from VisualSJ/v3-docs ... Add javascript notes...	2015-03-19 11:52:44 +08:00
minggo	b469f460c7	Merge pull request #10968 from WenhaiLin/v3-update-document ... [ci skip]Update document	2015-03-19 10:46:06 +08:00
WenhaiLin	e528531b4b	[ci skip]Update document	2015-03-19 10:38:12 +08:00
VisualSJ	62b3f537ce	Add javascript notes...Fixed error	2015-03-19 10:33:11 +08:00
SuYaohui	2edb7f7d50	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into cocosapi	2015-03-19 10:05:24 +08:00
SuYaohui	bc2b897dc6	ProgressTimer	2015-03-19 10:00:30 +08:00
dingpinglv	9be573e92f	Added js annotate to CCSpriteFrameCache.h	2015-03-18 22:24:03 +08:00
dingpinglv	4bb78a2eec	Added js annotate to CCScene.h	2015-03-18 22:08:50 +08:00
dingpinglv	ee44f024f1	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Iss_Annotate ... Conflicts: cocos/2d/CCActionGrid.h cocos/2d/CCAnimation.h cocos/2d/CCAnimationCache.h cocos/base/CCRef.h	2015-03-18 21:58:07 +08:00
minggo	ddb6230c13	Merge pull request #10953 from fusijie/cocosapi ... [ci skip]update CCActionManager & CCActionInstant & CCActionInterval & CCScene & ...	2015-03-18 21:48:28 +08:00
dingpinglv	a99c2c7893	Issue : added js annotate to CCActionGrid.h, CCAnimation.h, CCAnimationCache.h, CCAtlasNode.h, CCRef.h	2015-03-18 21:45:58 +08:00
VisualSJ	785214ae12	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-docs ... Conflicts: cocos/base/CCAutoreleasePool.h cocos/base/CCData.h	2015-03-18 21:38:56 +08:00
zhangbin	f31a833df4	Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3	2015-03-18 21:10:17 +08:00
zhangbin	a5e148c829	Update comments of some header files.	2015-03-18 20:56:17 +08:00
VisualSJ	cb50c7d89a	Add javascript notes... ... cocos/2d/CCActionPageTurn3D.h cocos/base/CCAutoreleasePool.h cocos/base/CCData.h	2015-03-18 20:51:18 +08:00
Jacky	2d50327323	update CCActionManager & CCActionInstant & CCActionInterval & CCScene & CCSpriteFrame & CCSpriteFrameCache	2015-03-18 20:40:29 +08:00
SuYaohui	31944da08c	[ci skip]Action,ActionCamera,ActionCatmullRom,Animation,AnimationCache,AtlasNode	2015-03-18 20:26:16 +08:00
SuYaohui	ee8776f041	[ci skip]Action,ActionCamera,ActionCatmullRom,Animation,AnimationCache,AtlasNode	2015-03-18 20:07:00 +08:00
minggo	359e25327d	Merge pull request #10946 from natural-law/v3 ... [ci skip] Update comments of some header files.	2015-03-18 18:25:31 +08:00
zhangbin	b55916c283	Update comments of some header files.	2015-03-18 18:15:34 +08:00
minggo	5271c75c11	Merge pull request #10936 from super626/v3 ... Camera mask for label	2015-03-18 14:00:44 +08:00
yangxiao	44af57459e	add comment	2015-03-18 11:58:36 +08:00
yangxiao	21d581a72c	set camera mask when member created	2015-03-18 11:41:43 +08:00
minggo	1e271a9d96	Merge pull request #10899 from super626/v3 ... Bug fix	2015-03-17 19:29:21 +08:00
Dale Stammen	5606fad642	Merge branch 'v3' into v3-wp8-fix	2015-03-16 20:47:55 -07:00
Vincent Yang	6bbb89a098	Add doxygen config for white book and cocos/doxygen_modules.h for doc mudules.	2015-03-17 11:26:33 +08:00
Dale Stammen	65c83378d0	Merge branch 'v3' into v3-wp8-fix	2015-03-16 20:22:28 -07:00
Dale Stammen	08ceae3de2	removed no-gl_PointSize shaders for Windows Phone 8.1	2015-03-16 08:08:02 -07:00
yangxiao	5b26ba3c68	override setCameraMask	2015-03-16 17:11:17 +08:00
yangxiao	f56d8c4784	fix camra mask for label does not work	2015-03-16 15:31:29 +08:00
Martin Konopka	2c80b6ae3a	Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]	2015-03-15 00:10:08 +01:00
Martin Konopka	cd12d08a52	Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]	2015-03-14 19:33:15 +01:00
Huabing.Xu	03c3a4d5ed	Merge pull request #10836 from pipu/reconstruct_object_extension_data ... To reconstruct object extension data.	2015-03-13 15:04:41 +08:00
pipu	c72c8e865d	To reconstruct object extension data.	2015-03-12 15:47:15 +08:00
yangxiao	50c3a9cb4c	fix removeAllChildren cause camera to be destroyed bug	2015-03-12 10:39:21 +08:00
mogemimi	8cf0ec1aca	Minor refactor TMXMapInfo ... * Replace with range-based for loop * Replace some size() with !empty() * Refactor scope of local variable	2015-03-12 01:21:57 +09:00
mogemimi	279604bac5	Add missing white spaces and some minor cleanups ... * Add missing white space * Fix if-else statement without curly braces * Fix indentation * Clean up code	2015-03-12 01:19:37 +09:00
mogemimi	abeb269534	Remove useless (char*) cast	2015-03-12 01:14:05 +09:00
Jacky	605ce58293	disable MoveTo::reverse()	2015-03-11 09:55:32 +08:00
minggo	5ac2fb398c	Merge pull request #10774 from minggo/sync-from-v4 ... Label:Fixed transform not update correctly	2015-03-10 09:54:20 +08:00
Dale Stammen	24d706cb7a	added /bigobj to C++ compiler command line options	2015-03-09 09:39:36 -07:00
Dale Stammen	35222a8193	Merge branch 'v3' into v3-wp8-fix	2015-03-09 09:20:25 -07:00
Dale Stammen	a828f73ccb	updated expiration date of project certificates	2015-03-09 08:31:06 -07:00
WenhaiLin	cd95905a04	Label:Fixed transform not update correctly if this camera mask of Label isn't visible by the current visiting camera	2015-03-09 17:26:43 +08:00
Dale Stammen	6cd881d8f8	added missing Particle3D files	2015-03-08 21:37:29 -07:00
Dale Stammen	362edec6d6	added missing Particle3D files	2015-03-08 21:31:43 -07:00
yangxiao	8137b01f23	merge cocos	2015-03-06 18:31:57 +08:00
XiaoYang	27ae60e626	Merge pull request #249 from songchengjiang/particle_merge ... support win8.1	2015-03-06 17:57:34 +08:00
songchengjiang	4ca90341b9	support win8.1	2015-03-06 15:35:02 +08:00
yangxiao	457ac3fdd7	reset unproject with viewport cocostudio using it	2015-03-06 11:29:40 +08:00
songchengjiang	444dbfdf9e	replace .mesh with .c3b ... modify ParticleUniverse file structure	2015-03-05 14:54:32 +08:00
yangxiao	3db3d9ae11	merge cocos	2015-03-03 17:23:33 +08:00
Dale Stammen	44b951a51a	Merge branch 'v3' into v3-wp8-fix	2015-03-02 16:42:05 -08:00
songchengjiang	5c460ebb2d	add/update particle files	2015-03-02 13:07:32 +08:00
minggo	0755400a79	Merge pull request #10279 from seobyeongky/motionstreak_bug_fix ... MotionStreak MoveTo/MoveBy action OK	2015-02-28 11:17:28 +08:00
Dale Stammen	e4db9f396e	disable LTCG. set warning level to W3	2015-02-27 11:16:40 -08:00
Dale Stammen	f68a966485	disabled Check SDL to allow CC_DEPRECATED to work as warning and not error	2015-02-27 11:07:51 -08:00
Dale Stammen	e04fd6eb1d	updated cocos2d dll name from 3.4 to 3.5	2015-02-27 10:54:27 -08:00
Dale Stammen	d486cc78fb	updated cocos2d dll name from 3.4 to 3.5	2015-02-27 10:52:32 -08:00
Dale Stammen	8bc5b37b40	removed missing include files from project	2015-02-27 10:48:53 -08:00
Dale Stammen	b5e936c657	disabled LTCG to speed up release builds	2015-02-27 10:43:13 -08:00
Dale Stammen	2eb919bb7a	disabled Check SDL to allow CC_DEPRECATED to work as warning and not error	2015-02-27 10:36:48 -08:00
Dale Stammen	e9ef92291f	renamed cocos2d dll from 3.4 to 3.5	2015-02-27 10:26:58 -08:00
Dale Stammen	49b16718a2	removed missing .h files from solution	2015-02-27 10:24:02 -08:00
yangxiao	437a59fb9a	modify project & unproject api	2015-02-27 10:01:57 +08:00
yangxiao	6f395edf0e	modify according to minggo	2015-02-26 17:37:45 +08:00
yangxiao	f13237c013	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3	2015-02-26 17:27:42 +08:00
yangxiao	a1642757f9	merge setcameramask	2015-02-26 15:33:18 +08:00
yangxiao	9a64eb18dd	add project function	2015-02-26 15:20:20 +08:00
Ray	1a2aa8633f	fix w8 project	2015-02-26 10:27:12 +08:00
Ray	83a7b8012c	3DParticle Reader and tests	2015-02-26 09:19:14 +08:00
Ray	c66a4f28bc	Add CocosStudio UserCameraReader ... fix Sprite3DReader Test	2015-02-25 14:19:08 +08:00
Ray	fbe9e5b767	complate project file	2015-02-23 00:52:50 +08:00
Ray	8eb201797d	工程文件修改	2015-02-19 17:52:50 +08:00
Dale Stammen	76233d4c6e	added missing Particle3D files and tests	2015-02-16 10:41:03 -08:00
Dale Stammen	795f65c85f	added missing Particle3D files and tests	2015-02-16 10:01:09 -08:00
minggo	c8eaa4aeba	Merge pull request #10447 from super626/particle_merge ... add 3d particle (Particle Universe)	2015-02-15 19:48:18 +08:00
Vladimir Perminov	9f5efe5153	Fix visual studio project out of date ... Remove 3dExport.h from project. Change location CCPlatformConfig.h and CCPlatformMacros.h from ..\base\ to ..\platform\	2015-02-13 11:18:14 +03:00
yangxiao	9b117bf87c	resolve conflict	2015-02-13 15:46:19 +08:00
Justin Fraize	3667cc6e1f	Cleaned up CCAction.cpp ... *Fixed tab/space issue. *Removed unneeded if/else block. *Added explicit braces around if block.	2015-02-12 21:00:12 -08:00
minggo	87e444873f	Merge pull request #10268 from kompjoefriek/Fixing-warnings ... Fixed some compiler warnings	2015-02-13 10:04:19 +08:00
kompjoefriek	a2ef1abef3	Fixed unwanted changes	2015-02-12 23:07:24 +01:00
zhukaixy	acc0476f01	Solve compile errors on win32 platform	2015-02-12 19:36:03 +08:00
minggo	afd4e94c4c	Merge pull request #10160 from lite3/wildpointer ... fix wild pointer	2015-02-12 18:01:10 +08:00
minggo	7fd6b5bfe7	Merge pull request #10172 from sergeant-wizard/make_tmx_object_group_name_getter_const ... make CCTMXObjectGroup::getGroupName const	2015-02-12 18:00:49 +08:00
minggo	8716164a5d	Merge pull request #10206 from sergeant-wizard/specify_default_capacity_for_sprite_batch_node ... Specify default capacity for sprite batch node	2015-02-12 17:58:59 +08:00
yangxiao	58bfae2e57	adjust and remove unused code	2015-02-12 16:58:34 +08:00
lvlong	ee03bb8eea	setCameraMask for cocostudio-ui	2015-02-12 09:24:04 +08:00
yangxiao	79a0c0152a	add 3d particle (Particle Universe)	2015-02-11 18:14:22 +08:00
minggo	1e11f3b3da	Merge pull request #10310 from perminovVS/v3 ... Fix visual studio project out of date	2015-02-10 14:18:13 +08:00
Chad	befbc0a14e	FIX for Build error when CC_USE_CULLING=0 #10373 ... Fix for build error when using CC_USE_CULLING	2015-02-09 18:15:22 -08:00
XiaoYang	c9fe5251a9	Merge pull request #229 from lvlonggame/v3 ... add Camera::project	2015-02-04 09:38:31 +08:00
lvlong	a0c7723edb	add GP_ASSERT	2015-02-03 14:21:12 +08:00
lvlong	6d92b7adc9	modify Camera::project	2015-02-03 11:59:43 +08:00
lvlonggame	4c65332550	add project function to camera	2015-02-01 21:14:37 +08:00
Vladimir Perminov	bb2d2c9a07	Fix visual studio project out of date ... Remove 3dExport.h from project. Change location CCPlatformConfig.h and CCPlatformMacros.h from ..\base\ to ..\platform\	2015-01-30 17:37:19 +03:00
zhukaixy	f3536056d8	Simpilify skybox	2015-01-29 19:01:10 +08:00
byeonggee.seo	fa683ec98b	MotionStreak MoveTo/MoveBy action OK	2015-01-29 19:30:00 +09:00
huangshiwu	cd00de572d	add glBindBuffer for drawnode and clippingnode to avoid crash	2015-01-29 18:06:20 +08:00
Dale Stammen	652baed1ee	increase build heap memory option to /Zm384	2015-01-28 20:37:39 -08:00
Dale Stammen	be8075b29c	increase build heap memory option to /Zm384	2015-01-28 20:32:32 -08:00
zhukaixy	ee99700ec1	add test case TextureCube	2015-01-29 09:28:14 +08:00
minggo	b233d6928e	Merge pull request #10238 from Dhilan007/v3-scale9sprite-fix ... Fixed Scale9Sprite can't run move/scale/rotation action in physics scene	2015-01-28 15:16:23 +08:00
Nite Luo	be6ca1b6d2	add force depth write	2015-01-27 17:05:51 -08:00
Nite Luo	8f539a0107	Make PositionZ independent from global Z	2015-01-27 15:41:58 -08:00
Wenhai Lin	f2335fb3bc	Fixed Scale9Sprite can't run move/scale/rotation action in physics scene	2015-01-27 16:13:45 +08:00
minggo	988a2729d7	Merge pull request #10203 from Dhilan007/v3-bmf-performance ... Improved the parsing performance of bitmap fonts	2015-01-26 13:46:04 +08:00
Ryo Miyajima	d1d4ec2ac6	fix grammar in comment	2015-01-26 10:56:43 +09:00
Ryo Miyajima	4985653f5b	specify default capacity	2015-01-26 10:56:38 +09:00
WenhaiLin	9afa871164	Improved the parsing performance of bitmap fonts	2015-01-24 16:23:30 +08:00
Huabing.Xu	030394bffe	refactor the rendering and creation of DrawNode ... make LayerColor rendering safer	2015-01-23 18:19:03 +08:00
kompjoefriek	ca48c5e5dd	Fixed lots of compiler warnings ... - signed / unsigned mismatches - using int as bool - Removed throw() from CCFrame.h, why is explained here: http://www.gotw.ca/publications/mill22.htm	2015-01-23 02:02:33 +01:00
Ryo Miyajima	75847bc383	make CCTMXObjectGroup::getGroupName const	2015-01-22 16:37:51 +09:00
Wenhai Lin	5076b9f008	Fixed crash	2015-01-21 22:46:31 +08:00
Wenhai Lin	342c582124	Fixed label may become white/black block after resume from background on android	2015-01-21 21:58:18 +08:00
lite3	0923a28e4d	fix wild pointer	2015-01-21 21:01:57 +08:00
minggo	26bdd8b532	Merge pull request #10140 from minggo/crash-fix ... check if plist file exist	2015-01-21 14:41:44 +08:00
minggo	097d4f3266	check if plist file exist	2015-01-21 14:36:49 +08:00
minggo	fde86c7fd2	Merge pull request #10127 from Dhilan007/v3-systemfont-alphafix ... Fixed the alpha channel of text color of system font not take effect	2015-01-21 11:09:27 +08:00
minggo	9f24b9a350	Merge pull request #10090 from Dhilan007/v3-issue10089 ... Fixed lose the precision of label's dimensions	2015-01-21 10:51:27 +08:00
minggo	372b11422d	Merge pull request #10115 from dabingnn/FixCrashOnWin32 ... Fix crash on win32	2015-01-21 10:34:22 +08:00
minggo	5f37ba8096	Merge pull request #10095 from super626/fixnode ... fix anchor point bug	2015-01-21 09:58:00 +08:00
Huabing.Xu	65b6500491	Merge branch 'v3' into FixCrashOnWin32 ... Conflicts: cocos/2d/CCDrawNode.cpp cocos/renderer/ccShaders.cpp	2015-01-20 18:09:11 +08:00
Huabing.Xu	79eee9b145	fix crash on windows	2015-01-20 16:50:51 +08:00
WenhaiLin	415bbeba21	Fixed the alpha channel of text color of system font not take effect	2015-01-20 16:04:14 +08:00
samuele3hu	d4db54dc64	issue #9537:Make parameters more sense	2015-01-20 15:41:59 +08:00
yangxiao	2a2330438c	fix anchor point bug	2015-01-20 14:10:11 +08:00
WenhaiLin	f2c6a48976	Fixed lose the precision of label's dimensions	2015-01-20 11:46:43 +08:00
tangziwen	25cd1f4c02	update test	2015-01-20 10:34:30 +08:00
Huabing.Xu	19bb6a0c68	fix opengl 502 by using glGetBooleanv	2015-01-16 15:21:23 +08:00
Nite Luo	9848a8133b	Fix Vertex Z issue	2015-01-15 16:41:07 -08:00
Nite Luo	9d7604cab7	undeprecate init for custom command	2015-01-15 15:56:44 -08:00
Nite Luo	0bddeb88c8	Disable 3D rendering support for commands that needs to execute in order	2015-01-15 14:57:51 -08:00
Nite Luo	4a440e66c9	Refactor draw command	2015-01-15 14:00:49 -08:00
huangshiwu	65e97450d0	fix DrawNode init error	2015-01-15 11:51:21 +08:00
Mircea Rila	2a235f5b8d	add Color3B type parameter to TintTo::create	2015-01-14 11:04:23 +02:00
yangxiao	42c40d895f	enable disable culling using macro	2015-01-14 14:41:10 +08:00
Huabing.Xu	34582ba268	Merge branch 'v3' into v3_AddOptionsForCulling ... Conflicts: cocos/2d/CCLabel.cpp	2015-01-14 12:44:24 +08:00
minggo	5459149279	Merge pull request #9969 from huangshiwu/pointSize ... DrawNode enable draw different size points	2015-01-14 11:38:31 +08:00
minggo	0207c22cb6	Merge pull request #9953 from darkdukey/renderFix ... Render fix	2015-01-14 11:06:33 +08:00
Huabing.Xu	f3d8798d39	add macro to enable to disable culling	2015-01-14 10:56:51 +08:00
huangshiwu	f4ac7c4e44	modify WP8 project and update precompileshader	2015-01-14 02:15:04 +08:00
huangshiwu	fea492ab4f	DrawNode enable draw different size points	2015-01-13 22:30:50 +08:00
Nite Luo	1c10ae43bc	Merge branch 'v3' into renderFix ... Conflicts: tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.cpp tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.h	2015-01-12 20:43:55 -08:00
Nite Luo	8591609128	Implement 3D drawing support for Sprite, Label, Particle, BatchNode	2015-01-12 20:06:50 -08:00
Huabing.Xu	af9e49b28d	cache director pointer to improve rendering performance	2015-01-13 10:28:25 +08:00
yangxiao	6d297d377b	camera visible check	2015-01-12 10:08:55 +08:00
minggo	465bf48442	Merge pull request #9879 from suzukaze/fix-indents ... Replace tabs with spaces in cocos/2d dir	2015-01-09 14:59:27 +08:00
Takao Kato	ba0beaffdc	fixed getParentToNodeTransform. it returned a wrong transform if _transformDirty was true.	2015-01-09 09:58:09 +08:00
Nite Luo	e7480a7efb	Enable tansparent queue and create camera rotation demo	2015-01-08 16:30:00 -08:00
Jun Hiroe	e4d560b658	Replace tabs with spaces in cocos/2d dir	2015-01-08 20:17:45 +09:00
Huabing.Xu	5f8d69d447	Merge pull request #9862 from Dhilan007/v3-physics-performance2 ... [Physics]Reduce temporary object creation and save mathematical labor	2015-01-08 14:27:52 +08:00
Wenhai Lin	61438f7297	[Physics]Reduce temporary object creation and save mathematical labor	2015-01-08 14:25:06 +08:00
Huabing.Xu	2b71c57b52	Merge pull request #9840 from Dhilan007/v3-physics-performance ... Improve performance of Physics	2015-01-08 10:33:51 +08:00
Jun Hiroe	ca86bce60d	Replace tab with spaces	2015-01-07 23:46:28 +09:00
Wenhai Lin	8524a5fb97	Improve performance of physics	2015-01-07 17:08:04 +08:00
Huabing.Xu	27d4c6a0f6	Merge pull request #9830 from huangshiwu/v3_drawNode_fixbug ... DrawNode override drawPoints function to set pointSize, fix draw points ...	2015-01-07 14:46:13 +08:00
huangshiwu	f41f00fcb2	make rotated rect draw correctly	2015-01-07 11:44:16 +08:00
huangshiwu	ac7ddad4ac	DrawNode override drawPoints function to set pointsize, fix draw points use last color bug and drawRect behavior bug	2015-01-07 11:02:31 +08:00
minggo	4b0a35d772	Merge pull request #9813 from Dhilan007/v3-physics-remove-infoclass ... Remove XXXXInfo_chipmunk class in 'chipmunk' folder to simplify implementation of physics	2015-01-07 10:21:54 +08:00
Eric Muxagata	e0143167e6	Making CCMotionStreak _maxPoints framerate independent.	2015-01-06 17:02:32 -02:00
minggo	5b0925d42d	Merge pull request #9802 from dabingnn/v3_fixGLProgramLogCrash ... fix delete wild opengl buffers	2015-01-06 15:13:49 +08:00
WenhaiLin	2847a940ed	Update project	2015-01-06 14:40:15 +08:00
minggo	31819bafc3	Merge pull request #9769 from ton1517/fix/jumpto ... fix problem : JumpTo position is changed each repeat.	2015-01-06 14:09:54 +08:00
WenhaiLin	f620038c59	Add miss file for win32 project	2015-01-06 10:55:26 +08:00
Huabing.Xu	7f61a3d97b	reset _VAOname to 0 before recreating on android	2015-01-06 09:44:19 +08:00
Huabing.Xu	a1654e5714	fix delete wild opengl buffers	2015-01-05 17:53:31 +08:00
ton	a445148a5e	fix problem : JumpTo position is changed each repeat. ... example: sprite->runAction( RepeatForever::create( Sequence::create( JumpTo::create(1, Vec2(300, 200), 100, 2), MoveTo::create(1, Vec2(100, 200)), nullptr ) ) );	2015-01-03 01:13:57 +09:00
Dale Stammen	395b9fbaa7	added /bigobj to c++ command line options to fix arm builds	2014-12-31 12:56:16 -08:00
Dale Stammen	d8c2927944	added base/allocator files	2014-12-30 21:41:46 -08:00
Dale Stammen	7276f64f29	updated dll name from 3.3 to 3.4	2014-12-30 21:40:01 -08:00
Dale Stammen	ac95d292bd	added base/allocator files	2014-12-30 21:21:36 -08:00
Dale Stammen	df64718ef1	removed 3dExport.h as it no longer exists	2014-12-30 20:51:54 -08:00
Dale Stammen	f73a07c7b9	added missing files	2014-12-30 17:27:37 -08:00
Dale Stammen	bd1fef7515	added missing files	2014-12-30 16:40:04 -08:00
minggo	da8c007932	add const for Sprite::getTextureRect() and do some format	2014-12-30 11:55:54 +08:00
minggo	7db279220c	Merge branch 'quaternion' of https://github.com/super626/cocos2d-x into v3	2014-12-29 15:04:43 +08:00
minggo	d7dfdc9124	Merge pull request #9417 from lite3/spriteretainframe ... retain the sprite frame in sprite	2014-12-29 10:33:42 +08:00
lvlong	f592671df6	Merge branch 'v3' of github.com:cocos2d/cocos2d-x into frustum ... Conflicts: cocos/2d/libcocos2d.vcxproj.filters cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp	2014-12-26 13:42:13 +08:00
andyque	19dc8b5d19	fix conflicts and wp8, wp8.1 linker error	2014-12-25 18:11:59 +08:00
andyque	29e9ef7edf	Merge branch 'v3' into modifyWidgetDefaultBehavior ... Conflicts: cocos/2d/libcocos2d.vcxproj.filters cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters cocos/2d/libcocos2d_wp8.vcxproj.filters	2014-12-25 18:08:07 +08:00
lvlong	a4a108f766	fix lua binding again!!	2014-12-25 14:04:41 +08:00
youyou	f678d1027c	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 ... Conflicts: cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp	2014-12-25 12:09:31 +08:00
yangxiao	0db70977f9	wrong scale order	2014-12-25 10:39:48 +08:00
yangxiao	510633ba72	wrong spelling	2014-12-25 10:33:49 +08:00
yangxiao	6eed142e03	rename _rotation_quat to _rotationQuat	2014-12-24 18:12:00 +08:00
yangxiao	17207673ff	merge cocos	2014-12-24 17:34:58 +08:00
yangxiao	88e0f025ef	make it clean	2014-12-24 17:18:09 +08:00
yangxiao	22ae384edf	Rotation representation with quaternion fix #9510	2014-12-24 17:07:54 +08:00
youyou	db6ffd7962	Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x; branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3	2014-12-24 15:59:50 +08:00
lvlonggame	805b248af3	modify win-project	2014-12-24 15:06:58 +08:00
yusheng.lu	fa5b4f8df7	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader ... Conflicts: cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters cocos/2d/libcocos2d_wp8.vcxproj.filters resolve the conflicts	2014-12-24 13:06:38 +08:00
minggo	5d8e004b9b	Merge pull request #9600 from huangshiwu/v3_allocator_wp ... fix allocator related compile error on wp8/8.1 and winrt	2014-12-24 10:54:16 +08:00
kaile.yin	942abfc654	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 ... Conflicts: cocos/2d/libcocos2d.vcxproj.filters	2014-12-24 10:53:09 +08:00
huangshiwu	01eeb15a8d	fix allocator related compile error on wp8/8.1 and winrt	2014-12-24 10:45:29 +08:00
minggo	dea483b6ef	performance improve	2014-12-23 18:07:22 +08:00
yusheng.lu	d543f8f6a2	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader	2014-12-23 16:12:50 +08:00
andyque	d8f726bc4f	modify widget default behavior	2014-12-23 15:03:31 +08:00
yangxiao	3d77c7535d	merge cocos	2014-12-23 10:35:35 +08:00
yusheng.lu	2de5ba7c2f	vs filters update	2014-12-22 19:43:14 +08:00
yusheng.lu	02b9269cff	completed multiplatform projects	2014-12-22 19:39:10 +08:00
yusheng.lu	b0bfc2906a	change armature codes files path	2014-12-22 18:26:50 +08:00
lvlong	db9f4a23fe	feedback commit.	2014-12-22 18:13:07 +08:00
yusheng.lu	6de7fae114	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader	2014-12-22 18:00:08 +08:00
yusheng.lu	62c5df2d9d	armature node reader done (projs incompleted)	2014-12-22 17:35:39 +08:00
yangxiao	e8c7f30541	add quaternion	2014-12-22 17:23:44 +08:00
minggo	feacf75f12	Merge pull request #9575 from minggo/MoveTo-MoveBy-support-v3 ... #9555 MoveTo and MoveBy support Vec3	2014-12-22 15:57:12 +08:00
yangxiao	bdc12dce8b	add quaternion property	2014-12-22 15:14:18 +08:00
minggo	81de0ae687	Merge pull request #9566 from austinkelleher/dev ... Fixing variable name lenght -> length.	2014-12-22 15:07:15 +08:00
minggo	20beb3b9e0	Merge pull request #9567 from joewan/v3-improve-perf ... fix serious performance problem of Animate.	2014-12-22 14:57:26 +08:00
minggo	1268f73a7c	MoveTo and MoveBy support Vec3	2014-12-22 14:34:35 +08:00
kaile.yin	b924dafe83	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 ... Conflicts: cocos/2d/libcocos2d.vcxproj.filters tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp	2014-12-22 11:14:31 +08:00
joewanchen	bb1267cd09	use auto&.	2014-12-21 14:05:34 +08:00
joewanchen	a15a4a0739	fix compile error.	2014-12-21 02:03:41 +08:00
joewanchen	3765f87651	fix.	2014-12-21 00:49:23 +08:00
joewanchen	7d6686eb7b	fix.	2014-12-21 00:42:55 +08:00
joewanchen	fc69dabca2	fix serious performance problem.	2014-12-21 00:22:23 +08:00
Austin Kelleher	d3ca364259	Fixing variable name lenght -> length.	2014-12-20 07:34:44 -05:00
XiaoYang	9102c77840	Merge pull request #182 from lvlonggame/v3 ... camera frustum update	2014-12-19 16:14:01 +07:00
WenhaiLin	4366fb7230	Fix compile error on WIN32.	2014-12-19 11:49:40 +08:00
songchengjiang	f5f95c5693	fix errors on Windows	2014-12-19 11:30:51 +08:00
lvlong	f6bea9b6bb	1.add camera culling. ... 2.add camera culling sample. 3.fix bug: load .obj file material.	2014-12-18 17:18:22 +08:00
minggo	e800b3d9ba	Merge pull request #9501 from joewan/v3-fix-mismatch ... V3 fix uninitialized members.	2014-12-16 18:28:36 +08:00
lvlong	73a2a6385a	add frustum culling.	2014-12-16 16:34:35 +08:00
joewanchen	713d19c830	initialize _contentSizeDirty.	2014-12-15 19:43:54 +08:00
Wenhai Lin	4ed5872ba3	Fixed content size of Label is incorrect after sets empty string.	2014-12-15 14:36:57 +08:00
lite3	91c7127bbd	Merge branch 'v3' into spriteretainframe	2014-12-09 10:51:47 +08:00
lite3	4f4c30051e	retain the sprite frame ... do not removed by SpriteFrameCache::removeUnusedSpriteFrames	2014-12-08 21:04:15 +08:00
kaile.yin	1db2bf89e0	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3	2014-12-05 14:42:25 +08:00
lite3	8df8ee36db	print more info	2014-12-04 19:18:54 +08:00
kaile.yin	9f9c4782f1	change file name	2014-12-04 18:51:32 +08:00
kaile.yin	a6653c7d8d	change name	2014-12-04 18:50:00 +08:00
kaile.yin	743166f50b	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 ... Conflicts: cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp	2014-12-04 15:32:25 +08:00
pipu	6d764bc2c8	Merge branch 'v3' into v3_flatbuffers ... Conflicts: tools/cocos2d-console	2014-12-03 15:47:03 +08:00
kaile.yin	fd69a5efc3	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3	2014-12-03 15:22:46 +08:00
minggo	4bee194a0b	Merge pull request #9285 from huangshiwu/v3_drawpolygon ... DrawNode::drawPolygon refactor	2014-12-03 14:06:48 +08:00
minggo	4d2ea40db0	Merge pull request #9265 from shrimpz/fix_label_crashed_on_android ... Fix label crashed on android #9255	2014-12-02 15:48:10 +08:00
pipu	26a6c9a724	Modify libcocos2d_wp8.vcxproj, libcocos2d_wp8.vcxproj.filters, libcocos2d_8_1.Shared.vcxitems, libcocos2d_8_1.Shared.vcxitems.filters, cpp-tests.Shared.vcxitems, cpp-tests.Shared.vcxitems.filters	2014-12-02 12:30:34 +08:00
pipu	1cbc0120be	Merge branch 'v3' into v3_flatbuffers	2014-12-01 22:56:18 +08:00
zhounan	7ffc6f9784	Modify that cocos/2d/libcocos2d.vcxproj, cocos/2d/libcocos2d.vcxproj.filters	2014-12-01 13:18:57 +08:00
Dale Stammen	117d7bd5e8	fixed universal app project files for flatbuffers	2014-11-27 05:34:36 -08:00
Dale Stammen	267edeafd3	fixed wp8 project files for flatbuffers	2014-11-27 05:22:07 -08:00
StarWing	d5125ae179	nullptr check when Sprite::setTexture with non-exists file	2014-11-27 21:15:09 +08:00
pipu	1633b7f475	Reset libcocos2d_8_1.Windows.vcxproj, libcocos2d_8_1.Windows.vcxproj.filters, libcocos2d_8_1.WindowsPhone.vcxproj, libcocos2d_8_1.WindowsPhone.vcxproj.filters	2014-11-27 20:02:03 +08:00
zhangcheng	12a5443834	Merge branch 'v3_flatbuffers' of https://github.com/pipu/cocos2d-x into v3_flatbuffers	2014-11-27 18:34:18 +08:00
zhangcheng	0c89db7675	Add WidgetCallbackHandlerProtocol.h, WidgetCallbackHandlerProtocol.cpp	2014-11-27 18:32:35 +08:00
huangshiwu	b866a58fc4	DrawNode::drawPolygon refactor	2014-11-27 18:31:04 +08:00
pipu	48f280b478	Update .vcxproj, vcxproj.filters files for wp8, Windows 8.1 WindowsPhone 8.1	2014-11-27 18:27:22 +08:00
Shrimpz	38a6aa30a2	* fixed android crash that a Label instance add to an invisibility parent node.	2014-11-27 10:59:47 +08:00
pipu	889f84e540	newest v3 flatbuffers	2014-11-26 13:29:23 +08:00
minggo	5d58ffc5ab	Merge pull request #9212 from Dhilan007/v3-fontfnt-crash ... Fix crash when missing image resource of FNT font.	2014-11-26 11:48:53 +08:00
minggo	14bbaab0ba	Merge pull request #9210 from Dhilan007/v3-physics-scale ... Reducing unnecessary function call	2014-11-26 10:57:59 +08:00
minggo	7f4cabcd9f	Merge pull request #9216 from Dhilan007/v3-debugfix ... fix compiling error caused by enable CC_LABELBMFONT_DEBUG_DRAW/CC_LABELATLAS_DEBUG_DRAW	2014-11-26 10:53:36 +08:00
Ricardo Quesada	33a2d0451c	Code conforms with the cocos2d-x c++ guidelines	2014-11-25 17:53:52 -08:00
Ricardo Quesada	9e10d2d32b	Revert "Merge pull request #9193 from pipu/v3_flatbuffers" ... This reverts commit fa22b12628, reversing changes made to 8dce62b94c.	2014-11-24 10:19:53 -08:00
Wenhai Lin	d63474436b	fix compiling error caused by enable CC_LABELBMFONT_DEBUG_DRAW/CC_LABELATLAS_DEBUG_DRAW	2014-11-24 17:21:14 +08:00
LinWenhai	fa90897e5b	remove unnecessary keyword	2014-11-24 16:27:42 +08:00
Dhilan007	7119a5855d	Fix crash when missing image resource of FNT font.	2014-11-24 15:57:00 +08:00
Dhilan007	4bc4f43b28	Reducing unnecessary function call	2014-11-24 15:27:20 +08:00
zhangcheng	32ce3dca2e	1, Update windows project.	2014-11-21 18:12:46 +08:00
pipu	6be17520c7	Config android, linux, wp8	2014-11-21 18:08:09 +08:00
minggo	02ba67e17f	Merge pull request #9082 from Teivaz/v3 ... - Optimization in CCClippingNode.	2014-11-20 11:35:42 +08:00
kaile.yin	eb9646ee3d	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3	2014-11-19 10:58:19 +08:00
Ricardo Quesada	71fec06a11	fixes indentation	2014-11-17 18:11:17 -08:00
kaile.yin	bbd971d910	create ActionTimelineNode	2014-11-17 21:05:20 +08:00
Ricardo Quesada	dcc4c46d5b	Using std::swap instead of CC_SWAP ... CC_SWAP is deprecated. Use `std::swap` instead.	2014-11-16 09:29:05 -08:00
Ricardo Quesada	50dcae4bef	fixes compiler warnings	2014-11-14 13:07:34 -08:00
minggo	156be2e633	Merge pull request #9077 from super626/fixscene ... fix Scene::setScale does not work #9031	2014-11-13 18:59:49 +08:00
teivaz	2d75ceafb7	- set const modifier to ClippingNode::hasContent()	2014-11-13 12:43:05 +02:00
minggo	222adb22dd	Merge pull request #9104 from super626/camera ... add comments to camera and scene	2014-11-13 18:04:44 +08:00
yangxiao	d50670af4b	add comment to camera and scene	2014-11-13 17:30:49 +08:00
Dhilan007	e071e5c896	Fix Label may display incomplete for multiline text with outline feature enabled.	2014-11-12 17:24:35 +08:00
teivaz	7c355a087b	- Optimization in CCClippingNode. ... Disable visiting when no objects has to be drawn under stencil.	2014-11-11 21:09:58 +02:00
yangxiao	6ecb9a7b04	fix #9031	2014-11-10 12:48:42 +08:00
minggo	db659107d3	Merge pull request #9052 from huangshiwu/v3_fixbug ... fix ui crash bug caused by DrawNode	2014-11-07 10:33:08 +08:00
huangshiwu	ace9933d72	fix ui crash bug caused by DrawNode	2014-11-07 10:05:29 +08:00
minggo	8a49ae0b07	Merge pull request #8981 from vovkasm/clean-order-of-fields-initialization ... Cleanup order of fields initialization.	2014-11-05 17:51:58 +08:00
minggo	e56c84ebf0	Merge pull request #8983 from super626/camera ... fix wrong camera lookat computation	2014-11-05 17:49:59 +08:00
minggo	98073632d4	Merge pull request #8908 from zawasp/v3-source ... fix some warnings / remove TABs	2014-11-05 13:39:20 +08:00
Ricardo Quesada	3a34d6eb9d	Performance improvements ... `Director::getMatrix()` returns `const Mat4`	2014-11-04 16:46:14 -08:00
yangxiao	642a601502	fix wrong look at	2014-10-31 11:32:10 +08:00
Vladimir Timofeev	2835b094da	Cleanup order of fields initialization. ... Make initialization order to match declarations. This change twice reduces number of warnings when compiling on MacOS X with Xcode 6.1 Warnings was like "Field 'XXXX' will be initialized after field 'YYYY'"	2014-10-30 17:28:41 +03:00
Dale Stammen	32a5a2cbb8	Merge branch 'v3' into wp8-shader-fix	2014-10-28 22:08:04 -07:00
Dale Stammen	145156d698	disabled distanceFieldEnabled for WP8 as the shader crashes some older windows phones	2014-10-28 20:56:49 -07:00
Dale Stammen	6d46ee8f3d	fixed location of renderer filter	2014-10-27 11:09:27 -07:00
Dale Stammen	b483162128	added ignore warning 4756	2014-10-27 11:07:27 -07:00
minggo	23f922420a	Merge pull request #8919 from ahlwong/v3 ... Fix Label Kerning on Single Characters Cocos2d-X3.3Beta0	2014-10-27 11:48:50 +08:00
minggo	baff367c94	Merge pull request #8918 from dumganhar/iss8843-drawpoint ... closed #8843: Fixes DrawNode::drawPoint crash and uses VAO if it's available when draw points.	2014-10-27 11:38:11 +08:00
Ahlwong	dfcdf10898	Fix Label Additional Kerning All Strings	2014-10-24 08:57:37 -07:00
Dale Stammen	40e49cdc12	Merge branch 'v3' into wp8.1-universal	2014-10-24 07:08:55 -07:00
Ahlwong	012683bf6e	Fix kerning on signle characters	2014-10-23 21:18:51 -07:00
James Chen	603700179e	closed #8843: Fixes DrawNode::drawPoint crash and uses VAO if it's available when draw points.	2014-10-24 12:03:11 +08:00
Dale Stammen	b6329c6c7b	added correct options to compile c file	2014-10-23 13:27:24 -07:00
Dale Stammen	b520e80e04	updated 2d and base file locations	2014-10-23 09:03:35 -07:00
Dale Stammen	a4f13a91ab	added CC_NO_GL_POINTSIZE preprocessor define	2014-10-23 07:36:23 -07:00
Dale Stammen	89d3d7b7cf	added missing cocos2d files	2014-10-23 07:29:57 -07:00
Dale Stammen	753bc5034a	removed winrt/wp8 code. no longer needed	2014-10-23 06:59:09 -07:00
Mircea Rila	3d276db6d2	fix some warnings / remove TABs	2014-10-23 12:54:15 +03:00
Dhilan007	20d372b356	Fixed Label shifting when outline feature enabled	2014-10-22 14:34:01 +08:00
Dhilan007	a5f838496c	Move `CCCamera.cpp/h` `CCLight.cpp/h` into 2d	2014-10-20 16:25:24 +08:00
Dhilan007	0bb02fb34f	Fix Label: endless loop if not using system font, and constrained length is less than one character width	2014-10-20 10:41:01 +08:00
yangxiao	cfb6a7846f	Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3	2014-10-17 18:08:55 +08:00
yangxiao	66dd0807eb	add isVisibleByVisitingCamera check when visit	2014-10-17 18:07:45 +08:00
Dhilan007	4586954e0a	fixed miss sqlite3 for release build on window.	2014-10-17 11:39:06 +08:00
Dale Stammen	d5b0830c3b	added missing files	2014-10-16 11:15:39 -07:00
andyque	f3f15c58fe	remove UIWebView.cpp in win32	2014-10-16 16:46:49 +08:00
samuele3hu	d997f72be2	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_assetsmanager ... nter # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.	2014-10-16 10:59:58 +08:00
minggo	8eed0811fa	Merge pull request #8717 from MSOpenTech/wp8-dll ... New version of WP8 for cocos2d-x v3.3	2014-10-16 09:33:43 +08:00
minggo	68d58b05e9	Merge pull request #8700 from iSevenDays/v3 ... CMake fix for Mac Os X	2014-10-15 21:24:18 +08:00
SunLightJuly	74952d7258	added CCClippingRectangleNode.cpp to CMakeList	2014-10-15 14:17:04 +08:00
SunLightJuly	3352fb7bf3	reset wp8 project files	2014-10-15 14:14:02 +08:00
samuele3hu	064e159c70	Merge branch 'v3_testMerge' of https://github.com/pandamicro/cocos2d-x into v3_assetsmanager ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj cocos/platform/CCFileUtils.cpp tests/lua-tests/project/CMakeLists.txt tests/lua-tests/project/Classes/AppDelegate.cpp tests/lua-tests/project/proj.android/jni/Android.mk tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj	2014-10-15 13:41:27 +08:00
SunLightJuly	f2286eaf94	added ClippingRectangleNode	2014-10-15 13:38:14 +08:00
Dale Stammen	4bed458371	added missing protobuf-lite files	2014-10-14 17:41:40 -07:00
Dale Stammen	180fa4c324	added new cocos2d wp8 dll project files	2014-10-14 14:28:06 -07:00
Dale Stammen	9ef5f3a48f	added wp8 and winrt property sheets	2014-10-14 14:27:29 -07:00
Dale Stammen	8983a57869	added Windows 8.1 universal app project files	2014-10-14 14:25:01 -07:00
Dale Stammen	eb74b642da	added Windows 8.1 universal app project files	2014-10-14 14:23:39 -07:00
Anton Sokolchenko	fc35cc2efe	CMake fix for Mac Os X. ... You can open project with CLion and see that everything works.	2014-10-15 00:19:29 +03:00
Dale Stammen	ec5af7ae90	added missing CC_USE_PHYSICS	2014-10-14 14:12:27 -07:00
Dale Stammen	fd638f00b7	removed old WP8 project files	2014-10-14 14:09:52 -07:00
minggo	0ab3017094	Merge pull request #8658 from pipu/v3_pipu ... V3 pipu	2014-10-14 14:25:46 +08:00
pipu	a8febf9656	1. update wp8 projects.	2014-10-13 15:31:29 +08:00
pipu	72f5808678	Modifying libcocos2d.vcxproj,libcocos2d.vcxproj.filters	2014-10-13 14:48:10 +08:00
minggo	0351000c97	Merge pull request #8650 from dabingnn/v3_addStaggeredTileMap ... V3 add staggered tile map	2014-10-13 13:50:50 +08:00
pipu	93a7e22eb6	Modifying libcocos2d.vcxproj.filters	2014-10-12 18:55:43 +08:00
pipu	9503253a17	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_pipu	2014-10-12 17:44:28 +08:00
pipu	779e73dad0	1. change config.h in win32.	2014-10-12 15:27:41 +08:00
pipu	10e390557e	Modifying libcocos2d.vcxproj,libcocos2d.vcxproj.filters	2014-10-12 15:07:37 +08:00
minggo	b144eb345a	Merge pull request #8643 from huangshiwu/v3_fixDrawNodebug ... fix DrawNode's memory leak -- delete vaos those are generated and forget...	2014-10-11 17:31:17 +08:00
minggo	2db8217b09	Merge pull request #8543 from Dhilan007/v3-fixwarns ... fix warns and memory leak	2014-10-11 16:07:54 +08:00
Huabing.Xu	7747e2ecf5	Merge branch 'v3' into v3_addStaggeredTileMap	2014-10-11 15:15:12 +08:00
Huabing.Xu	27f48b0011	add implementation for staggered tmx map	2014-10-11 14:22:31 +08:00
pipu	583a756d33	Reverting build/cocos2d-win32.vc2012.sln ... Reverting cocos/2d/libcocos2d.vcxproj	2014-10-11 14:13:56 +08:00
huangshiwu	184d9356b8	fix DrawNode's memory leak -- delete vaos those are generated and forget to release	2014-10-11 12:00:14 +08:00
SunLightJuly	a36dbf5362	ClippingRegionNode --> ClippingRectangleNode	2014-10-11 11:49:01 +08:00
pipu	b732ce378e	Merge branch 'v3_pipu_protocol_buffers' into merge_test ... Conflicts: cocos/ui/UIScale9Sprite.cpp	2014-10-11 11:08:46 +08:00
minggo	4d084496a3	Merge pull request #8578 from SunLightJuly/Lua_LoadChunksFromZIP ... added LuaStack::loadChunksFromZIP()	2014-10-10 22:14:55 +08:00
pipu	efe22a0dd7	Modifying protocol buffers for win32 version	2014-10-10 21:55:59 +08:00
SunLightJuly	ba064167a8	modified project files and make files	2014-10-10 18:43:40 +08:00
Huabing.Xu	766c9469d4	add staggered wrapper(using ortho for its implementation now)	2014-10-10 17:52:13 +08:00
Dhilan007	89db9ecd3b	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-win32-warn ... Conflicts: tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp	2014-10-10 17:02:45 +08:00
minggo	4b7d5694b8	Merge pull request #8573 from Dhilan007/v3-labelatlas ... fix #8569: LabelAtlas opacity do not change when setting parent node's opacity	2014-10-10 15:52:50 +08:00
andyque	d5fe0758ed	fix cocostudio include path	2014-10-10 13:48:49 +08:00
pandamicro	a26e91f839	no message	2014-10-09 18:30:39 +08:00
pipu	752eb839c7	Add protocolbuf.a	2014-10-09 18:28:09 +08:00
Dhilan007	83150aa4d1	fix warns and memory leak	2014-10-09 17:19:43 +08:00
minggo	f928046f50	Merge pull request #8580 from Dhilan007/v3-labelfix ... issue #8492:fix endless loop when dimensions that are not enough to fit one character	2014-10-09 17:05:39 +08:00
minggo	b8c5ce6db3	Merge pull request #8588 from Dhilan007/v3-label8582 ... fixed issue#8582: opacity of label	2014-10-09 15:50:44 +08:00
martell	73980195c0	wp8: use CC_STATIC because libs are static	2014-10-09 06:33:46 +01:00
Dhilan007	462e38cbc6	fixed opacity of label	2014-10-09 10:54:35 +08:00
SunLightJuly	1062dec335	modified project files and make files	2014-10-08 18:44:58 +08:00
Dhilan007	6f50143e0a	Fixed LabelAtlas opacity do not change when setting parent node's opacity	2014-10-08 18:28:24 +08:00
Dhilan007	8ea473de7b	fix endless loop when dimensions that are not enough to fit one character	2014-10-08 18:22:35 +08:00
minggo	8aa03e107f	Merge pull request #8209 from boyu0/fix_physics_crash ... fix bug: physics crashes when remove/add children too quick.	2014-10-08 13:48:03 +08:00
martell	30240a8a37	Multi platform cmake support ... Signed-off-by: martell <martellmalone@gmail.com>	2014-10-03 23:21:45 +01:00
Ricardo Quesada	342d934a0e	scheduler and macro fixes ... * kRepeatForever -> CC_REPEAT_FOREVER * schedule_selector -> CC_SCHEDULE_SELECTOR * [new] Node::schedule(const std::function<>& callback, const std::string &key) Updates all smaples	2014-10-03 09:38:36 -07:00
Ricardo Quesada	42ace3e59c	Adds lambda support in node ... It is now possible to schedule lambda functions in Node::schedule() No need to subclass	2014-10-02 21:25:55 -07:00
Ricardo Quesada	12e9d18ab7	Compiles on Windows Phone 8	2014-10-01 19:08:34 -07:00
Dhilan007	02fcb6488a	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio-win32 ... Conflicts: cocos/2d/libcocos2d.vcxproj.filters tests/cpp-tests/proj.win32/cpp-tests.vcxproj	2014-09-30 14:19:27 +08:00
Dhilan007	7ebe4a5548	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio-win32 ... Conflicts: cocos/audio/AudioEngine.cpp cocos/audio/apple/AudioPlayer.h cocos/audio/include/AudioEngine.h tests/cpp-tests/Classes/NewAudioEngineTest/NewAudioEngineTest.cpp tests/cpp-tests/Classes/NewAudioEngineTest/NewAudioEngineTest.h	2014-09-30 09:45:47 +08:00
yangxiao	d680e58f80	merge cocos resolve conflict	2014-09-30 08:32:37 +08:00
boyu0	2b0afa6063	fix bug: physics crashes when remove/add children too quick.	2014-09-30 08:15:46 +08:00
SunLightJuly	fbbc90431e	standardized codes	2014-09-29 15:42:56 +08:00
SunLightJuly	e0b9878e58	added ClippingRegionNode	2014-09-29 15:07:05 +08:00
minggo	6583bf6b1f	Merge pull request #8179 from MSOpenTech/wp8-v3-fix ... WP8 fixes for v3.3 app certification tests	2014-09-29 13:42:40 +08:00
Dhilan007	f2f1331026	New Audio Engine[Win32]	2014-09-29 10:15:41 +08:00
Dhilan007	d52144d1e0	fix linker errors on WIN32	2014-09-28 21:45:09 +08:00
songchengjiang	39deb73c3a	move light from 3d to base(Windows)	2014-09-28 17:23:25 +08:00
minggo	289c1edfe7	Merge pull request #8174 from lite3/v3 ... fix compile error when CC_SPRITE_DEBUG_DRAW	2014-09-28 16:21:04 +08:00
yangxiao	dbf564208b	move light from 3d to base	2014-09-28 16:02:12 +08:00
yangxiao	75e5ca30ee	merge cocos	2014-09-28 09:55:31 +08:00
Dale Stammen	3c7a22f776	removed CMakeLists.txt	2014-09-26 12:42:20 -07:00
Dale Stammen	fd3177d350	removed WINRT	2014-09-26 11:41:12 -07:00
Dale Stammen	209f67f222	fixed property sheet	2014-09-26 11:01:43 -07:00
Dale Stammen	f24312bc77	added UNICODE	2014-09-26 11:01:05 -07:00
lite3	da361810a3	fix compile error when CC_SPRITE_DEBUG_DRAW	2014-09-26 17:14:55 +08:00
yangxiao	98d9cea774	merge cocos	2014-09-26 15:14:57 +08:00
yangxiao	6626655308	move render logic from Director to scene	2014-09-26 09:36:43 +08:00
minggo	9509f4cf9a	Merge pull request #8139 from tttreal/label-getStringNumLines-bugfix ... [CCLabel] Apply updateContent() for getStringNumLines() when Label is dirty	2014-09-25 14:44:28 +08:00
minggo	9510d6d946	Merge pull request #8136 from andyque/moveWinEditBox ... remove Win32InputBox.cpp/.h, move them to UIEditBoxImpl-win32.cpp	2014-09-25 13:38:19 +08:00
yangxiao	56313aa895	merge cocos	2014-09-25 11:05:02 +08:00
minggo	04aa44aeea	Merge pull request #8141 from huangshiwu/v3_wp8test ... fix Class TextFieldTTF's keyboard input bug on WP8 platform	2014-09-25 09:40:10 +08:00
huanghsiwu	49f1927d5d	fix Class TextFieldTTF's keyboard input bug on WP8 platform	2014-09-25 07:41:51 +08:00
toma	d1faf75b58	[CCLabel] Apply updateContent() for getStringNumLines() when Label is dirty	2014-09-25 01:46:17 +09:00
andyque	3c434ec354	remove Win32InputBox.cpp/.h, move them to UIEditBoxImpl-win32.cpp	2014-09-24 17:47:38 +08:00
cpascal	a70f51b1e3	Fixed invalid use of CC_TARGET_PLATFORM in the CCClippingNode ... I modified CC_PLATFORM_WINDOWS to CC_PLATFORM_WIN32. -- In the CCPlatformConfig.h, the definitions are.. // win32 #if defined(WIN32) && defined(_WINDOWS) #undef CC_TARGET_PLATFORM #define CC_TARGET_PLATFORM CC_PLATFORM_WIN32 #endif	2014-09-23 17:35:57 +09:00
Dmitry Bushtets	d242d79443	* added default value for _batchNode in CCSprite	2014-09-22 19:00:21 +03:00
minggo	e8b20d8583	Merge pull request #8093 from wohaaitinciu/v3_WebView_win32 ... web view win32	2014-09-22 09:30:29 +08:00
Jeff	2ffbe23c50	The files name: modify underline to hyphen	2014-09-19 10:24:17 +08:00
Jeff	e4e2cea97a	link error	2014-09-18 19:59:22 +08:00
Jeff	476ede6ccb	link error	2014-09-18 19:56:53 +08:00
songchengjiang	3c67515378	Finished light reconstruction	2014-09-18 16:38:35 +08:00
Huabing.Xu	cf4d0faad3	optimise update of particle system for free mode	2014-09-18 15:24:27 +08:00
minggo	442f30af1f	Merge pull request #8091 from dabingnn/v3_PageTurnZFighting ... new version of avoid z fighting in pageTurn	2014-09-18 10:50:31 +08:00
Jeff	1dffbd0a7b	fix link errors	2014-09-18 01:52:08 +08:00
yangxiao	8c77130ae0	refactor light compile	2014-09-17 18:58:35 +08:00
Huabing.Xu	3a0e9be97e	new version of avoid z fighting in pageTurn	2014-09-17 18:33:18 +08:00
minggo	ccbf694927	Merge pull request #8086 from huangshiwu/v3_test ... fix bug produce by CCDrawNode in test Node:UI-GUI Editor test-ScrollView...	2014-09-17 14:50:42 +08:00
yangxiao	584284c847	merge cocos and rename lighttest	2014-09-17 14:26:57 +08:00
huangshiwu	c8bdba69ad	fix bug produce by CCDrawNode in test Node:UI-GUI Editor test-ScrollView PageView ListView	2014-09-17 14:00:40 +08:00
minggo	38810eeb2e	Merge pull request #8082 from dabingnn/v3_fixFastTMXIntIndices ... change indices to short for fast tmx	2014-09-17 11:31:58 +08:00
Huabing.Xu	725d107ae5	change indices to short for fast tmx	2014-09-17 11:06:15 +08:00
huangshiwu	3907e5c1a2	fix ClippingNode's memory leak bug	2014-09-16 14:50:00 +08:00
huangshiwu	d0d3e185ce	fix wp8 and winrt compile error --add chipmunk static lib	2014-09-16 10:03:00 +08:00
joewan	93fdcf1f04	fix memory leak when use menu_selector.	2014-09-14 21:41:19 +08:00
minggo	0f42d9bbd8	Merge pull request #8022 from Dhilan007/v3-labelfix ... Label:It may display incorrectly with outline feature enabled.	2014-09-12 17:54:02 +08:00
Dhilan007	23f1b740bf	Label:It may display incorrectly with outline feature enabled.	2014-09-12 16:03:01 +08:00
huangshiwu	0addaf3912	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_shadercompilefix	2014-09-12 15:38:29 +08:00
huangshiwu	f1f6373b6e	fix Cocos2dShaderCompile's compile error --use chipmunk static library	2014-09-12 15:29:10 +08:00
minggo	55783b66c2	Merge pull request #8012 from huangshiwu/v3_drawnode_prbk ... V3 drawnode prbk	2014-09-12 15:17:49 +08:00
huangshiwu	11d8829b3a	Deprecate DrawPrimitives and enhance DrawNode --little modify	2014-09-12 14:50:41 +08:00
huangshiwu	6182a872c6	Deprecate DrawPrimitives and enhance DrawNode --more modify	2014-09-12 11:12:20 +08:00
huangshiwu	147bb7301b	fix wp8 compile error --add BillBoard and BillBoardTest	2014-09-12 09:33:30 +08:00
huangshiwu	8922121ed1	Deprecate DrawPrimitives and enhance DrawNode --make some modify	2014-09-12 07:33:34 +08:00
huangshiwu	8d8f4436db	Deprecate DrawPrimitives and enhance DrawNode --fix android compile error	2014-09-11 17:55:47 +08:00
huangshiwu	d9634057ab	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_drawnode_prbk	2014-09-11 16:41:54 +08:00
yangxiao	5274b4f958	merge cocos resolve conflict	2014-09-11 16:02:07 +08:00
yangxiao	9901cad113	merge cocos	2014-09-11 15:55:00 +08:00
andyque	67ad24e7c1	remove orderOfArrival = 0	2014-09-11 15:44:31 +08:00
huangshiwu	fb1d47900c	Deprecate DrawPrimitives and enhance DrawNode	2014-09-11 15:39:56 +08:00
andyque	1945c4f31e	fix compile error	2014-09-11 14:45:55 +08:00
yangxiao	3cfc36591c	merge cocos	2014-09-11 10:13:57 +08:00
yangxiao	bb6f5a6be5	Merge branch 'newcode' into billboard	2014-09-10 16:27:59 +08:00
yangxiao	a980a2efa4	merge cocos	2014-09-10 10:28:59 +08:00
andyque	acae8a2535	Merge branch 'v3' into addChipmunkStaticLib ... Conflicts: CMakeLists.txt build/cocos2d_libs.xcodeproj/project.pbxproj cocos/2d/cocos2d_wp8.vcxproj.filters cocos/CMakeLists.txt	2014-09-10 10:00:15 +08:00
Ricardo Quesada	d5a6289a9b	compiles on wp8	2014-09-09 18:22:11 -07:00
Ricardo Quesada	6b4323642a	compiles on winphone8	2014-09-09 18:15:16 -07:00
Ricardo Quesada	4d57e991ea	Compiles in Win32	2014-09-09 18:07:24 -07:00
Ricardo Quesada	6f3ca63f00	Moved base/CCPlatform* -> platform/CCPlatform*	2014-09-09 17:17:07 -07:00
Ricardo Quesada	9082ca18c3	Platform fixed	2014-09-09 16:50:02 -07:00
yangxiao	cf9094207a	merge cocos	2014-09-09 16:00:55 +08:00
andyque	6a4397a3eb	change toolset from 12.0 to 4.0	2014-09-09 15:57:21 +08:00
minggo	905c429ff5	remove unneeded code	2014-09-09 10:58:07 +08:00
minggo	31c508ef6d	deprecated Node::_setZOrder()	2014-09-09 10:55:27 +08:00
minggo	6b99ce6ec0	Merge pull request #7939 from minggo/remove-_setLocalZOrder ... remove Node::_setLocalZOrder()	2014-09-09 10:49:09 +08:00
andyque	d6b96d1e46	add chipmunk to wp project	2014-09-06 13:28:00 +08:00
andyque	2a8601ee1f	Merge branch 'addChipmunkStaticLib' of github.com:andyque/cocos2d-x into addChipmunkStaticLib	2014-09-05 15:43:59 +08:00
huangshiwu	01358f0b62	fix wp8 compile error and modify default resource path	2014-09-05 15:43:08 +08:00
andyque	08c7f32627	add chipmunk static library for win32	2014-09-05 15:38:12 +08:00
huangshiwu	7372604f7f	fix wp8 compile error and modify default resource path	2014-09-05 11:21:08 +08:00
yangxiao	8da7a4b2de	merge cocos reslove conflict	2014-09-04 17:40:14 +08:00
minggo	43e2b39bc0	Merge pull request #7921 from dabingnn/v3_trianglesCommand ... V3 triangles command	2014-09-04 13:58:50 +08:00
minggo	6539ff293d	Merge pull request #7940 from andyque/fixVs2013CompileError ... Fix vs2013 compile error	2014-09-04 13:41:15 +08:00
Huabing.Xu	4ae2d6fc90	Merge branch 'v3' into v3_trianglesCommand ... Conflicts: cocos/2d/libcocos2d.vcxproj.filters	2014-09-04 11:27:12 +08:00
andyque	3451672365	restore some configs	2014-09-04 10:49:45 +08:00
Ricardo Quesada	047025696c	Merge pull request #7680 from andyque/fixNormalizedPosition ... fix normalizedPosition bug	2014-09-03 10:07:22 -07:00
andyque	87af0ecdd6	add back libbox2d and libspine project to our solution	2014-09-03 17:37:34 +08:00
minggo	5cca8cc87d	remove Node::_setLocalZOrder()	2014-09-03 17:26:50 +08:00
yangxiao	bb90fe48ef	merge cocos	2014-09-03 16:54:17 +08:00
andyque	2e27a6865f	update project to vs2013	2014-09-03 14:10:38 +08:00
minggo	eee9ac626a	Merge pull request #7815 from andyque/mergeExtensionEditBox ... merge extension EditBox to ui module	2014-09-03 11:25:10 +08:00
minggo	9351caaa58	Merge pull request #7927 from andyque/fixTransitionSceneStencilBuffer ... fix transition scene stencil buffer	2014-09-03 10:26:28 +08:00
andyque	fab9a0052b	fix normalizedPosition bug	2014-09-03 09:16:31 +08:00
andyque	dafbf28283	fix release mode compile error	2014-09-02 16:42:23 +08:00
andyque	fadfa87afd	fix vs2013 compile error	2014-09-02 16:42:04 +08:00
andyque	dffdef1118	fix transition scene stencil buffer	2014-09-02 11:21:11 +08:00
andyque	6dc45f86e4	fix windows compile error	2014-09-02 10:05:22 +08:00
Huabing.Xu	6824453804	windows work for trianglesCommand	2014-09-01 15:08:09 +08:00
Ricardo Quesada	2c068cd1f5	Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme ... Adds MARK: TODO: FIXME: in code	2014-08-29 12:55:14 -07:00
Ricardo Quesada	c149bfca00	Adds MARK: TODO: FIXME: in code ... Replaces XXX with FIXME: Xcode 6 beta 4 supports this new format	2014-08-29 12:54:24 -07:00
songchengjiang	34070677ad	Added testing Model Number	2014-08-29 17:11:18 +08:00
minggo	826e1018cb	fix conflict	2014-08-29 16:55:09 +08:00
minggo	afaea360fd	Merge pull request #7908 from dabingnn/v3_fix_bugs ... V3 fix bugs	2014-08-29 16:45:52 +08:00
minggo	444b298028	fix compiling error on windows	2014-08-29 16:44:20 +08:00
minggo	e4920ffdea	fix conflict	2014-08-29 15:45:21 +08:00
minggo	3679d66c8e	remove unneeded includes	2014-08-29 15:39:52 +08:00
songchengjiang	43eb725c27	resolve conflict	2014-08-29 11:02:34 +08:00
songchengjiang	701d70fb6c	Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard ... Conflicts: cocos/2d/libcocos2d.vcxproj.filters	2014-08-29 10:58:04 +08:00
minggo	a125ed0453	Merge pull request #7906 from Teivaz/v3_WP8 ... [WP8] Fixed project compilation.	2014-08-29 10:03:25 +08:00
Huabing.Xu	7c870cfcc1	fix skew matrix bug	2014-08-29 09:50:26 +08:00
Ricardo Quesada	20d22a1c8a	Users new `// MARK: ` feature to mark sections ... Instead of using `#praga mark` which was not compatible with other compilers, it uses the `// MARK:` which is compatible with all compilers	2014-08-28 14:56:15 -07:00
teivaz	1d08acac08	* [WP8] Fixed project compilation. Removed references to deleted source files	2014-08-28 13:47:14 +03:00
minggo	50a2cb2b86	remove unneeded includes	2014-08-28 17:32:23 +08:00
minggo	7baf873bf6	remove unneeded includes	2014-08-28 17:03:29 +08:00
minggo	6a8270f33b	Merge pull request #7900 from minggo/setposition-optimize ... not create Vec as possible for setting position	2014-08-28 14:31:54 +08:00
minggo	681c3c06f1	Merge pull request #7558 from newnon/v3_actions_by_tag_improvements ... stopAllActionsByTag && removeAllActionsByTag	2014-08-28 14:24:37 +08:00
minggo	9fb977ff99	not create Vec as possible for setting position	2014-08-28 11:41:18 +08:00
yangxiao	74f98b36d6	merge cocos	2014-08-28 09:22:57 +08:00
Ricardo Quesada	3dda35b4ef	Adds `std::nothrow` to `new` ... Since cocos2d-x doesn't support exceptions, it is important to add `std::nothrow` to all the `new` statements	2014-08-27 16:31:57 -07:00
minggo	17ab047b7d	fix compiling error on windows	2014-08-27 15:13:41 +08:00
minggo	04bfbdd5a1	fix conflict	2014-08-27 13:50:01 +08:00
minggo	d0ca9a4da5	remove unneeded include header files	2014-08-27 13:39:50 +08:00
minggo	ac029c3d0d	Merge pull request #7887 from super626/v3 ... 2d cull only for default camera	2014-08-27 13:39:13 +08:00
yangxiao	26f7345693	2d cull only for default camera	2014-08-27 12:09:23 +08:00
samuele3hu	33fd605a16	Adjust libcocos2d and libluacocos2d on the win32 platform and adjust related test cases.	2014-08-27 10:18:44 +08:00
minggo	b9c51e6994	remove unneeded codes	2014-08-26 18:19:28 +08:00
yangxiao	7d6b8ea706	merge cocos	2014-08-26 14:58:58 +08:00
yangxiao	03390a4f46	merge cocos	2014-08-26 14:05:59 +08:00
samuele3hu	07cf4d3526	Fix the win32 and android compile error	2014-08-25 14:10:13 +08:00
samuele3hu	74624f5ba1	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module	2014-08-25 11:52:52 +08:00
samuele3hu	893e0b0a08	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj	2014-08-25 11:45:29 +08:00
minggo	e5ac6e204b	Merge pull request #7864 from minggo/module-devide ... Module devide	2014-08-25 11:01:19 +08:00
minggo	e7050486d3	fix conflict	2014-08-24 18:56:51 +08:00
minggo	030f80a257	one static library for c++ and another one for lua-binding	2014-08-24 03:52:51 -07:00
zii	e8a5fc9fef	Update CCActionManager.cpp	2014-08-23 17:06:46 +08:00
zii	4763531085	Update CCActionManager.cpp	2014-08-23 17:03:26 +08:00
minggo	0701fe1dfb	Merge pull request #7853 from super626/v3 ... Better reskin model support	2014-08-22 19:18:47 +08:00
samuele3hu	d1b4d43a0b	Remove CCModuleManager.h/cpp and adjust the related project	2014-08-22 15:10:46 +08:00
samuele3hu	70cba1f64a	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module ... Conflicts: cocos/Android.mk	2014-08-22 14:01:17 +08:00
samuele3hu	2f60e610a2	Integrate libcocosdenshion,libcocos3d,libnetwork,libcocostudio and libextension into cocos2d on the iOS/Mac platform	2014-08-22 13:49:21 +08:00
minggo	a0b19db670	Merge pull request #7840 from minggo/fix-warning ... fix warnings	2014-08-22 13:41:31 +08:00
yangxiao	7818b28ee3	Merge branch 'newcode' into v3	2014-08-22 13:32:57 +08:00
andyque	84cf0ee834	add disableCascadeOpacity to ProtectedNode and Scale9Sprite	2014-08-22 11:49:39 +08:00
minggo	2afbc7a698	fix warnings	2014-08-21 16:21:23 +08:00
pandamicro	34b93a24ff	Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into 3.2-cocos-engine-PR ... Conflicts: cocos/platform/desktop/CCGLViewImpl.h	2014-08-21 16:07:19 +08:00
pandamicro	909dd0d397	Update #3897: Refactor missed protected constructors	2014-08-21 15:11:33 +08:00
teivaz	aecdb832a2	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3	2014-08-21 13:48:05 +03:00
teivaz	a70688dc96	+ [WINRT] Inserted newly added files to cocos WIN RT project	2014-08-21 13:47:53 +03:00
yangxiao	c26a81bb55	Merge branch 'newcode' into v3	2014-08-21 09:53:06 +08:00
yangxiao	fcf4d79b06	setGLProgramState support	2014-08-20 19:01:04 +08:00
minggo	bbf5c56e83	Merge pull request #7827 from andyque/ccRandom ... add c++11 random library support	2014-08-20 13:35:12 +08:00
andyque	34629f1014	fix windows & win8 & wp8 compile error	2014-08-20 12:02:12 +08:00
Sergey	055a143f9d	Label performance problem	2014-08-19 15:02:09 +04:00
teivaz	db805ee2c8	* Fixed WP8 cocos library project ... * Fixed profiling macros	2014-08-19 19:24:56 +03:00
minggo	22fa650bbf	Merge pull request #7807 from samuele3hu/v3_3_3d_module ... Split 3d module from cocos2d and adjust related cpp and Lua project setting on the different platforms except wp8	2014-08-18 22:38:58 +08:00
samuele3hu	6259aebdab	Split cocos3d from cocos2d on the android、win32 and linux platform and adjust the related test project	2014-08-17 23:45:56 +08:00
songchengjiang	2b1efc59cb	GLProgram Added Light Shader ... GLProgram Added Normal Matrix	2014-08-15 19:15:14 +08:00
Dmitry Bushtets	1257f642c7	- added export to dll for: ZipFile, CGAffineToGL, GLToCGAffine, XXH32 (in .def file)	2014-08-15 13:20:37 +03:00
songmiao	08a4ebba06	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into billboard ... Conflicts: cocos/2d/libcocos2d.vcxproj.filters tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h	2014-08-15 17:43:04 +08:00
songmiao	361770e0f3	add BillBorad and BillBoardTest	2014-08-15 16:15:29 +08:00
minggo	f2f8035724	Merge pull request #7708 from super626/obb ... AABB, OBB	2014-08-15 15:32:14 +08:00
songchengjiang	1e9c02dfa3	Added Light Class	2014-08-15 14:51:23 +08:00
minggo	aa052eb1c1	add CCModuleManager into vs project	2014-08-15 14:39:15 +08:00
songchengjiang	7ed40a8051	Added Light	2014-08-15 10:32:07 +08:00
teivaz	90e5870499	* Fixed WP compilation errors (added CCPrimitive, CCPrimitiveCommand, CCVertexIndexBuffer and CCVertexIndexData to the project)	2014-08-14 15:35:36 +03:00
teivaz	885fd16b9e	* Fixed WP8 compilation error (Added missing files CCCamera.h/cpp to the project)	2014-08-14 15:20:48 +03:00
teivaz	e9563696db	* Fixed WP8 compilation errors (added path to CCGLView.h) ... - Modified filters for CCCamera.h/cpp	2014-08-14 15:14:25 +03:00
yangxiao	a508477eda	remove unused code	2014-08-14 19:07:40 +08:00
yangxiao	2786e63824	Merge branch 'newcode' into obb	2014-08-14 18:58:46 +08:00
yangxiao	ab783d2702	merge cocos2d	2014-08-14 17:12:39 +08:00
yangxiao	1942a27a5c	Merge branch 'newcode' into v3_merge	2014-08-14 13:55:57 +08:00
yangxiao	032ba062a9	rename isVisibleByVisitingCamera to isVisitableByVisitingCamera	2014-08-14 10:26:37 +08:00
minggo	f9e6dab507	Merge pull request #7770 from Dhilan007/v3-label-issue ... close issue#5734:Label:The letters sometimes slightly cut.	2014-08-14 10:04:00 +08:00
yangxiao	4629d257e1	rename checkCameraMask to isVisibleByVisitingCamera	2014-08-14 09:58:11 +08:00
minggo	e468beea86	Merge pull request #7760 from dabingnn/v3_addCallBackForRenderTexture ... add comment for the limit of RenderTextue::saveToFile	2014-08-14 09:43:54 +08:00
minggo	0b86e129b0	Merge pull request #7762 from andyque/addAlignmentToUILabel ... add UITextField color & place hold color, fix double delete bug	2014-08-14 09:38:57 +08:00
minggo	7d2ca95988	Merge pull request #7749 from zawasp/virtual_pause_resume ... virtual Node::pause() / Node::resume()	2014-08-14 09:31:10 +08:00
Dhilan007	ff147b6cf8	close issue#5734:Label:The letters sometimes slightly cut.	2014-08-13 18:40:35 +08:00
yangxiao	76329f9e53	add camera mask check to visit	2014-08-13 12:06:51 +08:00
andyque	e2d609c05d	add UITextField color & place hold color, fix double delete bug	2014-08-13 11:28:37 +08:00
Huabing.Xu	5b99ee71c1	add comment for the limit of RenderTextue::saveToFile	2014-08-13 10:14:26 +08:00
minggo	d223629477	Merge pull request #7754 from dabingnn/v3_addCallBackForRenderTexture ... add callback for RenderTexture::saveToFile	2014-08-13 10:05:08 +08:00
Mircea Rila	0154f7a94a	virtual Node::pause() / Node::resume()	2014-08-12 21:05:09 +03:00
yangxiao	5ce9afbd69	create default camera at Scene constructor	2014-08-12 23:34:06 +08:00
yangxiao	46e59f1150	Merge branch 'newcode' into v3_merge	2014-08-12 17:34:58 +08:00
minggo	46cdd6f8dd	Merge pull request #7701 from dabingnn/v3_renderPrimitive ... V3 render primitive	2014-08-12 16:11:40 +08:00
yangxiao	32645c1622	fix default camera, add listener for projection change	2014-08-12 14:42:08 +08:00
Huabing.Xu	1145859d38	remove commented codes	2014-08-12 11:44:06 +08:00
Huabing.Xu	3a7b673164	add callback for RenderTexture::saveToFile	2014-08-12 10:50:57 +08:00
boyu0	790ef9e818	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into feature5537_physics_step ... Conflicts: tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.h	2014-08-12 10:20:34 +08:00
minggo	b34e97cfd6	Merge pull request #7729 from andyque/fixCascadedColor ... fixed Widget's Children reload textures change RGBA issue	2014-08-11 15:33:36 +08:00
andyque	cdb2b9f59f	fixed Widget's Children reload textures change RGBA issue	2014-08-11 15:04:00 +08:00
minggo	43a3603a8b	Merge pull request #7720 from samuele3hu/v3_module ... Modify the mechanism that files copy to lua-empty-test and lua-template and fix some bugs	2014-08-11 15:01:28 +08:00
Huabing.Xu	6aff707eab	windows work now for renderPrimitive	2014-08-11 14:18:07 +08:00
yangxiao	fd314261b7	Merge branch 'newcode' into obb	2014-08-11 13:21:44 +08:00
Huabing.Xu	2a28744dc5	Merge branch 'v3' into v3_renderPrimitive	2014-08-11 12:48:23 +08:00
yangxiao	6d15c26a61	move create default camera to Scene::initWithSize	2014-08-11 10:55:14 +08:00
yangxiao	2576622778	move create camera to Scene::initWithSize	2014-08-11 10:07:23 +08:00
minggo	437257e7e6	Merge pull request #7683 from andyque/fixWidgetDefaultCascadColorAndOpacity ... Let Widget class don't support cascaded opacity and cascaded color on default.	2014-08-11 09:37:51 +08:00
jimmystar	63c9780c49	Update CCScene.cpp ... in line 157, here need to create and add camera, if not ,in the function createWithPhysics, will show black screen.	2014-08-09 17:37:18 +08:00
samuele3hu	2dacbf6f26	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module	2014-08-08 16:59:33 +08:00
yangxiao	ceb6549ec8	merge cocos2d	2014-08-08 16:25:52 +08:00
minggo	213f2f5a6c	Merge pull request #7702 from super626/v3_merge ... Camera and Camera test	2014-08-08 15:56:38 +08:00
yangxiao1	61eaa082a2	fix windows	2014-08-08 15:33:30 +08:00
samuele3hu	6aa667c912	Add CC_DLL for FontFNT	2014-08-08 15:22:43 +08:00
lvlong	fe58c43b2d	add abb and obb to vc2012-project	2014-08-08 14:06:54 +08:00
yangxiao	4dce59582b	visiting camera	2014-08-08 11:49:59 +08:00
minggo	800ab18457	Merge pull request #7700 from GavinThornton/patch-1 ... Update CCSpriteBatchNode.cpp	2014-08-08 11:49:39 +08:00
minggo	b9e84370f6	Merge pull request #7699 from huangshiwu/v3_wp8fix ... V3 wp8fix	2014-08-08 11:49:02 +08:00
minggo	2f638c67fd	Merge pull request #7598 from AppleJDay/master ... Add Feature :EventMouse should support getDelta, getDeltaX, getDelt...	2014-08-08 10:43:32 +08:00
huangshiwu	8ee4340db3	fix winrt complie error	2014-08-07 18:38:11 +08:00
Huabing.Xu	ba2ae6826c	Merge branch 'v3_migrateFastTMX' into v3_renderPrimitive	2014-08-07 15:36:41 +08:00
GavinThornton	8cc5e66e73	Update CCSpriteBatchNode.cpp ... Setting opacity of a sprite (via setOpacity or FadeOut/In action) has the sprite turning black, it should simply be opaque. Cause is in bool SpriteBatchNode::initWithTexture, third line, "if(tex->hasPremultipliedAlpha())" Fix is making it "!if(!tex->hasPremultipliedAlpha())"	2014-08-07 00:31:33 -07:00
yangxiao	3c9483899e	camera, cameratest, drawNode3D squash	2014-08-07 15:23:31 +08:00
huangshiwu	0016c7af70	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_wp8fix	2014-08-07 11:58:01 +08:00
huangshiwu	24d68305e1	WP8 compile fix	2014-08-07 11:56:28 +08:00
minggo	7b11c6a74e	Merge pull request #7237 from martell/v3 ... Cmake update and remove old scripts from build folder	2014-08-07 10:36:10 +08:00
minggo	4542b1882d	Merge pull request #7617 from rny/SpriteFrameCache ... SpriteFrameCache load from plist file content data	2014-08-07 10:20:36 +08:00
martell	75911658aa	Make CMake More Robust	2014-08-06 15:43:19 +01:00
andyque	ab33e6f9a2	Let Widget class don't support cascaded opacity and cascaded color on default.	2014-08-06 16:21:00 +08:00
minggo	6ee0c4171f	Merge pull request #7622 from rny/LabelTTF ... fix LabelTTF::getBoundingBox() position error	2014-08-06 14:33:28 +08:00
minggo	f786190349	Merge pull request #7652 from zhiqiangxu/labelbmfont_getboundingbox ... bug fix for LabelBMFont::getBoundingBox()	2014-08-06 14:28:52 +08:00
andyque	e2e8325f58	add safe guard when remove component from node componentContainer	2014-08-06 13:51:16 +08:00
minggo	9f51adfafa	Merge pull request #7461 from joshuastray/fix_constructor_access ... fix LabelAtlas constructor protected to CC_CONSTRUCTOR_ACCESS	2014-08-06 10:15:02 +08:00
Huabing.Xu	b1954ef516	clean up primitive code	2014-08-05 17:49:35 +08:00
Huabing.Xu	01b69c9e4f	Merge branch 'v3' into v3_migrateFastTMX	2014-08-05 17:30:11 +08:00
Huabing.Xu	56551e6787	fast_tmx migrate to primitive command	2014-08-05 15:08:01 +08:00
minggo	1bad9ddbc2	Merge pull request #7657 from huangshiwu/v3_wp8glviewhookpr ... V3 wp8glviewhookpr	2014-08-05 13:51:15 +08:00
minggo	cd98034f16	Merge pull request #7631 from maltium/v3 ... added 3D rotation support to the RotateTo action	2014-08-05 13:30:43 +08:00
Huabing.Xu	f7ad98b15b	using primitve->draw in Fast_tmx on draw	2014-08-04 17:57:31 +08:00
huangshiwu	9c87522199	little more modefy	2014-08-04 17:34:50 +08:00
huangshiwu	9a3f231771	merge v3 into v3_wp8glviewhookpr	2014-08-04 16:49:42 +08:00
Huabing.Xu	414d67851f	add _vertexBuffer back in Fast_tmx	2014-08-04 16:36:20 +08:00
Huabing.Xu	bbf11f5d06	refactor vertex data ... using vertex data in fast_tmx	2014-08-04 16:08:54 +08:00
huangshiwu	efcb8b9962	wp8 glview hook solution 1	2014-08-04 14:17:14 +08:00
yangxiao	4452d9579a	merge cocos2d, fix lua	2014-08-04 12:07:27 +08:00
Huabing.Xu	a44f4c95e1	using indexBuffer instead of raw VBO	2014-08-04 10:40:07 +08:00
huangshiwu	372479d812	wp8 GLView Hook	2014-08-02 16:31:16 +08:00
xuzhiqiang	85dd898319	bug fix	2014-08-02 08:04:29 +08:00
Huabing.Xu	3d4bfe7780	using VertexBuffer instead of raw buffer	2014-08-01 17:50:22 +08:00
AppleJDay	2239fafade	Merge branch 'v3' of github.com:AppleJDay/cocos2d-x	2014-08-01 17:22:43 +08:00
huangshiwu	575c9787c0	Merge branch 'v3' into v3_pr ... Conflicts: cocos/2d/libcocos2d.vcxproj.filters	2014-08-01 15:11:34 +08:00
AppleJDay	bcecf09b6c	Merge branch 'v3' of git@github.com:AppleJDay/cocos2d-x.git	2014-08-01 09:18:22 +08:00
maltium	baba808391	RotateBy action now uses just Vec3() to keep track of the state	2014-07-31 23:28:33 +02:00
maltium	98354e9f8e	RotateTo action now uses Vec3() to keep track of the state	2014-07-31 23:05:58 +02:00
yangxiao	e03d284e26	merge cocos2d	2014-07-31 18:55:41 +08:00
zhangbin	d224c77bd4	Move the CCProtectedNode.cpp & .h from ui to cocos2d on wp8.	2014-07-31 17:51:06 +08:00
samuele3hu	ee4e479ce1	Remove CCProtectedNode.h/.cpp from ui/base to 2d and modify the related project setting	2014-07-31 16:38:55 +08:00
songmiao	58c32e52c7	windows works	2014-07-31 14:08:05 +08:00
maltium	3d44439e2a	added 3D rotation support to the RotateTo action	2014-07-30 21:42:47 +02:00
huangshiwu	ef69faf3ba	GLView Hook	2014-07-31 00:53:04 +08:00
Ningyu	d53cdc39df	tab to spaces	2014-07-30 16:20:58 +08:00
Ningyu	52ca596b3d	code tidy	2014-07-30 16:19:05 +08:00
Ningyu	61a87e7e8b	fix LabelTTF::getBoundingBox() position error	2014-07-30 14:00:01 +08:00
Ningyu	aebe8317bd	spaces	2014-07-29 17:22:13 +08:00
Ningyu	d5242ef4fa	add ... SpriteFrameCache::addSpriteFramesWithFileContent() SpriteFrameCache::removeSpriteFramesFromFileContent()	2014-07-29 17:06:43 +08:00
Ningyu	23e0ed3767	add ... SpriteFrameCache::addSpriteFramesWithFileContent() SpriteFrameCache::removeSpriteFramesFromFileContent()	2014-07-29 16:58:33 +08:00
Huabing.Xu	ea802580a2	add script to copy sqllite3.dll to output dir on windows	2014-07-29 15:02:34 +08:00
minggo	5d63ce17ad	Merge pull request #7610 from dabingnn/v3_windowChangeModule ... V3 window change module	2014-07-29 14:29:01 +08:00
boyu0	c63d64e385	set emission rate when setTotalParticles()	2014-07-29 10:48:20 +08:00
Huabing.Xu	aaa65dcae4	Merge branch 'v3' into v3_windowChangeModule	2014-07-29 10:20:23 +08:00
AppleJDay	0bd4b608b7	Merge pull request #1 from cocos2d/v3 ... Merge pull request #7604 from minggo/xcode-project-fix Xcode project fix	2014-07-29 08:34:15 +08:00
Huabing.Xu	4a4f05c827	change cocos2d to libcocos2d for windows	2014-07-28 20:55:58 +08:00
minggo	7ad7b5b3f7	Merge pull request #7585 from wagulu/patch-1 ... Update CCParticleSystem.cpp	2014-07-28 10:54:05 +08:00
AppleJDay	bd5ca6a244	Add Feature #5633:EventMouse should support getDelta, getDeltaX, getDeltaY functions	2014-07-28 10:39:35 +08:00
Dhilan007	b9cfa4a8b5	fix warn	2014-07-25 14:38:02 +08:00
LiuZhuo	2f10e8e468	Update CCParticleSystem.cpp	2014-07-25 11:40:23 +08:00
Huabing.Xu	58cd01b2f6	reverse cocos2d.vcxproj	2014-07-24 10:37:54 +08:00
wagulu	46ac5d12b2	Update CCParticleSystem.cpp ... diff is base on WorldSpace, when you scale scene,you will get the wrong value.	2014-07-23 21:04:17 +08:00
minggo	3662077025	Merge pull request #7556 from Dhilan007/v3 ... fixed FontAtlasCache::getFontAtlasCharMap may returns the same instance when using different arguments.	2014-07-23 11:29:26 +08:00
LinWenhai	0fe02b3636	Update CCFontAtlasCache.cpp	2014-07-22 22:07:19 +08:00
LinWenhai	815d063a0a	replace sprintf with snprintf	2014-07-22 22:05:56 +08:00
Sergey	84e82bf497	stopAllActionsByTag && removeAllActionsByTag	2014-07-22 17:14:27 +04:00
Sergey	2acce6771f	software per decompression support	2014-07-22 15:49:36 +04:00
Dhilan007	f38b48914f	fixed FontAtlasCache::getFontAtlasCharMap may returns the same instance when using different arguments.	2014-07-22 18:31:53 +08:00
zhangcheng	6cfc5b72dc	1. CocosStudio adapt to cocos2d-x v3.2.	2014-07-21 17:45:56 +08:00
Huabing.Xu	e666ab88ed	fix windows compile error	2014-07-21 14:59:47 +08:00
Jialong Zhai	012f5403d9	protected -> CC_CONSTRUCTOR_ACCESS	2014-07-21 11:17:58 +08:00
Huabing.Xu	23db16b0bd	convert indention to space	2014-07-18 14:53:00 +08:00
Huabing.Xu	8afd7614d1	Merge branch 'v3' into v3_dll	2014-07-18 14:01:17 +08:00
minggo	462f9bdd78	Merge pull request #7502 from visiblelight/render_texture_disabled ... The orientation of render texture should be rotated	2014-07-17 20:09:01 +08:00
visiblelight	7e7c3aeb1c	The orientation of render texture should be rotated when _keepMatrix is true	2014-07-17 19:53:35 +08:00
Huabing.Xu	52ac47aea8	Merge branch 'v3' into v3_dll	2014-07-17 18:27:36 +08:00
minggo	91a537dec6	Merge pull request #7493 from visiblelight/render_texture_disabled ... no need to save/restore for render texture when entering background	2014-07-17 17:07:54 +08:00
vision	a2413a6538	no need to save/restore for render texture when entering background	2014-07-17 17:03:10 +08:00
minggo	c482e2e14f	Merge pull request #7491 from Dhilan007/v3-320final ... fixed text line wrap issue in UITextField.	2014-07-17 16:48:41 +08:00
Dhilan007	8ac1398037	fixed text line wrap issue in UITextField.	2014-07-17 16:23:38 +08:00
Huabing.Xu	3c6e87d34e	Merge branch 'v3' into v3_dll ... Conflicts: cocos/base/ccUtils.h	2014-07-17 14:12:10 +08:00
andyque	4f5cd2a368	change FastTileMap to TileMap	2014-07-17 14:09:53 +08:00
andyque	880c2c4c3f	change FastTiledMap namespace to cocos2d::experimental	2014-07-17 10:46:20 +08:00
minggo	2403bc2e50	Merge pull request #7343 from zhouxiaoxiaoxujian/feature/COC-10 ... Add getChildByName method for get a node that can be cast to Type T	2014-07-17 10:02:57 +08:00
Huabing.Xu	a0be6d9ac7	remove Storage project, merge code into cocos2d	2014-07-16 14:49:05 +08:00
joshuastray	190460018f	use CC_CONSTRUCTOR_ACCESS in ParallaxNode	2014-07-16 11:40:09 +08:00
Huabing.Xu	0350186589	Merge branch 'v3' into v3_dll	2014-07-16 11:15:16 +08:00
joshuastray	da9563f623	fix LabelAtlas constructor to CC_CONSTRUCTOR_ACCESS	2014-07-15 15:26:37 +08:00
Huabing.Xu	63de5f6acc	add CC_DLL	2014-07-15 12:00:31 +08:00
Huabing.Xu	8bbce767f3	add CC_DLL for ActionEase	2014-07-14 22:42:44 +08:00
Dhilan007	5e10575ab0	disable warn on zero-sized structures.	2014-07-14 17:53:55 +08:00
Huabing.Xu	9806b37398	add CC_DLL of DrawPrimitive	2014-07-14 17:40:02 +08:00
minggo	981922eb95	Merge pull request #7432 from joshuastray/transition_ctor_access ... move constructors and destructors to CC_CONSTRUCTOR_ACCESS and add needed constructors for js bindings	2014-07-14 16:28:18 +08:00
Huabing.Xu	52c0bd365b	add chipmunk.lib for release	2014-07-14 14:47:00 +08:00
Huabing.Xu	469dbea7da	window dll version work now	2014-07-14 14:40:47 +08:00
joshuastray	98b1c0bbed	add needed constructors for js bindings	2014-07-14 14:25:36 +08:00
joshuastray	e14c2587b5	move constructors and destructors to CC_CONSTRUCTOR_ACCESS	2014-07-14 14:25:06 +08:00
minggo	cfc291e49d	Merge pull request #7379 from joshuastray/v3 ... move JumoTo's copy constuctor and operator= to private	2014-07-12 20:19:03 +08:00
Dhilan007	d8cdb75851	Fix compile errors on WP8	2014-07-11 15:10:19 +08:00
minggo	6c37541657	Merge pull request #7363 from Dhilan007/v3-event-clear ... Dispatch EVENT_RENDERER_RECREATED event when renderer was recreated on android/wp8.	2014-07-11 13:36:52 +08:00
Huabing.Xu	60dd7a4514	Merge branch 'v3' into v3_dll	2014-07-11 11:10:26 +08:00
Huabing.Xu	f5cffba6c9	change pure virtual function to virtual function in action series ... remove unimplemented function to deprecated and give an empty implementation add CC_DLL to Vec2	2014-07-11 10:19:49 +08:00
joshuastray	7396f447a4	move initWithDuration to CC_CONSTRUCTOR_ACCESS	2014-07-10 17:56:20 +08:00
minggo	831b0b332b	Merge pull request #7371 from minggo/enumerateChildren-fix ... Node::enumerateChildren just searches from itself	2014-07-10 15:46:04 +08:00
minggo	c7856b21fd	Merge pull request #7366 from Dhilan007/v3-fixed-warn ... fixed warn and replace NULL with nullptr.	2014-07-10 15:42:02 +08:00
joshuastray	30574af6c5	move JumoTo's copy constuctor and operator= to private	2014-07-10 14:30:08 +08:00
minggo	0ba3f6c1c9	Merge pull request #7376 from joshuastray/v3 ... use CC_CONSTRUCTOR_ACCESS to replace protected/private	2014-07-10 14:14:08 +08:00
joshuastray	6b22870e27	use CC_CONSTRUCTOR_ACCESS to replace protected	2014-07-10 14:00:23 +08:00
minggo	316564d58a	Node::enumerateChildren just searches from itself	2014-07-10 11:07:39 +08:00
Dhilan007	6cff8cb564	fixed warn and replace NULL with nullptr.	2014-07-10 00:45:27 +08:00
Dhilan007	dbcb20b886	Dispatch EVENT_RENDERER_RECREATED event when renderer was recreated on android/wp8. ... Make clear EVENT_COME_TO_FOREGROUND event.	2014-07-09 23:03:04 +08:00
minggo	f7af8938bd	Merge pull request #7277 from darkdukey/fix_rotation3D ... Fix setRotation3D	2014-07-08 22:05:27 +08:00
Dhilan007	10defddc2e	fixed memory leak cause by singleton.	2014-07-08 18:22:48 +08:00
Frank.Xu	5db9fa6e4b	Add getChildByName method for get a node that can be cast to Type T	2014-07-08 15:58:34 +08:00
Dhilan007	e31abe3f54	fixed opacity issue in SpriteBatchNode.	2014-07-08 14:08:53 +08:00
Dale Stammen	021ee7d1e7	check if _itemsPerRow == 0 to avoid divide by zero	2014-07-07 11:17:05 -07:00
Dale Stammen	fa62f4273f	fixed missing zlib.h header path	2014-07-07 10:14:57 -07:00
mannewalis	f238593bfb	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 ... # By chuanweizhang2013 (30) and others # Via chuanweizhang2013 (19) and others * 'v3' of https://github.com/cocos2d/cocos2d-x: (78 commits) fix ui::Helper::seekWigetByName can not find pages in pageview [AUTO][ci skip]: updating cocos2dx_files.json add const for getter. fixed redefinition of 'registerListeners' Update CCController-android.cpp fixed missing function issue #4689: Refactoring game controller API[ios] Add resources version1.2 Remove useless codes Refactoring game controller API should not include android cpp files in win/wp project Remove useless codes Remove useless codes Add Lua bindings for utils and CaptureScreen test case revert Android.mk issue #4689: Refactor controller API. add setXXTEAKeyAndSign fix indent problems initialize member variable fix windows compile and running error ...	2014-07-05 12:26:44 -07:00
minggo	83b7dccdfc	Merge pull request #7314 from joshuastray/fix_win_proj ... should not include android cpp files in win/wp project	2014-07-04 16:51:27 +08:00
joshuastray	8ab8caf751	should not include android cpp files in win/wp project	2014-07-04 16:44:10 +08:00
minggo	95fe74a34b	Merge pull request #7299 from dabingnn/fast_tmx ... Fast tmx	2014-07-04 09:49:30 +08:00
mannewalis	4b1f2ccc91	prefixing ivars	2014-07-03 10:16:10 -07:00
mannewalis	96605f801c	prefixing ivars	2014-07-03 10:13:46 -07:00
mannewalis	69341095fe	adding accessors to the on*Callback variables	2014-07-03 09:13:52 -07:00
mannewalis	92e08265cd	changes needed for swift bindings to work	2014-07-03 08:42:06 -07:00
Huabing.Xu	0214131bb2	optimise tile map rendering	2014-07-02 17:16:03 +08:00
minggo	d8c9f6a0a6	add regular support in Node::enumerateChildren()	2014-07-02 17:07:36 +08:00
Huabing.Xu	efa452e0c4	support for fast tmx hex	2014-07-02 15:19:11 +08:00
Nite Luo	4cb59683e4	Add Sprite3DRotation test	2014-07-01 12:36:53 -07:00
Nite Luo	a81bea886e	Rotate around anchor point	2014-07-01 10:26:47 -07:00
minggo	cc3a9d0737	fix crash caused by std::regex()	2014-07-01 16:09:25 +08:00
minggo	eb6ddea26e	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix-crash	2014-07-01 10:01:24 +08:00
Dhilan007	3eea298428	unbind the VAO anyway to for safety.	2014-06-30 21:08:43 +08:00
Dhilan007	79264daf1e	fix the crash on WP8 for FastTileMapTest	2014-06-30 20:56:59 +08:00
minggo	9bcc66912a	fix crash cause by std::regex	2014-06-30 20:45:01 +08:00
Dhilan007	26f3445311	add missing files for the projects	2014-06-30 17:07:55 +08:00
Huabing.Xu	d506cf613a	fix bug for tileset searching	2014-06-30 11:08:57 +08:00
Huabing.Xu	c50394c4f3	fix merge conflitcts on windows	2014-06-29 20:30:26 +08:00
Huabing.Xu	47471e202d	Merge branch 'v3' into fast_tmx ... Conflicts: cocos/2d/cocos2d.vcxproj.filters	2014-06-29 20:23:43 +08:00
minggo	4f79176da2	Merge pull request #7234 from boyu0/iss5614_physics_transform ... closed #5614: add transform support for physics	2014-06-29 17:23:20 +08:00
Huabing.Xu	9227c4f30a	refactor updateTiles	2014-06-27 19:41:34 +08:00
Huabing.Xu	46e5b8e5bd	refactor FastTMXTiledMap::tilesetForLayer to a more elegant implementation	2014-06-27 18:28:59 +08:00
Huabing.Xu	3771654e66	remove deprecated function ... rename enum to static const member of class remove hex tile map(we do not support it yet)	2014-06-27 18:00:06 +08:00
boyu0	91126341bd	fix transform for physics.	2014-06-27 17:30:21 +08:00
Huabing.Xu	33a8b6563f	windows works for fast tmx	2014-06-27 16:56:26 +08:00
Huabing.Xu	eba84b5dea	fix wrong indentions	2014-06-27 14:45:30 +08:00
Huabing.Xu	1152f77ed7	clean up fast tmx code	2014-06-27 14:42:53 +08:00
Huabing.Xu	b232896f85	roll back fps compute logic ... fix crash bug	2014-06-27 13:41:06 +08:00
Huabing.Xu	6292ed05be	improvement for fast tmx rendering	2014-06-27 11:50:44 +08:00
Huabing.Xu	a04b5fc5d5	use custom command for fast_tmx rendering	2014-06-27 10:30:21 +08:00
yangxiao	392a769c8f	merge cocos2d v3	2014-06-26 22:48:42 +08:00
Huabing.Xu	81aa9c2c74	use custom command for rendering	2014-06-26 20:45:08 +08:00
Huabing.Xu	87e5e1460e	adjust some code to reduce indentions	2014-06-26 11:45:15 +08:00
minggo	6a3d3aa4a4	Merge pull request #7186 from billtt/v3_fixNodeSetScale ... fix a bug that Node::setScale(float) may not work properly	2014-06-25 14:41:15 +08:00
minggo	66703addb2	fixed #4693: override addChild by name	2014-06-25 11:27:48 +08:00
Huabing.Xu	c1b5984ce8	using stable sort for quads	2014-06-25 11:08:47 +08:00
Huabing.Xu	290897af14	Merge branch 'v3' into fast_tmx ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj	2014-06-25 10:10:08 +08:00
Huabing.Xu	bda9708206	clean up Fast TMX code2	2014-06-25 10:06:37 +08:00
Huabing.Xu	67f83f43b0	clean up Fast TMX code	2014-06-25 10:04:20 +08:00
minggo	7155eb4ebb	use reference instead	2014-06-24 18:23:10 +08:00
minggo	3336f7edad	use reference instead	2014-06-24 14:53:02 +08:00
Huabing.Xu	740372ceb3	new version of rendering for tile map	2014-06-24 11:04:17 +08:00
minggo	4bb6545250	Merge pull request #7166 from boyu0/bug5541_rotation_action_for_physics ... closed #5541: Add rotation action support for physics.	2014-06-24 10:46:10 +08:00
boyu0	f2ecb31958	closed #5541: add more warning for unsupported functions.	2014-06-24 10:33:21 +08:00
Zhou Yuntao	50a1449af9	fix a bug that Node::setScale(float) may not work properly if (_scaleX != _scaleY || _scaleX != _scaleZ)	2014-06-24 10:05:52 +08:00
boyu0	c40c461848	closed #5541: add warning code and comment.	2014-06-23 13:55:52 +08:00
Dale Stammen	5e1f0b5799	added missing files and tests that broke wp8 build	2014-06-20 09:07:51 -07:00
yangxiao	2a6dfaf91b	Merge branch 'newcode' into v3	2014-06-20 22:55:27 +08:00
boyu0	2fc8889791	issue #5541: change RotateTo/RotateBy for Physics.	2014-06-20 18:40:21 +08:00
Huabing.Xu	bb4128036c	use quad command for tile map rendering	2014-06-20 18:10:18 +08:00
lvlong	478ea8949a	Merge branch 'v3' of https://github.com/lvlonggame/cocos2d-x into v3 ... Conflicts: tools/bindings-generator tools/cocos2d-console	2014-06-20 16:14:46 +08:00
lvlong	69436ddd65	Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 ... Conflicts: cocos/3d/CCBundle3D.cpp cocos/3d/CCBundle3D.h cocos/3d/CCBundle3DData.h	2014-06-20 16:02:22 +08:00
zhangbin	ec62f05b12	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3	2014-06-20 10:51:13 +08:00
zhangbin	0019d9a061	Optimize the win32 projects configuration.	2014-06-20 10:50:43 +08:00
gin0606	3ae8e29ce5	Add new line at the end of a file to *.h	2014-06-19 20:45:49 +09:00
gin0606	bf4f30d14b	Add new line at the end of a file to *.cpp	2014-06-19 20:45:24 +09:00
Huabing.Xu	f82be936b5	Merge branch 'fast_tmx_copy' into fast_tmx ... Conflicts: cocos/2d/CCFastTMXLayer.cpp	2014-06-19 18:10:44 +08:00
Huabing.Xu	e03c412e71	refactor fast tmx rendering	2014-06-19 18:05:21 +08:00
boyu0	5f10ff2c29	issue #4437: change name TMXLayer2 and TMXTiledMap2 to FastTMXLayer and FastTMXTiledMap, change Point to Vec2	2014-06-19 15:57:13 +08:00
lvlong	8493c4579b	before switch branch save	2014-06-19 15:43:02 +08:00
minggo	136033c282	not set _orderOfArrival to 0 after visit	2014-06-19 15:09:27 +08:00
minggo	e60e3c217d	Merge pull request #7046 from Dhilan007/v3-label-improve ... 1.Support setting up the line height and additional kerning of label.	2014-06-19 09:44:51 +08:00
boyu0	d89c2176c3	issue #4437: add vertex z support, fix some bugs.	2014-06-18 18:19:13 +08:00
Dhilan007	9351172baf	add test case for new API of Label.	2014-06-18 18:01:55 +08:00
minggo	08453b911d	Merge pull request #7071 from pandamicro/Script_onEnter_fix ... Fixed #5563: Wrap override onEnter function by script call detection code to solve bugs in JSB	2014-06-18 13:37:57 +08:00
pandamicro	94fdff1da9	Fixed #5563: Make sendNodeEventToXXX as static functions of ScriptEngineManager in CCScriptSupport	2014-06-18 11:51:52 +08:00
minggo	6ecca08340	Merge pull request #7039 from minggo/get-child-by-name ... issue #4693: add getName(), setName() and getChildByName()	2014-06-18 11:30:14 +08:00
Dale Stammen	da9a652868	added missing files to project	2014-06-17 09:27:36 -07:00
minggo	4da24dfade	issue #4693: correct comment	2014-06-17 16:21:24 +08:00
lvlong	ef32bffceb	modify bundle3D load()	2014-06-17 13:59:03 +08:00
minggo	53963a2441	issue #4693:enumerateChildren() support regular expression	2014-06-17 11:43:03 +08:00
lvlong	ae5965f05f	test new version and modify vs2012 project	2014-06-17 10:52:55 +08:00
yangxiao	452fdc047a	Merge branch 'newcode' into v3	2014-06-16 22:36:01 +08:00
yangxiao	927d29f334	bug on Repeat when diff bigger than duration	2014-06-16 18:21:47 +08:00
pandamicro	d00c9fe70a	Fixed #5563: Add sendNodeEventToJSExtended function to fix issues and remove lua event send (unnecessary)	2014-06-16 12:50:35 +08:00
minggo	111e08062f	Merge pull request #7056 from visiblelight/render_texture ... Use RGBA when saving a file from render texture	2014-06-16 10:44:30 +08:00
yangxiao	dd8f66ce57	merge loader	2014-06-16 00:01:38 +08:00
pandamicro	d524ba1013	Fixed #5563: Wrap override onEnter function by script call detection code to solve bugs in JSB	2014-06-13 17:59:23 +08:00
vision	33fb1dd050	Make the API more extendable	2014-06-13 15:27:59 +08:00
vision	7e99121af7	Change the default pixel format from RGB to RGBA for render texture when saving as PNG.	2014-06-13 13:35:18 +08:00
boyu0	ee919b673f	issue #4437: config for android and linux.	2014-06-13 11:07:21 +08:00
pandamicro	7ccff325b6	Issue #5554: Define __NodeRGBA's constructor as CC_CONSTRUCTOR_ACCESS for JSB usage	2014-06-13 10:29:40 +08:00
lvlong	742ea7f2df	Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 ... Conflicts: cocos/2d/cocos2d.vcxproj.filters cocos/3d/CCBundle3D.cpp cocos/3d/CCBundle3D.h	2014-06-12 15:53:41 +08:00
boyu0	acb87f414e	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fast_tmx	2014-06-12 14:44:28 +08:00
Dhilan007	b2d8e4fc93	add assert.	2014-06-12 14:41:01 +08:00
boyu0	a3f32cf894	closed #5537: add setAutoStep, isAutoStep and step method for PhysicsWorld.	2014-06-12 12:45:21 +08:00
Dhilan007	3511d1e87e	1.Support setting up the line height and additional kerning of label. ... 2.Add more annotation	2014-06-12 12:01:15 +08:00
minggo	5c718e27da	Merge pull request #7044 from Dhilan007/v3-label-improve ... Ensuring release cache texture in timely.	2014-06-12 11:39:36 +08:00
minggo	05a65a68bb	issue #4693: added enumerateChildren()	2014-06-12 10:41:08 +08:00
lvlong	9fe7c1a9da	loader	2014-06-12 10:01:54 +08:00
Dale Stammen	775832a710	added missing files	2014-06-11 13:18:10 -07:00
Dhilan007	7cc3879257	Ensuring release cache texture in timely.	2014-06-11 22:03:10 +08:00
minggo	8a5bfb9840	issue #4693: add getName(), setName() and getChildByName()	2014-06-11 16:57:43 +08:00
pandamicro	8bc531a0fb	Fixed #5533: Fix usage of new SpriteFrame in engine	2014-06-10 12:04:20 +08:00
pandamicro	92a33225ff	Fixed #5533: Make SpriteFrame's constructor and init functions public temporarily to avoid issues	2014-06-10 11:39:48 +08:00
pandamicro	bb7cf801e6	Fixed #5533: Add SpriteFrame's constructor and make constructor & init functions protected	2014-06-10 11:28:34 +08:00
minggo	0ca9a98f4a	Merge pull request #6920 from minggo/orrderOfArrival ... don't have to set _orderOfArrival to 0 after visit	2014-06-10 10:28:38 +08:00
minggo	9517f9b852	Merge pull request #6996 from newnon/v3_setparent_fix ... move node from one parent to another fix	2014-06-09 17:13:59 +08:00
boyu0	3975f55de7	issue #4437: fix crash when doesn't support VAO, and make calculation more precisely.	2014-06-09 15:28:49 +08:00
boyu0	dff0fada28	issue #4437: fix some bugs.	2014-06-09 11:36:44 +08:00
Dhilan007	4e0759533b	close issue#5158:Label's display may go bonkers if using outline feature.	2014-06-09 10:12:22 +08:00
Sergey	904f157c2c	move node from one parent to another fix	2014-06-07 12:25:20 +04:00
boyu0	fc5e58b521	issue #4437: add dirty tag.	2014-06-06 18:03:44 +08:00
boyu0	560053d23c	issue #4437: add test and fix transform.	2014-06-06 17:33:27 +08:00
boyu0	a8a5f6b230	issue #4437: add new tmx.	2014-06-06 16:15:46 +08:00
Ricardo Quesada	79ebc546f8	Merge remote-tracking branch 'cocos2d/v3' into normalized_position ... Conflicts: CHANGELOG cocos/ui/UILayout.cpp	2014-06-04 09:19:22 -07:00
andyque	d1e664fd44	fix win7 compile error	2014-06-04 15:43:53 +08:00
minggo	5432698674	Merge pull request #6969 from boyu0/bug5482_setPhysicsBody ... closed #5482: Node::setPhysicsBody() doesn't work after node added to another node.	2014-06-04 13:52:43 +08:00
boyu0	dd0eecb905	closed #5482: fix issue: Node::setPhysicsBody() doesn't work after node added to other node.	2014-06-04 11:58:04 +08:00
Ricardo Quesada	b24c674d25	Little fixes for setNormalized	2014-05-30 21:50:39 -07:00
Ricardo Quesada	1b8d0d88df	Adds setNormalizedPosition() ... Changes in `visit()` were done in order to do it in a robust and fast way.	2014-05-30 16:42:05 -07:00
minggo	e76feceada	fix coding style	2014-05-30 15:13:59 +08:00
minggo	402dc9f9ce	fix memory leak	2014-05-30 15:10:57 +08:00
minggo	2e7865a4f6	coding style fix	2014-05-28 17:41:34 +08:00
minggo	1618d2a4e2	don't have to set _orderOfArrival to 0 after visit	2014-05-28 15:50:42 +08:00
minggo	99290b83c7	Merge pull request #6871 from asuuma/v3_Repeat_fix ... Fix Repeat will run one more over in rare situations	2014-05-27 16:22:42 +08:00
Ricardo Quesada	5601048829	Fixes compiler warnings for mac and ios	2014-05-22 16:34:16 -03:00
Ishiguro Yusuke	90cea76008	Fix Repeat will run one more over in rare situations	2014-05-22 15:59:47 +09:00
minggo	3b5417a325	Merge pull request #6854 from MSOpenTech/wp8-v3-fix ... Wp8 v3 fix for precompiled shaders and precompiled headers	2014-05-21 14:31:18 +08:00
Dhilan007	d13ed93fc1	issue #5277:Label:It could be possible that for using outline and invoking 'Director::setContentScaleFactor' cause label show nothing.	2014-05-21 14:08:30 +08:00
Dhilan007	ac258439b0	close issue#5277:Label:It could be possible that for using outline and invoking 'Director::setContentScaleFactor' cause label show nothing.	2014-05-21 11:38:45 +08:00
minggo	40df6a28a2	Merge pull request #6844 from Dhilan007/v3-labelfix ... closed issue#5252:Label:It could be possible that for using outline cause crash.	2014-05-21 11:19:12 +08:00
minggo	5a309fbc6e	Merge pull request #6721 from zifter/FixNodeConst ... [ci skip]Getter always must be a const method.	2014-05-21 09:48:27 +08:00
Dale Stammen	3971666426	updated pch file for wp8	2014-05-20 10:06:24 -07:00
Dale Stammen	f0e4c97bc6	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into wp8-v3-fix	2014-05-20 07:50:12 -07:00
Dale Stammen	0efc070104	fixed shader compiler after cocos refactor	2014-05-20 07:48:12 -07:00
Dhilan007	55c1319426	closed issue#5252:Label:It could be possible that for using outline cause crash.	2014-05-20 16:54:51 +08:00
minggo	9a276c66a0	Merge pull request #6740 from zifter/FixProgressTo ... Fix Progress Action. Not working with charging from 100 to 0.	2014-05-20 15:36:10 +08:00
GameEgg	9c5f7f0ce3	bug fix FontFNT.cpp	2014-05-19 18:42:11 +09:00
Ricardo Quesada	6461e26c9f	Squashed commit of the following: ... commit 64722e414c6cacc108fa6015d6af84bd9a4d79ec Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 14:03:53 2014 -0700 More WP8 fixes commit 7934be32741cddee6d04cd4f32c7e9718ba83b4c Merge: c2b1619 fea335f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 12:19:41 2014 -0700 Merge branch 'mesh3d' of github.com:ricardoquesada/cocos2d-x into mesh3d commit c2b1619005b5a62ef77afe727429584d6a57010e Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 12:19:19 2014 -0700 Adds missing resources for Windows Phone 8 commit fea335f573f975d9d2f6eafeb3ad4d3ea8095ee5 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 11:54:15 2014 -0700 Updates CHANGELOG commit b8b93da914de97662c9df55cfc351ad8b74ea779 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 11:48:59 2014 -0700 Adds Sprite3d files and tests commit 059c842938e19068427bb2276d52f3e0ea1cc51f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 11:16:13 2014 -0700 fixes compiler warnings for windows commit d3299f4cf443c9603f9120e431dbcb6ce8b8e26f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 10:53:34 2014 -0700 fixes for Sprite3D Adds copyright header removes compilation warnings cleans code a bit commit 1377787a4bcebdf349f9de0a05c329066c6eb626 Merge: f89725f 9a3c2d0 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 20:46:26 2014 -0700 Merge pull request #34 from dumganhar/pull/6731 fix compilation error of missing bind Mesh for luabindings. commit f89725f65ca604efb9abbcfe336c9d50135016b2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:45:12 2014 -0700 use const & and changed typo commit 9a3c2d0df9abcd76292cc1f71b6615931aa807d5 Author: James Chen <jianhua.chen@cocos2d-x.org> Date: Sat May 17 11:43:10 2014 +0800 fix compilation error of missing bind Mesh for luabindings. commit 59524b3850b27342f3cb4c390751bdf97362a794 Merge: ee4ec94 5c5a6b9 Author: James Chen <jianhua.chen@cocos2d-x.org> Date: Sat May 17 11:33:01 2014 +0800 Merge commit 'refs/pull/6731/head' of git://github.com/cocos2d/cocos2d-x into pull/6731 commit 5c5a6b9bde410027db948b539bc3111dc243cf0b Merge: d4285e3 5f41732 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:23:58 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit d4285e336808699f828b82c6b90a83b1b0c0978c Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:22:49 2014 -0700 remove empty lines commit 5f4173271101e2411ffb6cbf600066e204df98d3 Merge: e272583 ac8cf25 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 20:15:44 2014 -0700 Merge pull request #33 from dabingnn/mesh3d_work Mesh3d work commit ac8cf2571d92b03c9632d0415078d08526322289 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:14:01 2014 -0700 added mesh3d file to template commit e272583cb8a7f41d8d74dbf7d7db71584187a779 Merge: 6a1b847 5d3a955 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 19:10:45 2014 -0700 Merge pull request #32 from dabingnn/mesh3d_work Mesh3d work commit 5d3a95543f66f7ec90bf06e6e1761722b8a33cca Merge: 4feae11 97cae73 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 18:18:13 2014 -0700 Merge branch 'v3' into mesh3d_work commit 6a1b847065a1b9d369892ab011478c47e80c9195 Merge: 4feae11 4ece4b3 Author: Trace0429 <yangtuo0429@gmail.com> Date: Fri May 16 17:15:39 2014 -0700 Merge pull request #31 from Trace0429/mesh3d_work windows work now commit 4ece4b3255d84f2749298fdbdecc5ad0302c36a3 Author: Trace0429 <yangtuo@chukong-inc.com> Date: Sat May 17 08:12:46 2014 +0800 windows work now commit 4feae11577f64c3aff943af51adc37dcb987bdc1 Merge: 510fc0c fdf82d3 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 16:32:58 2014 -0700 Merge pull request #30 from dabingnn/mesh3d_work Mesh3d work commit fdf82d36d97ab68fdb7bab54241fdd94f18a53eb Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:32:00 2014 -0700 fix compile error after merge (MAC can work) commit 4bef832c3f4d5e5f3c19ca36f13ceba9e4ff1dbe Merge: 510fc0c d19de29 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:24:11 2014 -0700 Merge branch 'v3' into mesh3d_work Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj cocos/2d/cocos2d.vcxproj cocos/2d/cocos2d.vcxproj.filters cocos/Android.mk cocos/CMakeLists.txt cocos/renderer/CMakeLists.txt commit 510fc0cea76bdedfae858bb930d98715ce54f7e9 Merge: e098ed7 7fea347 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 16:11:39 2014 -0700 Merge pull request #29 from dabingnn/mesh3d_work Mesh3d work commit 7fea34782f30ef0498a7a993016f45fcb786b771 Merge: a8a409a e098ed7 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:08:01 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit a8a409a7d5280b1075eb6258ee556611a5cba7b3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:05:37 2014 -0700 bind ARRAY_BUFFER and ELEMENT_ARRAY_BUFFER to 0 after draw commit e098ed7a5c187256be8313ec5d66294d3554c914 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 16:02:27 2014 -0700 bind buffer to 0 when finish draw commit d13f637a3777e81085e0285faf00105c58229d7c Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 14:00:38 2014 -0700 fix outline width commit 8a79c98b163ad862a2e09cbcc19a939f06556358 Merge: e208712 a0cf4ef Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 13:47:17 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit e20871233915f8b6010e59595c38793ec3d6956e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 13:47:12 2014 -0700 make some member protected commit a0cf4efc48af801636a55d1c330fb6841896d33b Merge: c0b8902 8b723e8 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 13:06:17 2014 -0700 Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d commit c0b89021cbbdb13db00b8844aac1f4ff9c90e968 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 13:04:27 2014 -0700 linux work now commit 8b723e82d81cbffd78e7378cab6d11df30baa044 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 12:48:34 2014 -0700 inc drawcall commit 5d0b6304b3e5c9bcb2354c3245511706438dc23c Merge: 1e7032b e783da9 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 12:31:44 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit e783da91fe6c14c8594d3da865e965256376dd10 Merge: 5da20fd 8f7a19a Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 12:31:31 2014 -0700 Merge pull request #28 from dabingnn/mesh3d_work Mesh3d work commit 1e7032b448bc79d76a445258f2b0c5bd6dba5fea Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 12:30:01 2014 -0700 optimize code commit 8f7a19a7b643ac63cbcd776095d6e8a2adb7ca64 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 12:29:37 2014 -0700 adjust code style commit 5da20fd2e75001451ec790f775fc4fe9cb87aa1b Merge: 659fbd6 553acfb Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 12:06:53 2014 -0700 Merge pull request #27 from dabingnn/mesh3d_work Mesh3d work commit 553acfb3ee685f5461a6d2a68779200abcca8670 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 12:06:02 2014 -0700 fix visual error for outline commit 659fbd652aa7f4c2d3629fe446051c3dd0377510 Merge: 056c3e1 c617bb7 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 11:54:54 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 056c3e1394b9c1588395ac8a7f70db1e63c88c31 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 11:54:47 2014 -0700 fix shader, add multiple sprite to Sprite3DEffectTest commit c617bb74b6bc1e691ee488fd9ca43fa618710bfa Merge: 94d7896 7b19c56 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 11:33:31 2014 -0700 Merge pull request #26 from dabingnn/mesh3d_work Mesh3d work commit 7b19c564e4053ad883617873b11043df1fb98a45 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 11:30:34 2014 -0700 share the same glprogram in effect3DOutline commit 377d3bccd85dc566554c4fe7b529a9d0e82199e7 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 11:19:56 2014 -0700 add class static variable for EffectOutline commit d4913bf735dbc74a21bd8327af0b74325bbf9d1d Merge: 213bbb0 6837cea Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 11:07:04 2014 -0700 Merge branch 'v3' into mesh3d_work commit 213bbb0c289e579895e92620153b95a8cf374521 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 10:55:28 2014 -0700 add mesh.h in cocos2d.h commit 94d789610c9d4426b14e655a73197c652afc74f6 Merge: fa69e09 9af9da5 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 10:41:24 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit fa69e09ce0265b1fe3f4e76fa4dbc952abf17812 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 10:41:05 2014 -0700 remove namespace commit 9af9da50a91804d11537cffe0750e486cf95c8a5 Merge: ff15926 8a38a38 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 10:30:23 2014 -0700 Merge pull request #25 from dabingnn/mesh3d_work Mesh3d work commit 8a38a384742ba130946de8ad1759b61ed2f70495 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 10:27:28 2014 -0700 remove redundant uniform CC_Texture0 commit db80bf7c7597fd20a1ca5e4ca89ad067b527f034 Merge: ff15926 511295e Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 10:20:01 2014 -0700 Merge branch 'v3' into mesh3d_work commit ff15926f47edfbb1250440b060c1d887cfecd033 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 09:11:36 2014 -0700 warning more than one texture commit 5debbf8d6de4563361974b67aa52e572f7df9dd6 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 08:45:03 2014 -0700 remove redundant line commit ed357e7484a63bc3eb208d589943f802b7832e4d Merge: a1e2306 25dd07e Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 22:53:10 2014 -0700 Merge pull request #24 from dabingnn/mesh3d_work Mesh3d work commit 25dd07edb7005f593003e90120d6e6439686e5f6 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 22:52:33 2014 -0700 fix memory leak commit 945ae3444fc2d5eb7c6293960e9c11dfbc5b7cb3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 22:49:04 2014 -0700 remove unused member variable commit a1e23064140328f4c9bbe434383ca6f25fcb7548 Merge: bac54fc 712e816 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 22:37:16 2014 -0700 Merge pull request #23 from dabingnn/mesh3d_work Mesh3d work commit 712e81606f2782ac41276c1e8a87d32217ac9d28 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 22:35:48 2014 -0700 fix memory leak commit bac54fce097edd4040b0a7cd522d15644e6b482a Merge: 8ed28c4 54538e8 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 20:01:49 2014 -0700 Merge pull request #22 from dabingnn/mesh3d_work Mesh3d work commit 54538e89a2bf33ad6936130d1cbb3ef153db01a5 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 20:01:29 2014 -0700 android work now commit a6cc0f77875e045d169758adf0cde87360f41475 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:53:39 2014 -0700 remove sprite3dEffect include commit d8482fda09d414de76d1dc1a28c0d0b8bcc5aa32 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:50:17 2014 -0700 remove unused Sprite3dEffect commit c5e2d5579daca64b0e9394a2b07613352847eca8 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:48:12 2014 -0700 remove unused outline shader files commit 09a100cf388d80aa1389d96994ae189cbb0652b2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:43:17 2014 -0700 fix error on IOS commit 8ed28c4854d0b51ed0251f09c27a5ce328599ad5 Merge: d23ffe3 c0e8ea2 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 18:47:37 2014 -0700 Merge pull request #21 from dabingnn/mesh3d_work Mesh3d work commit c0e8ea26ff29fc6a3cd04e7f9e122d4ea0a67e2c Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:46:54 2014 -0700 adjust indent, and line to the end of the file commit 661ceb72831d6eccfa522a09cedf994541af6f88 Merge: 8e764e7 d23ffe3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:35:18 2014 -0700 Merge branch 'mesh3d' into mesh3d_work Conflicts: cocos/3d/CCSprite3D.cpp cocos/3d/CCSprite3D.h tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp commit 8e764e74dd019852a0ef35b257895a7e79cd9a14 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:31:06 2014 -0700 add testCase for outline commit c2ced288851892299fd7258e51f32303959b374d Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:03:34 2014 -0700 extract base class Effect3D commit d23ffe3167476d10740df321e579bf647a3698d0 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 18:02:45 2014 -0700 RendeMeshData member rename commit fb8f25553cd317a277c1b924da2c11b9f3188666 Merge: 73cb4b4 819db70 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 17:57:29 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 819db702d5ffa9461fc9d1d232cea7d373536664 Merge: 2676911 b408f43 Author: Trace0429 <yangtuo0429@gmail.com> Date: Thu May 15 17:54:24 2014 -0700 Merge pull request #20 from Trace0429/mesh3d_work Mesh3d work commit 73cb4b444b222d34e135b0d09b426b9c73c1b790 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 17:54:03 2014 -0700 android meshcommand commit b408f4343e47766416b19a583bc6bb5167439693 Author: Trace0429 <yangtuo@chukong-inc.com> Date: Fri May 16 08:50:38 2014 +0800 windows work now commit afbde9c25cfcdc4a6600a9e7607bc9489ea6b6f9 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 17:38:41 2014 -0700 raw EffectSprite commit 2676911bb71ef92b3d9cf198021169d9e4466525 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 16:37:20 2014 -0700 remove SpriteEffect from Sprite3D commit 83dc4cfc3609d14024c3966e49ee34bf36bbd77f Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 16:34:36 2014 -0700 raw effectSpriteTest commit 39e372ef2037090317c9c4a2287b06cadf83c9c5 Merge: 734633e 6d27912 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 16:14:57 2014 -0700 use meshcommand commit 734633ec1ffc66e590b2ad2da94f6477d78146f2 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 15:38:30 2014 -0700 use meshcommand commit 4ec56afaa9a660e8eaad6afe18ffded8ca858eb1 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 15:31:43 2014 -0700 comment out effect framework commit 6d27912f148e03acc07da3e3b4d0c565af8afefa Merge: d6f6f63 61a9011 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 15:11:25 2014 -0700 Merge pull request #19 from dabingnn/mesh3d_work Mesh3d work commit 61a9011d6c78ea6918664bb608dc51344e0236e5 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:55:06 2014 -0700 fix compile error in testcases commit 5f2f585bb8584590ecd3ebcefbb49de45b8f4bed Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:52:43 2014 -0700 fix compile error after merge with v3 commit 1a0de47740be51e586cc5615bc28e44ec8a1fc47 Merge: d6f6f63 760ee57 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:48:19 2014 -0700 Merge branch 'v3' into mesh3d_work commit d6f6f633927eb00df984ec4239555f9ce2c7e44d Merge: c6fbd6e 76d2523 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 14:26:40 2014 -0700 Merge pull request #18 from dabingnn/mesh3d_work Mesh3d work commit 76d2523ae735384533a1e37f06e370cb3481b0f2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:25:40 2014 -0700 move 3d shaders to shader cache commit 9b68032c809dc6667ffd5c1af37b7ad4d84fe2de Merge: 2c9a573 c6fbd6e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 13:56:00 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 2c9a5738c2d24c33d4994e8e44e32fcc8d9ceece Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 13:55:49 2014 -0700 meshcommand commit 0631a51c5d9c0aae55447105b962a888e1158cd3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 13:21:36 2014 -0700 add mesh rebuild when come to foreground in android commit 8695016869ab56f3a046f488485f9fdfb6532417 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 13:13:59 2014 -0700 android work now commit c6fbd6e67d29b2fdfeed74f96de0ff5a6cdae1f5 Merge: cd7b235 0466a38 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 12:21:40 2014 -0700 Merge pull request #17 from dabingnn/mesh3d_work Mesh3d work commit 0466a38e77ca1bc6be09bf18b42a6290db8dace8 Merge: e349e4e cd7b235 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 12:19:24 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit e349e4e0a7047ed49c2bfa9b2e3e5cae5cbc8f67 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 12:18:49 2014 -0700 commit the changed IOS/MAC project file commit a7c9a65d5603622b1d40cc009dfceee60c376f50 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 12:17:57 2014 -0700 remove MeshPart commit cd7b235b5ec5b3ce21bc856888d383e6224fd047 Merge: e666045 3b7b406 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 11:03:54 2014 -0700 Merge pull request #16 from dabingnn/mesh3d_work Mesh3d work commit 3b7b406caff0b6f79fe044612a32e909f778d1e3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 10:59:10 2014 -0700 raw version of single Mesh commit e666045aa4768199c530f494f0a1fb402f2ce922 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 10:44:04 2014 -0700 fix outline commit 5d4f304c5f9e5b35dbb1d1176232ab5189c98c0e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 10:09:45 2014 -0700 without normal no outline effect commit 3f6bd0ffbca804dd9ca6776c8cc2b37643911d63 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 22:39:03 2014 -0700 android listenBackToForeground commit 6bec670319ea154474c32c941c250bc3909a7e2e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 21:58:09 2014 -0700 add boss1 with normal commit 35c1b8d5fcec188cbef92457e24721ae53820328 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 21:54:20 2014 -0700 change cache commit 076166fba142d5432bbadaf3e75d6c35bcb6905a Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 21:35:59 2014 -0700 depress no .mtl crash commit 498c9693a7e7009615382c5769b7493c3ff6be68 Merge: 8a63b49 d4fd946 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 15:58:50 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 8a63b4959cbb5e2b749d7f63f5b4ebe2bc5a6970 Merge: b4a8fee f395cc5 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 15:58:36 2014 -0700 merge dabingnn commit d4fd946fc8afdc95741f6a170e489d3dca9e2519 Merge: f395cc5 a17f074 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 15:53:58 2014 -0700 Merge pull request #15 from dabingnn/mesh3d_work Mesh3d work commit a17f074302d10ff03881cba7e634e094d31feb0a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 15:52:58 2014 -0700 android can work now commit b4a8fee4b9735e16331a5656055572db9e551367 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 15:33:07 2014 -0700 refactoring render code commit f395cc50cdd8f2f15204ad9a126338d5c2fa72d2 Merge: f129e02 a2c12df Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 15:27:21 2014 -0700 Merge pull request #14 from dabingnn/mesh3d_work Mesh3d work commit a2c12df8d8908abe4dcb1a0c91711a28d9f05cac Merge: 1932e22 f129e02 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 15:26:19 2014 -0700 Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d_work commit 1932e22962a79530adf583f24070efcee32251d3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 15:25:55 2014 -0700 android can compile now(can not work) commit f129e02ef21a0d44b8517c53d8c6bed0aaf85def Merge: ae2aa0d c0d9097 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 14:21:09 2014 -0700 Merge pull request #13 from dabingnn/mesh3d_work Mesh3d work commit c0d90973c2b87582e99966256c74dcdf23712d6a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 14:15:16 2014 -0700 include Sprite3DEffect in the cocos2d header commit ae2aa0dd705bf1a961164f9059eec4e5c2281bb5 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 12:51:09 2014 -0700 outline sprite commit e7a542d9c95c145241314fc63fbe12ba0b80ec6a Merge: 1c76d4c 48e9f39 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 10:48:55 2014 -0700 meshvertexattrib work commit 1c76d4ca319c15dadd7243ce4230fa35dfb7a1bb Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 10:40:55 2014 -0700 use meshvertexattribute commit 48e9f3991dd7aafc90e99e1721d04f28d01f94e6 Merge: b70bf52 e0d87a9 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 09:41:57 2014 -0700 Merge pull request #12 from dabingnn/mesh3d_work Mesh3d work commit e0d87a99f42f808429917c8b586509ca75e8a5e2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:40:14 2014 -0700 remove compile error commit c445e07c895fc2352f1220459d91f41f77690cd8 Merge: b70bf52 86fb75a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:31:14 2014 -0700 Merge branch 'v3' into mesh3d_work commit b70bf522ef139da670cf41791a3d0ddad3dfa1cc Merge: da24c48 5a2127d Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 00:25:47 2014 -0700 vertex attrib commit da24c48c981029493900bcd2143495e546faa75e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 23:49:09 2014 -0700 mesh vertex attribute commit 5a2127d718e6a9cb9f2ca3e1ac353ce1e5c0ebfd Merge: d98adb7 5148f76 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 19:06:38 2014 -0700 Merge pull request #11 from dabingnn/mesh3d_work Mesh3d work commit 5148f76c43bf1e3dc5a49ad6bf112d166d6b1c93 Merge: 02deb39 d98adb7 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 19:05:40 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit 02deb399314f01ec1222d78f2383a65614e33a34 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 19:04:15 2014 -0700 fix texcoord y flipped commit d98adb7d9d906f8376e45a2ba57bffc4e17e1775 Merge: 300eb4e 946283b Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 18:35:08 2014 -0700 Merge pull request #10 from dabingnn/mesh3d_work Mesh3d work commit 946283b83218de893c727dc9780291fe1683a4f9 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 18:22:16 2014 -0700 added blendFunc commit 300eb4e31783452cf16b77f85c3ef6f9dba19fc6 Merge: da7d6a0 ccc0baf Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 16:03:01 2014 -0700 Merge pull request #9 from dabingnn/mesh3d_work Mesh3d work commit ccc0bafd32b3375c2fe2163e0eb32714d06f8525 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 16:01:59 2014 -0700 fix compile error after merge commit 5bfc30b2b930131d23058d99a6862061c2217f38 Merge: da7d6a0 0171e27 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 15:56:46 2014 -0700 Merge branch 'v3' into mesh3d_work commit da7d6a087f22f4a11827ff3410fbcd2561f155fc Merge: 0caad32 f413b4e Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 14:19:24 2014 -0700 Merge pull request #8 from dabingnn/mesh3d_work Mesh3d work commit f413b4e55764d27863ae6978f1dbb2a0a3ca35e0 Merge: f47cfc6 0caad32 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 14:17:01 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit f47cfc67041ed4655a916623a6731876758a5182 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 14:15:06 2014 -0700 add new interface for createSprite3D commit 0caad32f2aa40c45e42d5d61c83419ee06e65a97 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 13:58:35 2014 -0700 default GLProgram to object commit 901ccef93593e2c39cca190784b4fc9684dfa9d0 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 13:13:24 2014 -0700 remove compile warning commit a6f9cdfcdd001d4486eb8206c3bd9d85e9fc9bc8 Merge: 68bdd0b 3eef54c Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 13:01:20 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit 68bdd0be68e3a11bb7bc5312e61ba5fb628c439b Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 12:59:59 2014 -0700 rename init->initWithFile in Sprite3D commit 3eef54ca06c83f72e248ce91fe639a8446ef1be5 Merge: f719f45 1c8773c Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 12:58:23 2014 -0700 Merge pull request #7 from super626/mesh3d_tmp Mesh3d commit 1c8773c53ff0bb87cb249d6392a900cd572dac1e Merge: 23e8786 f719f45 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 12:56:06 2014 -0700 Merge branch 'mesh3d_tmp' into mesh3d commit f719f45aba37791ffdfe107569350a1af94cbeb0 Merge: 6bd3f28 1b76467 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 11:59:46 2014 -0700 Merge pull request #6 from dabingnn/mesh3d_work Mesh3d work commit 1b7646759d9efcdf0942a42c0c22964a99309853 Merge: 6bd3f28 87adf9d Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:53:17 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit 87adf9df61e76f765f78a2bae4ec980ffb73ce57 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:52:41 2014 -0700 adjust line indent and header file define commit 23e8786892b89e25d1add091a7c3bc618990e579 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 11:44:22 2014 -0700 using vbo commit 6bd3f28440eca3530379b4610d6f87cc88eb54c5 Merge: 56fc0f4 a239a7e Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 11:42:10 2014 -0700 Merge pull request #5 from dabingnn/mesh3d_work Mesh3d work commit a239a7e35a82f497c337d96a025125b92c8daefd Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:39:06 2014 -0700 add CCSprite3d include into cocos2d.h commit 8d580c28a084c1dab2a5ce925871f3361e6b970a Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:33:18 2014 -0700 remove cocos2d.h include in Sprite3DTest.h commit 56fc0f4cbccb07cda972efda302ff6689b958ab2 Merge: ab16a26 8bb75e3 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 11:28:47 2014 -0700 Merge pull request #4 from dabingnn/mesh3d Mesh3d commit 8bb75e3dd96131da1c2dd9bc622d7bdbb2ad0514 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:26:40 2014 -0700 fix compile error after rename commit 230a73132c09c66b449efbacbc417974616694c6 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:07:30 2014 -0700 rename FileXXX to CCFileXXX commit ab16a26376f7deddf1a82f3085668e3fd9f09a12 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 10:52:36 2014 -0700 rename _model to _mesh commit 92ac7f75d06ad081282bbddcad5920a1f7584264 Merge: 6b911b5 df147d1 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Mon May 12 22:23:59 2014 -0700 Merge pull request #3 from dabingnn/mesh3d Mesh3d commit df147d14ddb8e61d907a44c6f03f404c8a68103f Author: Huabing.Xu <dabingnn@gmail.com> Date: Mon May 12 22:21:22 2014 -0700 fix retain/release in sprite3D commit 0b38939fd79168699ab737a8dc8e97c9417cf4ce Author: Huabing.Xu <dabingnn@gmail.com> Date: Mon May 12 20:04:16 2014 -0700 remove compile warnings commit 090f81b8198d18bc0b31bbba28c3e2e6d73e9f92 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 19:16:25 2014 -0700 using glprogramstate work ok commit 0b4f36a964c28f5f4b3224522f27402e0efbe123 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 18:38:52 2014 -0700 add obj commit e8917d7427f3ff0e7c3d874b908e0058adecf2f7 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 18:33:23 2014 -0700 use glprogramstate commit 6b911b52c86cd79e1fd3efc0536a5ca7ab04ab7a Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 13:01:56 2014 -0700 sprite3d commit 2a490c344f2db27d467506cf28c910410bb892e6 Merge: 23a5232 01b015d Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Mon May 12 10:52:17 2014 -0700 Merge pull request #1 from dabingnn/newcode Newcode commit 01b015d1238c89b6837ea276a95ce359cf0da5a7 Merge: 23a5232 5d24b3d Author: Huabing.Xu <dabingnn@gmail.com> Date: Mon May 12 10:50:14 2014 -0700 Merge branch 'v3' into newcode commit 23a5232fe5bb4c0b0bc821d1945426486dafe253 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 09:44:41 2014 -0700 3d mesh initial code	2014-05-18 14:49:16 -07:00
zifter	d875f27c67	Merge branch 'FixNodeConst' of https://github.com/zifter/cocos2d-x into FixNodeConst ... Conflicts: cocos/ui/UIListView.h cocos/ui/UIPageView.h	2014-05-17 10:40:36 +03:00
Ricardo Quesada	a1243ca9ed	Squashed commit of the following: ... commit 8342086a358287a77d6f6bf8dd6e2ae0a488aef7 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 17:37:58 2014 -0700 little fixes in project commit 832397c96cc63523a2ad0490ac9d8ad3e3bf7d5d Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 17:33:11 2014 -0700 CopyTemplates working commit 8c1555cb0369bf123f84733839ef30c30f70f4ff Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 17:22:05 2014 -0700 Re-adds CopyTemplate to VS solution commit fef2ad65596fd0ff60846e3a0b09dfea82c692a4 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 16:40:22 2014 -0700 Updated shaders and project fixes	2014-05-16 17:38:52 -07:00
Ricardo Quesada	0f67247325	Squashed commit of the following: ... commit a794d107ad85667e3d754f0b6251fc864dfbf288 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 14:33:49 2014 -0700 Yeah... everything compiles on win32 and wp8 commit 4740be6e4a0d16f742c27996e7ab2c100adc76af Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 13:58:38 2014 -0700 CCIME moved to base and compiles on Android commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 13:02:57 2014 -0700 compiles Ok for Windows Phone 8 commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 12:25:31 2014 -0700 fixes for Windows Phone 8 commit 418197649efc93032aee0adc205e502101cdb53d Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 11:15:13 2014 -0700 Compiles on Win32 commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 10:08:31 2014 -0700 Compiles on linux! commit 118896521e5b335a5257090b6863f1fb2a2002fe Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 09:30:42 2014 -0700 moves cocos/2d/platform -> cocos/platform commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0 Merge: bd68ec2 511295e Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 08:24:41 2014 -0700 Merge remote-tracking branch 'cocos2d/v3' into files commit bd68ec2f0e3a826d8b2f4b60564ba65ce766bc56 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu May 15 19:36:23 2014 -0700 files in the correct directory	2014-05-16 14:36:00 -07:00
Jason Xu	67a558c83d	for 93562d6aa6 ... update Cocos2dxHelper and AndroidManifest.xml template.	2014-05-16 15:55:00 +08:00
James Chen	d6007a395c	Adds a virtual method for loading native libraries.	2014-05-16 10:20:49 +08:00
Ricardo Quesada	7e4597508c	Does not crash on Mac if the .ttf file is not found	2014-05-15 17:22:53 -07:00
andyque	fc8d286fcb	closed #5188, fixed android NULL pointer exception	2014-05-15 12:11:11 +08:00
Ricardo Quesada	dc711643cd	Squashed commit of the following: ... commit a9572b8913f3a38b59adbd7b4017ab9848a6b2b5 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed May 14 10:03:44 2014 -0700 math renames `Vector2` -> `Vec2` `Vector3` -> `Vec3` `Vector4` -> `Vec4` `Matrix` -> `Mat4` commit 4e107f4bd854c26bfceb52b063d6bd9cea02d6a3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:24:28 2014 -0700 raw version of rename Vector3 commit 1d115573ebe96a5fc815fa44fbe6417ea7dba841 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:07:14 2014 -0700 rename Vector2 after merge commit ab2ed58c129dbc30a4c0970ed94568c5d271657b Merge: 1978d2d 86fb75a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:05:30 2014 -0700 Merge branch 'v3' into v3_renameMathClassName Conflicts: tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.cpp tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.cpp tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.cpp tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.cpp commit 1978d2d174877172ccddc083020a1bbf43ad3b39 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 08:51:45 2014 -0700 rename vector2 in tests/cpp-empty-test folder commit d4e0ff13dcce62724d2fece656543f26aa28e467 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:58:23 2014 -0700 rename vector2 in tests/cpp-tests cpp files commit be50ca2ec75e0fd32a6fcdaa15fe1ebb4cafe79f Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:52:57 2014 -0700 rename vector2 in tests/cpp-tests head files commit 6daef564400d4e28c4ce20859a68e0f583fed125 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:49:48 2014 -0700 rename vector2 in extension folder commit 8f3f0f65ceea92c9e7a0d87ab54e62220c5572e2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:47:22 2014 -0700 rename vector2 in cocos/2d cpp files commit e1f3105aae06d595661a3030f519f7cc13aefbed Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:44:39 2014 -0700 rename vector2 in cocos/2d head files commit 6708d890bfe486109120c3cd4b9fe5c078b7108f Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:40:59 2014 -0700 rename vector2 in cocos/base folder commit d3978fa5447c31ea2f3ece5469b7e746dfba4248 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:40:43 2014 -0700 rename vector2 in cocos/deprecated folder commit 4bff45139363d6b9706edbbcf9f322d48b4fd019 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:40:26 2014 -0700 rename vector2 in cocos/editor-support folder commit 353d244c995f8b5d14f635c52aed8bc5e5fc1a6f Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:36:48 2014 -0700 rename vector2 in cocos/ui folder commit 758b8f4d513084b9922d7242e9b8f2c7f316de6c Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:32:39 2014 -0700 rename vector2 in cocos/renderer folder commit 0bd2710dd8714cecb993880bc37affd9ecb05c27 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:32:15 2014 -0700 rename vector2 in cocos/physics folder commit b7f0581c4587348bdbc1478d5374c2325735f21d Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:25:01 2014 -0700 rename vector2 in cocos/math folder commit a8631a8e1a4e2740807ccd9be9d70de6ecaad7dd Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:16:55 2014 -0700 rename Vector2 to Vec2 deprecate typedef Vector2	2014-05-14 10:07:09 -07:00
zifter	6fcef92708	Fix Progress Action.	2014-05-14 19:13:14 +03:00
minggo	abc08e703f	Merge pull request #6728 from pandamicro/FixParticlesInit ... Fixed #5040: Remove memory allocation assertion to permit multiply init	2014-05-14 18:39:13 +08:00
minggo	fba3bf2d15	Merge pull request #6735 from Dhilan007/v3_labelfix ... label's small improvement.	2014-05-14 17:58:46 +08:00
Dhilan007	059ea3dd8a	label's small improvement.	2014-05-14 16:41:26 +08:00
pandamicro	a463a1630f	Fixed #5040: Remove memory allocation assertion to permit multiply init	2014-05-14 11:49:09 +08:00
Ricardo Quesada	723938e292	Adds effectNode in ShaderTest2	2014-05-13 18:12:58 -07:00
Ricardo Quesada	0171e27747	Merge pull request #6714 from Dhilan007/v3_nodefix ... Fix a bug that if a node changes parent, parent's matrix will not update to reflect this change.	2014-05-13 14:14:27 -07:00
zifter	249dffa346	getter always must be a const method.	2014-05-13 23:28:04 +03:00
Ricardo Quesada	31dd70dba2	Matrix::identity() -> IDENTITY ... consistency with the rest of the cocos2d API	2014-05-13 10:26:25 -07:00
minggo	05c16de87a	Merge pull request #6715 from dumganhar/iss5160-animation-notification ... closed #5160: Dispatch a custom event after an animation frame is displayed	2014-05-13 18:38:44 +08:00
James Chen	1ced31a2d3	issue #5160: Don't use static variables, use member variables	2014-05-13 17:29:05 +08:00
James Chen	0cd2196b88	closed #5160: Dispatch a custom event after an animation frame is displayed	2014-05-13 17:08:30 +08:00
James Chen	86411837c6	PLEASE NEVER `using namespace cocos2d;` in header file	2014-05-13 16:15:21 +08:00
Nite Luo	7d8cfc4cca	set parent transform dirty when addChild	2014-05-12 23:28:20 -07:00
Ricardo Quesada	012f1020ca	GLProgramState fixes ... It is possible to submit to the Renderer a Sprite with custom uniforms (although it won't be batched). It is possible to use a custom shader + uniforms on Sprite with subclassing Sprite	2014-05-12 19:12:56 -07:00
Dale Stammen	78df412669	updated project files to latest version of cocos2d	2014-05-12 09:27:52 -07:00
Dale Stammen	34b0245cfe	updated WP8 precompiled shaders	2014-05-12 09:27:27 -07:00
Dale Stammen	50336dca40	updated to latest version of cocos2d	2014-05-12 09:25:37 -07:00
minggo	9ab2dae212	Merge pull request #6635 from dumganhar/iss4660-unicode ... issue #4660: ccUTF8 uses utf8-utf16 conversion in llvm3.4	2014-05-12 17:57:25 +08:00
Dhilan007	64b2562e1f	fixed compile fail on android.	2014-05-12 15:22:57 +08:00
Dhilan007	fc72dc040d	Label:fixed wrong logic of alignment.	2014-05-12 14:34:25 +08:00
minggo	b23056537b	Merge pull request #6602 from minggo/remove-unneeded-codes ... remove unneeded codes	2014-05-12 13:41:12 +08:00
James Chen	3d22c30933	issue #4660: Warning fix in CCLabel.cpp and ConvertUTF.c	2014-05-11 11:24:01 +08:00
James Chen	602fa28577	issue #4660: Updates comments and doc for deprecated ccutf8 api	2014-05-10 21:51:42 +08:00
James Chen	448c1ad352	issue #4660: Removes unused function in ccUTF8.cpp	2014-05-10 19:34:49 +08:00
Dhilan007	4692c67b78	issue #4660:remove unnecessary API.	2014-05-10 19:33:05 +08:00
James Chen	645a9761c8	issue #4660: CCTweenFunction.h/.cpp must be in 'action' filter	2014-05-10 19:33:05 +08:00
James Chen	f0cf415228	issue #4660: Fix windows include path doesn't contain `external/ConvertUTF`	2014-05-10 19:33:05 +08:00
James Chen	3a30adde0f	issue #4660: A warning fix in CCFontAtlas.cpp	2014-05-10 19:33:05 +08:00
James Chen	07204a0602	issue #4660: Updates win32 project	2014-05-10 19:33:05 +08:00
James Chen	e693a51c6e	issue #4660: Linux build ok	2014-05-10 19:24:04 +08:00
James Chen	20adf418fd	Updates 2d/CMakeLists.txt	2014-05-10 19:24:04 +08:00
James Chen	e003a09a2c	Updates CMakeLists.txt	2014-05-10 19:24:04 +08:00
James Chen	b003ba5eb0	issue #4660: Oops, utf16 is 2 bytes.	2014-05-10 19:24:03 +08:00
James Chen	a61b1097db	issue #4660: Adds ConvertUTFWrapper.cpp, using llvm::ConvertUTF8toWide and llvm:: convertUTF16ToUTF8String	2014-05-10 19:24:03 +08:00
James Chen	5fda13639d	issue #4660: Uses new utf api for Label.	2014-05-10 19:24:03 +08:00
James Chen	20a8808b78	issue #4660: Refactors utf8 api, make it safer and easier to use.	2014-05-10 19:24:03 +08:00
Ricardo Quesada	4d579892b1	Merge pull request #6668 from dabingnn/v3_fix_accident_changes ... V3 fix accident changes	2014-05-09 21:38:09 -07:00
Huabing.Xu	ba63befa5e	roll back target=android-10	2014-05-09 21:36:35 -07:00
Ricardo Quesada	a8c2fb5431	Fixes deprecated warnings	2014-05-09 21:29:24 -07:00
Ricardo Quesada	32d96ca9ad	Compiles on Windows Phone 8 ... ... but does not run	2014-05-09 19:42:57 -07:00
Ricardo Quesada	e8d2cf7871	Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into improved_glprogram	2014-05-09 19:08:08 -07:00
Ricardo Quesada	8f71e65482	Compiles on windows, sort of	2014-05-09 19:07:22 -07:00
yangxiao	d46729862c	android rename ShaderCahe to GLProgramCache	2014-05-09 19:05:39 -07:00
Ricardo Quesada	77c03fcf11	ShaderCache -> GLProgramCache	2014-05-09 18:39:25 -07:00
Ricardo Quesada	faf617bc37	fixes for Linux	2014-05-09 16:57:11 -07:00
yangxiao	1be6ba961c	Merge branch 'newcode' into improved_glprogram	2014-05-09 16:05:42 -07:00
yangxiao	877d8dd771	android works!!	2014-05-09 15:59:49 -07:00
Ricardo Quesada	9cad6cf027	removes some unused directories from the propery sheet ... ... for Visual Studio	2014-05-09 15:35:53 -07:00
Ricardo Quesada	4c623f1f5e	compiles and runs on Windows Phone 8 ... What's missing is to have the pre-compiled shaders from MS to test the the ShaderTest	2014-05-09 15:14:50 -07:00
Ricardo Quesada	9ffaeec515	Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into improved_glprogram	2014-05-09 12:00:33 -07:00
Ricardo Quesada	16c6b2163d	More VisualStudio fixes	2014-05-09 11:59:52 -07:00
Huabing.Xu	e72633c066	Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into tony_improved_glprogram	2014-05-09 11:53:22 -07:00
Huabing.Xu	a8b27de799	fix bug for y flipped coord (particle system)	2014-05-09 11:50:37 -07:00
Ricardo Quesada	78dd92a7ef	Merge remote-tracking branch 'cocos2d/v3' into improved_glprogram ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj	2014-05-09 11:40:13 -07:00
Ricardo Quesada	8565e899f9	adds missing files to VisualStudio	2014-05-09 11:38:43 -07:00
Ricardo Quesada	34a87f8332	Merge remote-tracking branch 'super626/improved_glprogram' into improved_glprogram	2014-05-09 11:28:16 -07:00
Ricardo Quesada	00834b1d6e	adds missing files for Windows	2014-05-09 11:28:06 -07:00
yangxiao	95e036dd1b	GLProgramStateCache	2014-05-08 21:54:49 -07:00
Ricardo Quesada	7fee9cc266	Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into improved_glprogram	2014-05-08 18:02:27 -07:00
Ricardo Quesada	62d9c24518	moves shaders files from 2d/ to renderer/	2014-05-08 18:01:48 -07:00
Huabing.Xu	1d5bfb5a10	roll back _yCoordFlipped changes	2014-05-08 16:45:08 -07:00
Ricardo Quesada	51f498fc94	fixed deprecation warnings	2014-05-08 16:42:36 -07:00
Ricardo Quesada	2e669c1d28	GLProgram::create() returns a linked GLProgram	2014-05-08 16:04:59 -07:00
Ricardo Quesada	580ebf939f	working Ok with new API	2014-05-08 15:43:12 -07:00
Ricardo Quesada	453b670ad2	Removes CCVertexAttribBind	2014-05-08 14:01:26 -07:00
Ricardo Quesada	9ea4aa1e16	Simplified VertexAttrib	2014-05-08 14:01:03 -07:00
Ricardo Quesada	8f2ba467ff	Yeahhhhhh ... it is working	2014-05-08 12:34:26 -07:00
Ricardo Quesada	a2361b30de	Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into improved_glprogram	2014-05-08 10:16:49 -07:00
Ricardo Quesada	087378926f	Merge remote-tracking branch 'cocos2d/v3' into improved_glprogram ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj	2014-05-08 10:16:09 -07:00
yangxiao	815f0b7bd9	useCallback to false	2014-05-08 10:12:12 -07:00
Dale Stammen	eea1ba6946	added missing files to projects	2014-05-08 10:11:42 -07:00
Dhilan007	bda8a73ae5	issue #4867:Use system widget to play video on Android	2014-05-08 18:12:03 +08:00
minggo	c886bf21a8	Merge pull request #6631 from Dhilan007/v3_labelhotfixed ... closed #5054:Label:Text have black border if it's created with system font on WP8/WINRT.	2014-05-08 17:24:08 +08:00
minggo	d84e26c7b4	Merge pull request #6626 from Ryeeeeee/v3_pause_sound_background ... sounds pause automatically when switching background	2014-05-08 17:11:29 +08:00
Ryeeeeee	80103487fe	rename variable	2014-05-08 16:53:24 +08:00
Dhilan007	966e7e2b20	closed #5054:Label:Text have black border if it's created with system font on WP8/WINRT.	2014-05-08 15:47:37 +08:00
minggo	a8d728ffc9	Merge pull request #6610 from zawasp/vs2013project ... upgrade win32 projects for Visual Studio 2013	2014-05-08 15:40:02 +08:00
Ryeeeeee	eec96e9e96	sounds pause automatically when switching background	2014-05-08 14:44:47 +08:00
Ricardo Quesada	4b15b884e7	Uniform is a struct	2014-05-07 20:38:15 -07:00
andyque	f6d0135b9b	Merge branch 'v3' into focus3861	2014-05-08 11:27:57 +08:00
Ricardo Quesada	90ec7dd9ec	Merge branch 'improved_glprogram' of https://github.com/super626/cocos2d-x into improved_glprogram	2014-05-07 20:21:03 -07:00
Ricardo Quesada	b401f6adc1	Lots of new code ... Adds GLProgramState	2014-05-07 20:20:19 -07:00
Dhilan007	7495f22708	closed #4906:Fixed the label continue to appear when its opacity is set to 0.	2014-05-08 10:12:29 +08:00
Huabing.Xu	41f48e7fa9	Merge branch 'v3' into tony_improved_glprogram	2014-05-07 15:30:04 -07:00
Ricardo Quesada	98454eeb69	Adds GLProgram::createXXX()	2014-05-07 14:38:41 -07:00
Ricardo Quesada	02405a8efe	Improved samples	2014-05-07 12:41:04 -07:00
Ricardo Quesada	a2c4ddf028	beautify Uniform and VertexAttrib	2014-05-07 11:26:26 -07:00
Ricardo Quesada	b1ed7178fe	Improved API for Uniforms	2014-05-07 10:44:45 -07:00
yangxiao	5190fb27c8	use proposed vertex attribute api	2014-05-07 09:27:44 -07:00
Mircea Rila	b66b4c6f1d	upgrade win32 projects for Visual Studio 2013 (solves Platform Toolset v100 not found). ... remove C4005 warnings after upgrading projects	2014-05-07 17:41:04 +03:00
minggo	1cbe29071b	remove unneeded codes	2014-05-07 16:49:32 +08:00
James Chen	9862fab58f	Comments fix in CCRenderTexture.h	2014-05-07 16:37:21 +08:00
andyque	657720e509	Merge remote-tracking branch 'upstream/v3' into focus3861	2014-05-07 11:42:09 +08:00
Ricardo Quesada	db759005e0	Improvements for Attributes and Uniform API	2014-05-06 17:58:14 -07:00
Ricardo Quesada	21dd6fef69	Improves code a little bit	2014-05-06 12:46:35 -07:00
Trace	cf9e8ff0bd	Merge branch 'newV3' into improved_glprogram ... Conflicts: cocos/2d/CCGLProgram.cpp cocos/2d/CCGLProgram.h	2014-05-06 12:07:42 -07:00
Trace	69fd841b30	fix the include error	2014-05-06 11:19:51 -07:00
Ricardo Quesada	720852681e	Adds license to VertexAttribBind	2014-05-06 11:15:40 -07:00
yangxiao	bbd4533c5e	Improves GLProgram ... Adds vetex attrib bind class	2014-05-06 11:03:24 -07:00
minggo	7830818fc0	Merge pull request #6553 from Dhilan007/v3_labelhotfixed ... [hot fixed]closed issue#4999:fixed label is unsharp if it's created by smaller font.	2014-05-06 11:41:24 +08:00
Dhilan007	989b3830aa	fixed indent	2014-05-06 11:22:23 +08:00
Dhilan007	e412f91103	[hot fixed]closed issue#4999:fixed label is unsharp if it's created by smaller font.	2014-05-06 10:36:55 +08:00
minggo	302ec843e7	Merge pull request #6577 from MSOpenTech/v3-wp8-fix ... V3 wp8 fix	2014-05-06 10:26:19 +08:00
andyque	e65b144ee6	issue #3861, fixs windows compile error	2014-05-06 10:17:10 +08:00
Ricardo Quesada	e413b86295	Revert `new Sprite` change done a few days ago ... Use `std::nothrow` for new in Sprite (should be done in all `new` code)	2014-05-05 16:53:37 -07:00
Ricardo Quesada	0e6dd9afe5	Particles can be created without texture ... Needed for complex particles like in EarthWarrior3D	2014-05-05 15:50:08 -07:00
Dale Stammen	9a05e86ab6	updated missing files	2014-05-05 13:26:28 -07:00
Dale Stammen	78204c7c91	removed obsolete headers	2014-05-05 13:25:57 -07:00
andyque	0d9d2a57dc	issue #3861. fix a indent problem	2014-05-05 17:54:21 +08:00
andyque	33f7a500f3	issue #4861. add android keypad support	2014-05-05 11:37:38 +08:00
James Chen	8cbcf17163	issue #4674: Re-added deleted source files.	2014-05-04 14:37:55 +08:00
James Chen	3b3c1c4dbb	issue #4674: Removed large files and updated .gitignore	2014-05-04 14:36:16 +08:00
Ricardo Quesada	207e67318d	rolling back tests	2014-05-01 16:55:28 -07:00
Ricardo Quesada	462338879e	rolling back physics in layer	2014-05-01 16:42:35 -07:00
Ricardo Quesada	32f3fedb37	Moves cocos/2d/Android.mk to cocos/Android.mk ... Easier to find Android.mk	2014-05-01 14:09:26 -07:00
Ricardo Quesada	25213c81f6	linux cmake improvements ... Added cocos/CMakeLists.txt which controls all the rest of the Cmake files	2014-05-01 13:01:51 -07:00
Ricardo Quesada	1cfd133555	fixes tmx maps	2014-05-01 11:51:11 -07:00
Ricardo Quesada	40fe815ab9	Squashed commit of the following: ... commit c16dcfaaea0922039aad05bce1f4efed18e04871 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 30 19:05:18 2014 -0700 more linux fixes commit 1553795976c9090a1b46deb53d12910fe0676008 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 30 19:04:04 2014 -0700 more linux fixes commit 1e43a8cabff33cbf25aa5eb5412f53a878222d83 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 30 19:02:07 2014 -0700 fixes linux isuses commit 723a445dd6411f91846da2b801248ad8298174f1 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 30 18:58:50 2014 -0700 more linux fixes commit 533c8025e794fc76cef02f396b3a93b3d7f4cfc8 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 30 18:57:33 2014 -0700 more linux fixes commit 4ba1e84959670bcbf044f18d1c0d4b3cb3be4090 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 30 18:53:43 2014 -0700 more linux fixes commit 1f8e011f306a47ed4134224e5e349929201f0539 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 30 18:49:28 2014 -0700 more linux fixes commit 3e2033100822ff6d532a1b4f012337491dc11920 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 30 18:47:43 2014 -0700 more linux fixes commit 2e708863c75fd032f1b2396dfdf1d31f7a62b713 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 30 18:46:00 2014 -0700 more linux fixes commit 861b5b92a6efd4de7b926c20d636ce9d749b293f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 30 18:43:15 2014 -0700 more linux fixes commit 2a43365a0c1755e9b9cada53301be1a20adb31cf Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 30 18:36:06 2014 -0700 more fixes for linux commit 7d332bf911892f87c7824d2a5da7bf73ce7ec411 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 30 18:35:29 2014 -0700 more fixes for linux commit f1becc17d3316dfe3678c23c9dcedb7a447d9235 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 30 18:34:44 2014 -0700 more fixes for linux commit d2e5959bb0dde921dd5e73be1d8acc3b3f50e51d Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 30 18:33:45 2014 -0700 fixes for linux commit ad9b633c352107cf0e8b060a0e23d6e6a3f5e80f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 30 18:16:48 2014 -0700 compiles on Windows commit 4425ee8e5de8f42a2d6050e4470109600dce8b5d Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 30 18:07:20 2014 -0700 fix builder	2014-04-30 19:09:13 -07:00
Ricardo Quesada	598bb91133	you should be 10	2014-04-30 17:56:14 -07:00
Ricardo Quesada	53b293e85f	Merge branch 'v3' into improved_directory_structure	2014-04-30 17:52:52 -07:00
Ricardo Quesada	98f26b4987	Compiles on Windows	2014-04-30 17:44:41 -07:00
Ricardo Quesada	b5f513ce16	Merge branch 'v3' into improved_directory_structure	2014-04-30 13:15:10 -07:00
Huabing.Xu	183dd1ec64	inverse and conjugate, negate for matrix	2014-05-01 01:59:36 +08:00
Huabing.Xu	16105df503	getNormalize->getNormalized	2014-05-01 01:10:18 +08:00
Huabing.Xu	c722b74e36	Merge branch 'v3' into v3_refactor_normalize	2014-04-30 20:08:37 +08:00
Huabing.Xu	ea4fee2c31	refactor normalize in Vector2	2014-04-30 18:07:05 +08:00
minggo	2cbbaed5b3	Merge pull request #6512 from dabingnn/v3_renderTextureBug ... V3 render texture bug	2014-04-30 17:52:14 +08:00
boyu0	489adaf315	fix indent	2014-04-30 16:33:35 +08:00
boyu0	c1d60f4b33	Fix ParticleSystem yCoordFlipped bug.	2014-04-30 16:18:39 +08:00
yangxiao	11dc9367ff	wrong rotation	2014-04-29 18:19:30 -07:00
yangxiao	3237d7b23d	Revert "wrong rotation" ... This reverts commit 3c9560017e.	2014-04-29 18:14:41 -07:00
Ricardo Quesada	8bb8416c26	Improved directory structure	2014-04-29 17:37:36 -07:00
yangxiao	3c9560017e	wrong rotation	2014-04-29 17:27:32 -07:00
Huabing.Xu	331c2d3872	readd wp8 code which is removed by accident	2014-04-29 16:03:50 +08:00
Huabing.Xu	faa0f67644	using pointer instead of Director::getInstance() in RenderTexture	2014-04-29 15:13:24 +08:00
Huabing.Xu	bd93a5cb76	fix bug for renderTexture created which is bigger than screen size	2014-04-29 15:08:44 +08:00
James Chen	35207fd8ba	Merge pull request #6399 from dumganhar/v3 ... fullPathForFilename optimization: Checking whether the path is an empty string.	2014-04-28 14:56:01 +08:00
James Chen	4f41b9d3ac	fullPathForFilename optimization: Checking whether the path is an empty string.	2014-04-28 14:53:30 +08:00
James Chen	8538b27385	Merge pull request #6391 from dabingnn/v3_optimize ... V3 optimize	2014-04-28 13:39:15 +08:00
Huabing.Xu	e6f7854225	clean for kazmath in project file	2014-04-28 13:14:22 +08:00
James Chen	6e0ee08d84	Merge pull request #6390 from Dhilan007/v3 ... fixed compile fail on wp8	2014-04-28 11:59:06 +08:00
Dhilan007	b4a9381238	fixed return type is not right	2014-04-28 11:55:45 +08:00
Dhilan007	35f83fc40a	fixed compile fail	2014-04-28 11:42:54 +08:00
James Chen	cbcf2e2bc8	Merge pull request #6384 from dabingnn/v3_optimize ... change tab to space for CCDirector.cpp	2014-04-28 09:54:43 +08:00
Huabing.Xu	64d7a6bd37	change tab to space	2014-04-28 09:51:10 +08:00
Ricardo Quesada	d0ebc14076	compiles on linux	2014-04-26 10:41:57 -07:00
Ricardo Quesada	81c2d92355	yeah... love in includes ... <3	2014-04-26 10:35:57 -07:00
Ricardo Quesada	9b118e5e96	Squashed commit of the following: ... commit 519fcd7f68e3586c376fd5e8d4a0ee220a48d225 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sat Apr 26 10:10:06 2014 -0700 Updates templates files commit 2b07843ebe592f56b2abc544ccf66d441bb19fc5 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sat Apr 26 10:08:19 2014 -0700 compiles on Windows commit b175522ef7205eaab3bd3f26c27c5d6514cbe2a4 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sat Apr 26 09:55:30 2014 -0700 adds cocos2d.h commit 4c3d14f929bac017b93ca843b4f149d352264a30 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sat Apr 26 09:54:24 2014 -0700 re-adds missing files commit f729181728959260d14c4152555534f5beec8e05 Merge: 148da79 2adac67 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sat Apr 26 09:51:12 2014 -0700 Merge branch 'includes_fixes' of github.com:ricardoquesada/cocos2d-x into includes_fixes commit 148da79010c5dffeab885933624cffaf3d588852 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sat Apr 26 09:49:12 2014 -0700 Adds SimpleAudioEngine commit 2adac67019180ec82b7bd03f0b67c12f62e29e77 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sat Apr 26 09:47:45 2014 -0700 Compiles for Android commit 4a300d1b9225fa5708f25a69a50bb531f0ac1a32 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sat Apr 26 09:13:35 2014 -0700 Fixes the includes	2014-04-26 10:11:22 -07:00
Ricardo Quesada	b053a9145a	Compiles on Windows32	2014-04-25 22:03:25 -07:00
Ricardo Quesada	c7a606fc78	Adds auto-culling for labels! ... yeah!	2014-04-25 19:00:22 -07:00
Ricardo Quesada	22fb1a774a	version is v3.1-alpha0	2014-04-25 18:03:35 -07:00
Ricardo Quesada	b801995bbe	Merge branch 'v3' into develop_migrate_math_lib	2014-04-25 17:56:52 -07:00
James Chen	d868196aae	Merge pull request #6372 from twhittock/mac-application-retcodes ... Returns correct value for Application::run on Mac platform	2014-04-25 17:19:51 +08:00
Tom Whittock	ec42b7c76a	Use correct return codes from mac CCApplication	2014-04-25 10:01:10 +01:00
Huabing.Xu	85e97f246d	Merge branch 'develop_migrate_math_lib_merge' into develop_migrate_math_lib	2014-04-25 16:37:31 +08:00
Huabing.Xu	dbf241c38d	fix compile error after merge	2014-04-25 16:30:51 +08:00
Huabing.Xu	feec24e3ef	Merge branch 'v3' into develop_migrate_math_lib_merge ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj cocos/2d/CCNode.cpp cocos/2d/CCRenderTexture.cpp cocos/2d/platform/wp8/CCGLView.h cocos/physics/CCPhysicsBody.cpp extensions/physics-nodes/CCPhysicsSprite.cpp extensions/physics-nodes/CCPhysicsSprite.h tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp	2014-04-25 16:20:24 +08:00
Huabing.Xu	613ba6e5b6	work on linux now	2014-04-25 15:10:37 +08:00
James Chen	828401a23d	Merge pull request #6302 from zifter/FixParticle ... closed #4880: Particle systems loading incorrectly in CocosBuilder	2014-04-25 14:15:44 +08:00
James Chen	8ffd663eb6	Merge pull request #6154 from newnon/develop_jni_improvements ... [android] Adds onActivityResult listeners	2014-04-25 13:51:36 +08:00
James Chen	cd6fe294b8	Merge pull request #6288 from boyu0/bug4771_move_physicsworld_2_layer ... closed #4771: Move PhysicsWorld to Layer	2014-04-25 11:52:32 +08:00
James Chen	7beb8b78fe	Merge pull request #6325 from MSOpenTech/wp8-3.0-update ... Wp8 3.0 update： Background texture is now correctly oriented in Transition Effects Accelerometer now works for WP8. Refactor of InputEvents was required to support adding Accelerometer event to rendering queue. Console support for WP8. Fixed cpp template for WP8. Added missing projects. Fixed property sheets. Updates precompiled shaders	2014-04-25 10:41:58 +08:00
Huabing.Xu	adcacbf5eb	Merge branch 'develop' into develop_migrate_math_lib_merge ... Conflicts: cocos/2d/CCLabelAtlas.cpp cocos/2d/CCLabelAtlas.h cocos/2d/CCLabelBMFont.cpp cocos/2d/CCLabelBMFont.h cocos/editor-support/cocostudio/CCSGUIReader.cpp	2014-04-24 16:58:46 +08:00
Dhilan007	a4ac5ab054	fixed drawDebugData of LabelBMFont/LabelAtlas.	2014-04-23 15:05:02 +08:00
Huabing.Xu	587f65098f	Fix compile error after merging	2014-04-23 14:59:45 +08:00
Huabing.Xu	f65973d9f0	Merge branch 'develop' into develop_migrate_math_lib_merge ... Conflicts: cocos/2d/CCActionInterval.cpp cocos/2d/CCLabelAtlas.cpp cocos/2d/CCLabelBMFont.cpp tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.cpp	2014-04-23 14:46:14 +08:00
Dhilan007	75772af82b	fixed compilation fails if CC_LABELBMFONT_DEBUG_DRAW or CC_LABELATLAS_DEBUG_DRAW is enabled.	2014-04-22 23:18:23 +08:00
minggo	506d628619	Merge pull request #6352 from natural-law/develop ... Solve compiling errors when some macros changed in ccConfig.h.	2014-04-22 17:00:28 +08:00
minggo	ccc935137b	Merge pull request #6343 from dumganhar/fixed-tilemaptest-crash ... Fixed tilemaptest crashes when clicking 'next' button quickly, it could be reproduced on win32	2014-04-22 16:53:32 +08:00
zhangbin	2305ba59e6	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop ... Conflicts: cocos/2d/CCActionInterval.cpp	2014-04-22 16:49:27 +08:00
zhangbin	093bd20a74	Solve compiling errors when some macros changed in ccConfig.h.	2014-04-22 16:42:13 +08:00
James Chen	b8e77d8968	Fixed compilation errors when disabling CC_ENABLE_STACKABLE_ACTION	2014-04-21 22:38:15 -07:00
James Chen	99654289ed	Invokes 'Node::onExit' only when the node is running.	2014-04-21 22:31:34 +08:00
James Chen	8038d3daa5	Fixed tilemaptest crashes when click 'next' button quickly	2014-04-21 22:24:44 +08:00
Huabing.Xu	7a38050e09	Merge branch 'develop' into develop_migrate_math_lib_merge	2014-04-21 17:47:34 +08:00
Huabing.Xu	83ee1b4bdc	android OK	2014-04-21 17:38:10 +08:00
minggo	3ac08b7349	Merge pull request #6300 from elvman/develop ... Flipping RenderTexture's sprite instead of scaling it by -1	2014-04-21 15:23:10 +08:00
minggo	8a75bccdc1	Merge pull request #6332 from minggo/develop ... update version	2014-04-21 13:44:40 +08:00
minggo	b53b9ceb3e	update version	2014-04-21 13:43:42 +08:00
boyu0	710fe9d940	closed #4771: modify test.	2014-04-21 13:32:47 +08:00
minggo	1c44dbe385	Merge pull request #6327 from boyu0/bug4904_Image_safeToFile_crashes_ios ... closed #4904: fix ios Image::saveToFile crashes when save jpg file.	2014-04-21 11:02:11 +08:00
boyu0	a1024353f1	issue #4904: fix iOS Image::safeToFile crashes when save jpg file.	2014-04-21 10:25:34 +08:00
Dale Stammen	9792a4708a	fixed curl DEBUGASSERT for release builds	2014-04-19 10:33:40 -07:00
Dale Stammen	6646e6c860	input event refactor. console enabled for wp8	2014-04-19 10:12:34 -07:00
Dale Stammen	d235539b39	added missing include paths	2014-04-19 10:12:06 -07:00
Dale Stammen	8d6fe7be1a	added missing files	2014-04-19 10:11:44 -07:00
Dale Stammen	4a7fa029cc	updated property sheet include paths and warnings	2014-04-19 10:09:10 -07:00
Dale Stammen	467ededeff	enabled console for wp8	2014-04-19 10:08:01 -07:00
Dale Stammen	b0adaee331	added missing WP8 device orientation	2014-04-19 10:06:27 -07:00
Dale Stammen	768e0bd53f	updated wp8 precompiled shaders	2014-04-19 10:05:21 -07:00
Dale Stammen	8f14597717	check if _currentUTF16String is null	2014-04-19 09:38:45 -07:00
Dale Stammen	9cf463bf6a	start of input queue support	2014-04-19 09:37:54 -07:00
Dale Stammen	12b01dcb25	input events refactor	2014-04-19 09:32:59 -07:00
Dale Stammen	1a56f435fe	added missing files	2014-04-19 09:32:12 -07:00
Dale Stammen	bebfe31b48	removed input files from refactor	2014-04-19 09:28:37 -07:00
Dale Stammen	66ed186a56	added missing files	2014-04-19 09:27:28 -07:00
Dale Stammen	f2b5d7c395	updated winrt project file	2014-04-19 09:26:52 -07:00
Dale Stammen	d19e898f21	removed ccset.h	2014-04-19 09:26:38 -07:00
Dale Stammen	4baa7ebacf	added CC_PLATFORM_WINRT	2014-04-19 09:25:54 -07:00
Dale Stammen	1403737d2d	added functions to display ip address of device	2014-04-19 09:12:20 -07:00
Dale Stammen	f233251f4f	added functions to display ip address of device	2014-04-19 09:12:04 -07:00
Dale Stammen	008bde1e27	fixed font path when fontname is empty string	2014-04-19 09:11:20 -07:00
Dale Stammen	b54a1064fd	fixed accelerometer for wp8	2014-04-19 09:10:34 -07:00
Huabing.Xu	3b83d52f95	Merge branch 'develop' into develop_migrate_math_lib_merge ... Conflicts: cocos/ui/UIButton.cpp cocos/ui/UIButton.h cocos/ui/UICheckBox.cpp cocos/ui/UICheckBox.h cocos/ui/UIImageView.cpp cocos/ui/UIImageView.h cocos/ui/UILayout.cpp cocos/ui/UILayout.h cocos/ui/UILoadingBar.cpp cocos/ui/UIRichText.h cocos/ui/UISlider.cpp cocos/ui/UIText.cpp cocos/ui/UIText.h cocos/ui/UITextAtlas.cpp cocos/ui/UITextAtlas.h cocos/ui/UITextBMFont.cpp cocos/ui/UITextBMFont.h cocos/ui/UITextField.cpp cocos/ui/UITextField.h cocos/ui/UIWidget.cpp tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp	2014-04-19 00:30:34 +08:00
minggo	8e83cd7900	Merge pull request #6261 from iSevenDays/patch-9 ... Fix memory leak	2014-04-18 14:19:17 +08:00
minggo	0e7280b1ca	Merge pull request #6304 from dumganhar/iss4568-crash ... closed #4568: Application crashes on closing if CC_ENABLE_CACHE_TEXTURE_DATA is enabled.	2014-04-18 14:00:40 +08:00
minggo	a8a8ef85e6	add comment for EventListenerTouchOneByOne::checkAvailable()	2014-04-17 14:46:52 +08:00
James Chen	30e1d41dbf	Makes 'compareRenderCommand' as a static function instead of a global function	2014-04-17 10:16:37 +08:00
James Chen	63f54cb5f7	closed #4568: Application crashes on closing if CC_ENABLE_CACHE_TEXTURE_DATA is enabled. ... CC_SAFE_RELEASE(_eventDispatcher); should be after 'delete _renderer;' in Director's destructor.	2014-04-17 10:15:11 +08:00
zifter	08d975268d	Fix for issue http://www.cocos2d-x.org/issues/4880.	2014-04-17 03:15:43 +03:00
Elviss Strazdins	5ddef013ba	Flipping RenderTexture's sprite instead of scaling it by -1	2014-04-17 02:22:34 +03:00
Huabing.Xu	d14d3007d0	remove kazmath include file	2014-04-16 14:08:58 +08:00
Huabing.Xu	346d42f723	remove warning message---finished	2014-04-16 11:20:45 +08:00
Huabing.Xu	30dec564e6	remove kazmath/kazmath.h include	2014-04-15 23:50:28 +08:00
Huabing.Xu	debad86ec1	fix compile error after merge	2014-04-15 22:35:35 +08:00
Huabing.Xu	95cb7721f6	Merge branch 'develop' into develop_migrate_math_lib_merge ... Conflicts: cocos/2d/CCSprite.cpp tests/cpp-tests/Classes/NewRendererTest/NewRendererTest.cpp	2014-04-15 22:21:04 +08:00
Huabing.Xu	63b52dd287	replace Point with Vector2 in cocos folder cpp file	2014-04-15 18:13:57 +08:00
Huabing.Xu	e2a24dec84	replace Point with Vector2	2014-04-15 18:08:29 +08:00
Huabing.Xu	5303f50904	Migrate to Vector2 in DrawPrimitive.h	2014-04-15 17:29:23 +08:00
Huabing.Xu	9c33b48b50	remove Point in CCNode.h and CCSprite.h	2014-04-15 17:09:18 +08:00
Huabing.Xu	511e868ac4	migrate getAnchorPoint, getAnchorPointInPoints and relative member variable to Vector2	2014-04-15 16:59:16 +08:00
Huabing.Xu	e351b778c1	migrate setAnchorPoint to Vector2	2014-04-15 16:47:29 +08:00
Huabing.Xu	6686b657a4	Migrate getPostion and correspondent member variable to Vector2	2014-04-15 16:28:59 +08:00
Huabing.Xu	071cbc7565	migrate setPosition to Vector2	2014-04-15 16:16:14 +08:00
Huabing.Xu	ec2ef0f64b	migrate convertXXXX to Vector2 step2	2014-04-15 14:41:09 +08:00
Huabing.Xu	633173005b	migrate convertXXXX to Vector2	2014-04-15 14:29:12 +08:00
Huabing.Xu	4df714b9d8	Migrate to Vector2 in class Director	2014-04-15 14:18:40 +08:00
Huabing.Xu	44be9a38ec	Node convertToNodeSpace and convertToWorldSpace use Vector2	2014-04-15 14:09:46 +08:00
minggo	46e7058587	update version information	2014-04-15 13:58:51 +08:00
minggo	38b982f938	Merge pull request #6286 from dumganhar/rename-listener-method ... Renames the protected method: 'EventListener::(s|g)etSceneGraphPriority'-> 'EventListener::(s|g)etAssociatedNode'	2014-04-15 13:43:25 +08:00
boyu0	b53961b78d	issue $4771: fix lua test and fix some bugs	2014-04-15 13:40:44 +08:00
James Chen	8134404734	Renames the protected method: 'EventListener::(s|g)etSceneGraphPriority' ... -> 'EventListener::(s|g)etAssociatedNode'	2014-04-15 12:50:33 +08:00
Ricardo Quesada	3978cee2ee	compiles on windows	2014-04-14 20:00:06 -07:00
Ricardo Quesada	584ccf65e4	Culling working again	2014-04-14 16:46:19 -07:00
boyu0	c98f50026f	issue $4771: move PhysicsWorld to layer.	2014-04-15 03:21:18 +08:00
Huabing.Xu	15cc63c2ba	remove kmVec3 in ActionCamera	2014-04-14 15:26:05 +08:00
minggo	26494c000b	Merge pull request #6257 from dumganhar/group-command-manager-not-singleton ... GroupCommandManager should not be a singleton, it should be managed by Renderer.	2014-04-14 14:52:39 +08:00
minggo	bb15d0ecf9	Merge pull request #6267 from dabingnn/develop_add_culling_enabled_option ... Add interface setCullingEnabled(), culling is disabled by default	2014-04-14 14:50:11 +08:00
Huabing.Xu	3601fe9297	android can work	2014-04-14 14:30:17 +08:00
Huabing.Xu	c3bf78494a	remove CCFrustum.cpp, we will use new instead	2014-04-14 14:18:32 +08:00
James Chen	eb651a6ae4	Merge pull request #6272 from Dhilan007/develop ... LabelTTF:fixed display incorrect if create by FontDefinition.	2014-04-14 14:09:50 +08:00
Huabing.Xu	ec5398e7c6	Merge branch 'develop' into develop_migrate_math_lib_merge ... Conflicts: tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.h	2014-04-14 14:08:19 +08:00
Dhilan007	aef2767d23	change variable name.	2014-04-14 13:42:37 +08:00
Dhilan007	6fe64b83f8	LabelTTF:fixed display incorrect if create by FontDefinition.	2014-04-14 11:33:46 +08:00
Huabing.Xu	9935e8ddfb	setCullingEnabled set to public access ... changed renderer->culling test case	2014-04-14 11:33:40 +08:00
minggo	9f9a87f09d	Merge pull request #6254 from dumganhar/clippingnode-leak ... Memory leak fix for ClippingNode	2014-04-14 10:17:37 +08:00
James Chen	44a01be0f5	Merge pull request #6266 from dumganhar/develop ... Const love: std::function<void(Texture2D*)> -> const std::function<void(Texture2D*)>&	2014-04-14 10:04:44 +08:00
James Chen	5000873778	Const love: std::function<void(Texture2D*)> -> const ... std::function<void(Texture2D*)>&	2014-04-14 10:01:17 +08:00
Huabing.Xu	37bfeff8f0	Add interface setCullingEnabled(), culling is disabled by default	2014-04-14 09:56:01 +08:00
Huabing.Xu	80f96398b3	1. changed comment message in CCNode.cpp ... 2. changed Director projection to Matrix	2014-04-14 09:30:51 +08:00
Sachin Garg	69223549f3	Add support for orientation change callback (applicationScreenSizeChanged) in Android Java activity.	2014-04-14 05:46:30 +05:30
Anton Sokolchenko	65cf2e1256	Update CCImage.cpp	2014-04-13 01:13:58 +03:00
Anton Sokolchenko	a9ccb812ed	Fix memory leak	2014-04-12 18:47:00 +03:00
Sergey	436285accd	isActivityVisible method	2014-04-12 12:38:01 +04:00
James Chen	b276c42ae6	GroupCommandManager should not be a singleton, it should be managed by Renderer.	2014-04-12 13:01:42 +08:00
James Chen	922b399ef2	Memory leak fix for ClippingNode	2014-04-12 12:56:36 +08:00
Huabing.Xu	a8378a2b99	adjust comment	2014-04-11 17:31:35 +08:00
Huabing.Xu	7c027b16b0	change assert message	2014-04-11 16:07:55 +08:00
Huabing.Xu	51289e8a4c	1. add assert condition of rendering when adding command ... 2. fix bug: renderTexture->SpriteRenderTextureBug	2014-04-11 16:05:22 +08:00
Huabing.Xu	554ede75f0	remove kmMat4 in ActionCamera.cpp	2014-04-11 14:00:55 +08:00
Huabing.Xu	e5802a56da	remove kmMat4 in RenderTexture.cpp	2014-04-11 13:58:42 +08:00
James Chen	588d825691	Merge pull request #6236 from dumganhar/develop ... Small fix in CCRenderer.cpp, 'auto i = 0' -> 'ssize_t i = 0' in for loop	2014-04-11 13:53:54 +08:00
James Chen	85cc100ac4	Small fix in CCRenderer.cpp, 'auto i = 0' -> 'ssize_t i = 0' in for loop	2014-04-11 13:51:40 +08:00
Huabing.Xu	685b9ea297	android can work now	2014-04-11 12:02:56 +08:00
Huabing.Xu	1670e07300	Merge branch 'develop' into develop_migrate_math_lib_merge ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj build/cocos2d_tests.xcodeproj/project.pbxproj	2014-04-11 11:18:13 +08:00
Huabing.Xu	ad18add1af	remove kmMat4 in Sprite.cpp	2014-04-11 11:00:08 +08:00
James Chen	48a5fd555b	Compilation error fix in CCQuadCommand.cpp	2014-04-11 10:50:38 +08:00
James Chen	dbeefcdff2	Merge commit 'refs/pull/6230/head' of git://github.com/cocos2d/cocos2d-x into pull/6230	2014-04-11 10:48:29 +08:00
Huabing.Xu	591b1e9231	remove kmMat4 in Node.cpp	2014-04-10 23:12:29 +08:00
minggo	951bf1cbfa	remove unneeded codes	2014-04-10 22:56:40 +08:00
Huabing.Xu	d70305cf3b	remove kmMat4 in Render.cpp GLProgram, Grid, Layer	2014-04-10 22:38:57 +08:00
James Chen	6b21e598c5	[win32] Fix typo in cocos2d_(winrt_|wp8_)headers.props, gui -> ui	2014-04-10 21:14:24 +08:00
James Chen	1fdcaaa2c6	Initialzies member variables for QualCommand class.	2014-04-10 20:31:44 +08:00
James Chen	7b4bec1395	Merge pull request #6226 from dumganhar/develop ... Initializes member variables for TransitionScene class	2014-04-10 19:33:17 +08:00
James Chen	e7a4ac531a	Initializes member variables for TransitionScene class	2014-04-10 19:29:07 +08:00
Huabing.Xu	84cf5ca895	remove kmMat4 in Director.cpp	2014-04-10 17:36:47 +08:00
James Chen	167682fb46	Merge pull request #6222 from Dhilan007/develop ... Add CCFontFNT.h to cocos2d.h	2014-04-10 17:33:36 +08:00
Dhilan007	8472e51b85	Add CCFontFNT.h to cocos2d.h	2014-04-10 17:31:42 +08:00
James Chen	5d882cea23	Merge pull request #6213 from koowolf/wp8_fix ... fix compiler error in wp8	2014-04-10 17:10:08 +08:00
James Chen	a258df38a9	closed #4744: EventDispatcher::setDirtyForNode doesn't consider node's children	2014-04-10 15:31:22 +08:00
koowolf	aa51e5dd22	fix compiler error in wp8	2014-04-10 15:15:17 +08:00