11475 Commits

Author	SHA1	Message	Date
pandamicro	246eab11a1	Fix cocos2d/cocos2d-html5#3156 setBlendFunc issue in parser	2015-10-30 17:19:21 +08:00
zilongshanren	3e2094981f	add scale9sprite rendering type test	2015-10-30 14:01:01 +08:00
pandamicro	b58e656620	Merge pull request #14264 from super626/v3 ... Fix: Mesh::setGLProgramState may modify state block	2015-10-30 10:11:23 +08:00
zilongshanren	f84c2de1e2	add sprite and scale9sprite batch test	2015-10-30 09:58:02 +08:00
Filipe Lemos	11fc969ecb	Fixed inconsistency in getVersion() when no version is available on Android	2015-10-29 17:14:32 +00:00
zilongshanren	1417534194	add rendering type to scale9sprite	2015-10-29 23:13:36 +08:00
zilongshanren	7c82f9fe88	cache slice sprite calculation	2015-10-29 21:53:58 +08:00
Filipe Lemos	9aa1f7138d	Added override keyword to getVersion	2015-10-29 08:36:03 +00:00
zilongshanren	9a14ad5b14	fix a small bug related to non slice anchorPoint	2015-10-29 14:27:27 +08:00
yangxiao	11f5e6cf96	setGLProgramState should not modify state block	2015-10-29 14:22:13 +08:00
yangxiao	16d9cf1af9	setStateBlock implement	2015-10-29 14:21:25 +08:00
pandamicro	c0ecf7f7aa	Merge pull request #14262 from liamcindy/3.9_light_js ... update for light3d js reader	2015-10-29 13:52:33 +08:00
pandamicro	617f5265f1	Merge pull request #14256 from pandamicro/v3 ... Use generational gc friendly API in JSTouchDelegate	2015-10-29 12:34:42 +08:00
zilongshanren	ccf4cb5a74	improve scale9sprite	2015-10-29 10:41:58 +08:00
pandamicro	ac54c9b7de	Merge pull request #14261 from liamcindy/3.9_light ... update for light3d reader	2015-10-29 10:08:32 +08:00
unknown	f2f6d25408	update for light3d js reader	2015-10-29 10:04:56 +08:00
unknown	917edbcf62	update for light3d reader	2015-10-29 09:53:54 +08:00
Filipe Lemos	04fa7a8902	Added Application::getVersion() to get the app version.	2015-10-28 17:57:57 +00:00
Neo Kim	e59b7b74be	PageView - Add `scrollToItem()` having only one parameter.	2015-10-28 16:57:54 +09:00
Neo Kim	69b794d284	PageView - Remove `_indicatorEnabled` flag. Null `_indicator` means that it is disabled.	2015-10-28 16:57:53 +09:00
Neo Kim	9ed617c978	PageView - Add API descriptions	2015-10-28 16:56:36 +09:00
Neo Kim	b72e4118f0	PageViewIndicator - Add `PageViewIndicator.cpp` to build configuration files.	2015-10-28 16:56:36 +09:00
Neo Kim	e3fcd6722a	PageViewIndicator - Add some getter and setters.	2015-10-28 16:56:36 +09:00
Neo Kim	8abd1ab600	PageView - The indicator should be created before `ListView::init()`	2015-10-28 16:56:36 +09:00
Neo Kim	2d2d17172c	PageViewIndicator - Fix that indexes were upside down in vertical view.	2015-10-28 16:56:36 +09:00
Neo Kim	1897051664	PageView - Add `setDirection()` and `setIndicatorEnabled()` methods.	2015-10-28 16:56:36 +09:00
Neo Kim	eefdffc032	PageViewIndicator - Add `setDirection()` method.	2015-10-28 16:56:36 +09:00
Neo Kim	368a3048c4	PageView - Add `setIndicatorPosition()`.	2015-10-28 16:56:36 +09:00
Neo Kim	fc0fe976f7	PageView - Complete `handleReleaseLogic()` method.	2015-10-28 16:56:36 +09:00
Neo Kim	b19ed5a3b5	ScrollView - Change `moveInnerContainer()` to virtual method.	2015-10-28 16:56:36 +09:00
Neo Kim	b3f33de071	ListView - Change `calculateItemDestination()` to a class method.	2015-10-28 16:56:35 +09:00
Neo Kim	c684016ee6	PageView - Implementing page view indicator	2015-10-28 16:56:35 +09:00
Neo Kim	4dbfb79110	Add `onItemListChanged()`method.	2015-10-28 16:56:35 +09:00
Neo Kim	0ee09fcfce	PageView - Implement the page indicator	2015-10-28 16:56:35 +09:00
Neo Kim	30e2e46f20	PageView - Add `PageViewIndicator` which indicates current page among total pages.	2015-10-28 16:56:35 +09:00
Neo Kim	76acb91861	Move `createSpriteFromBase64()` from `UIScrollViewBar.cpp` to `ccUtils.h` in order to use it in other places.	2015-10-28 16:56:35 +09:00
Neo Kim	a2bc0d4859	ScrollViewBar - Change wording in comment.	2015-10-28 16:56:35 +09:00
Neo Kim	b9a4449494	PageView - Add `handleReleaseLogic()` for page view.	2015-10-28 16:56:35 +09:00
Neo Kim	46c0a43105	ScrollView - Use a vector in `scrollChildren()` instead of two floats.	2015-10-28 16:56:35 +09:00
Neo Kim	84d0625b93	ScrollView - Remove redundant codes.	2015-10-28 16:56:34 +09:00
Neo Kim	5de6aa78ec	ScrollView - Remove the return value of `scrollChildren()`.	2015-10-28 16:56:34 +09:00
Neo Kim	30d39af5fa	Refactor `jumpTo` methods to use `moveInnerContainer()`.	2015-10-28 16:56:34 +09:00
Neo Kim	e67250e162	ScrollView - Create `moveInnerContainer()` to replace `moveChildren()` and `moveChildrenToPosition()`. All move related logic will be integrated into one.	2015-10-28 16:56:34 +09:00
Neo Kim	97acf52cc8	PageView - Replace the legacy methods of `PageView` with the ones of `ListView`.	2015-10-28 16:56:34 +09:00
Neo Kim	e567259826	PageView - Change `PageView` to derive from `ListView` and use `ScrollView::Direction` instead of `PageView::Direction`.	2015-10-28 16:56:34 +09:00
pandamicro	7d832b0753	Merge pull request #14238 from pandamicro/v3 ... Add cc.Director.EVENT_BEFORE_UPDATE	2015-10-28 15:50:37 +08:00
pandamicro	06b828250a	Merge pull request #14241 from yuyangame/patch-1 ... fix cc.game.config['showFPS'] bug	2015-10-28 15:48:21 +08:00
pandamicro	893edbaf24	Merge pull request #14246 from WenhaiLin/v3.9 ... Fixed text may display of incomplete when Label create with system font on Mac.	2015-10-28 15:47:45 +08:00
pandamicro	b6b9364a84	Merge pull request #14232 from xiaofeng11/v3 ... Fix FadeOutDownTilesTest won't show last tile	2015-10-28 15:44:28 +08:00
WenhaiLin	7b758fd780	Fixed text may display of incomplete when Label create with system font on Mac.	2015-10-28 12:06:58 +08:00
pandamicro	68d75a519a	Use generational gc friendly API in JSTouchDelegate	2015-10-28 11:55:28 +08:00
CocosRobot	09cbc2145d	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-10-28 03:29:16 +00:00
Kvial	27773b6f1a	fix cc.game.config['showFPS'] bug ... ```javascript //project.json { ... 'showFPS' : false, ... } ``` ```javascript //CCBoot.js ... config[CONFIG_KEY.showFPS] = config[CONFIG_KEY.showFPS] || true;// this property will be set to true ... ```	2015-10-27 20:36:05 +08:00
XiaoFeng	6029635493	Remove comment out codes	2015-10-27 18:43:51 +08:00
pandamicro	616eae2b6d	Add cc.Director.EVENT_BEFORE_UPDATE	2015-10-27 17:32:57 +08:00
pandamicro	535c4bcd1d	Merge pull request #14236 from CocosRobot/update_lua_bindings_1445937846 ... [ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-10-27 17:31:43 +08:00
CocosRobot	35f7f3cb2f	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-10-27 09:29:42 +00:00
pandamicro	aa9f0d5bd5	Merge pull request #14049 from CodeAndWeb/v3-sprite-polygoninfo-from-plist ... Extending SpriteFrameCache to read PolygonInfo from atlas plist file	2015-10-27 17:28:22 +08:00
pandamicro	d2d60e36d2	Merge pull request #14222 from TheCodez/fix_memoryleak ... Fix memory leak in Enhance-API	2015-10-27 17:22:11 +08:00
pandamicro	c491ddf1e8	Merge pull request #14235 from pandamicro/v3 ... Fix cc.DrawNode.drawPoly	2015-10-27 17:19:50 +08:00
pandamicro	a3c2904e7f	Fix cc.DrawNode.drawPoly	2015-10-27 16:46:25 +08:00
XiaoFeng	f374df408e	Fix FadeOutDownTilesTest won't show last tile	2015-10-27 14:41:31 +08:00
Joachim Grill	94ab41ceb3	use "const string &" in SpriteFrameCache	2015-10-26 09:36:01 +01:00
XiaoFeng	036585ef95	Fix ActionManagerEx some times crash when reload action frames.	2015-10-26 10:38:17 +08:00
CocosRobot	5760e43387	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-10-26 01:45:38 +00:00
Michael Kösel	561b15e260	Fix memory leak in Enhance-API	2015-10-24 14:26:59 +02:00
mogemimi	9df30d2454	Fix typos in documentation	2015-10-23 16:59:51 +09:00
pandamicro	ade1d0ef8d	Merge pull request #14214 from pandamicro/spriteframecache ... Fixed memory leak in CCSpriteFrameCacheHelper	2015-10-23 09:29:37 +08:00
fuyifan	5065a542f7	fix the issue #14113	2015-10-23 00:00:18 +08:00
pandamicro	530321fe70	#14124 Improved JSCallbackWrapper with generational GC and fix the issue	2015-10-22 17:00:57 +08:00
pandamicro	175f4c02ad	Merge pull request #14197 from xiaofeng11/v3_xf ... Fix CCDownloader-curl will crash in js-test & Fix broken image link in TextureCacheTest.js	2015-10-22 14:45:20 +08:00
pandamicro	0a6360eee0	Merge pull request #14196 from geron-cn/v3 ... AnchorPointFrame animation performance diffrent	2015-10-22 14:37:26 +08:00
XiaoFeng	6beb982665	Adjust code execute order, used a simple and safe way to avoid access fail bug.	2015-10-22 14:36:26 +08:00
pandamicro	65fafef044	Merge pull request #14209 from pandamicro/v3 ... Disable bitcode for all targets	2015-10-22 12:55:25 +08:00
pandamicro	4633a93631	Disable bitcode for all targets	2015-10-22 12:18:51 +08:00
pandamicro	05b277752c	Merge pull request #14105 from WenhaiLin/v3.9-rc ... ParticleSystemQuad:Fixed incorrectly generate errors "Particle system not enough memory"	2015-10-22 10:36:02 +08:00
pandamicro	a7e5946b7d	Merge pull request #14154 from Dimon4eg/fix-crash-in-web-view-on-android ... Fix crash in web view on android	2015-10-22 10:35:00 +08:00
pandamicro	f98d0cc115	Merge pull request #14166 from webcrawler/my_fix_branch ... remove duplicate include	2015-10-22 10:33:05 +08:00
pandamicro	6925e423e3	Merge pull request #14204 from mogemimi/fix-naming-typos ... Fix naming typos	2015-10-22 10:25:07 +08:00
pandamicro	f2898ecf30	Merge pull request #14207 from super626/terrain ... fix shader on pc	2015-10-22 10:10:10 +08:00
yangxiao	cca25f5b5c	fix shader on pc	2015-10-22 09:29:12 +08:00
pandamicro	d3664b9616	#14128 Fix cc.loader.getRes crash caused by null type	2015-10-22 01:16:56 +08:00
pandamicro	43c19fd1e7	Merge pull request #14205 from pandamicro/v3 ... Fix Scheduler API inconsistency	2015-10-21 22:11:16 +08:00
pandamicro	9eeda122e9	Fix Scheduler API inconsistency	2015-10-21 22:10:48 +08:00
dimon4eg	27d5ad920e	Update comment	2015-10-21 16:55:45 +03:00
dimon4eg	7e43e28ca2	Fix crash in java code only	2015-10-21 16:55:25 +03:00
dimon4eg	82bcbb0325	Revert: Fix crash in web view on android	2015-10-21 16:54:41 +03:00
pandamicro	558ac3cfa0	Made CC_CONSTRUCTOR_ACCESS public only when script binding is enabled	2015-10-21 16:05:31 +08:00
mogemimi	4012dd8455	Fix naming typos	2015-10-21 15:56:47 +09:00
pandamicro	d8baf75748	Merge pull request #14195 from liamcindy/v3.9_light ... fix light3D reader error	2015-10-21 13:45:37 +08:00
Dale Stammen	d8e10981db	added check to see if app is already visible	2015-10-20 10:38:42 -07:00
Dimon4eg	6581954b5b	Merge pull request #1 from Dimon4eg/v3 ... merge	2015-10-20 12:48:16 +03:00
pandamicro	7466c4c71e	Merge pull request #14194 from super626/v3 ... check light enable or not when switching shader	2015-10-20 17:09:37 +08:00
XiaoFeng	428db9c458	update js binding version info	2015-10-20 17:04:31 +08:00
XiaoFeng	18b7b533ce	Update 3.9 beta0 change log & version info	2015-10-20 16:46:31 +08:00
XiaoFeng	7e54a91ee6	Fix CCDownloader-curl will crash in js-test ... Fix broken image link in TextureCacheTest.js	2015-10-20 16:28:03 +08:00
pandamicro	7443cf915d	Merge pull request #14185 from mogemimi/fix-memory-leak ... Fix some memory leaks	2015-10-20 15:56:39 +08:00
geron-cn	be8a158bd7	fix bug: #23532 AnchorPointFrame animation performance diffrent with cocos studio	2015-10-20 15:49:12 +08:00
Liam	7280a963b3	fix light3D reader error	2015-10-20 15:24:34 +08:00
yangxiao	a4d67867d7	check light enable or not when switching shader	2015-10-20 15:11:39 +08:00
CocosRobot	6a0e1b323f	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-10-20 02:42:17 +00:00
mogemimi	c3194ac34d	Fix memory leak in TMXLayer	2015-10-19 19:47:36 +09:00
mogemimi	34831d48ce	Fix memory leak in GLViewImpl	2015-10-19 19:46:45 +09:00
pandamicro	f4a2a53f6d	Merge pull request #14184 from xiaofeng11/v3_xf ... Fix EventListenerCustom registered by UILabel never has been released bug	2015-10-19 17:13:25 +08:00
XiaoFeng	762e25ad33	Remove unused parameter	2015-10-19 16:06:39 +08:00
XiaoFeng	ffb2cfa9e0	Fix EventListenerCustom registered by UILabel never has been released bug	2015-10-19 14:07:50 +08:00
pandamicro	82881bf92f	Merge pull request #14109 from loadrunner/label3 ... Added line spacing/leading feature to Label	2015-10-19 10:55:53 +08:00
pandamicro	be45e0bc50	Merge pull request #14174 from noshbar/v3 ... CPPCheck fixes, correct deallocation, array size.	2015-10-19 10:05:01 +08:00
pandamicro	4395886133	Merge pull request #14175 from MSOpenTech/v3-winrt-angle ... V3 winrt angle update to fix issue #9980	2015-10-19 01:27:03 +08:00
pandamicro	e8a22237e6	Merge pull request #14173 from njh0602/somefix ... Simple merge() version	2015-10-18 22:59:23 +08:00
pandamicro	cde67d1261	Merge pull request #14162 from mogemimi/fix-warnings ... Fix warnings on Xcode 7	2015-10-18 22:56:12 +08:00
pandamicro	c365fc5883	Merge pull request #14180 from pandamicro/v3 ... Fix issue for web engine upgrade	2015-10-18 22:48:16 +08:00
pandamicro	cfb1ee2b11	Improved logic of jsb_boot.js to sync with the web engine behavior	2015-10-18 22:45:53 +08:00
pandamicro	11890d6c4b	Fix issue for web engine upgrade	2015-10-18 00:19:02 +08:00
Dale Stammen	fdebb373b1	updated cocos2d-x/angle template files to version 0edf96a2f54a43d068244a86aaf9133c1bf71fe5	2015-10-16 15:36:34 -07:00
Dale Stammen	ce88dbdee4	removed WP8.1 shader code	2015-10-16 14:48:03 -07:00
Dale Stammen	414a34f3f9	removed old WP8.1 shaders for gl_PointSize	2015-10-16 14:47:02 -07:00
남준현	f47f4aa00e	Simple merge() version	2015-10-17 04:59:07 +09:00
남준현	f49d467465	Add virtual keyword.	2015-10-17 04:46:37 +09:00
Dirk de la Hunt	88bcaad518	General fixes: ... - changed some delete operations to be deletions of arrays where applicable - changed some "free" operations to "delete" where memory was allocated with "new" CCPUScriptCompiler.cpp: - added checks to see if temp1 and temp2 are non-null before dereferencing them FileServer.cpp: - changed the size of startFlag to be 13, seeing as the strcpy into it copies a string, "RuntimeSend:", is already 12 characters long, but strcpy() attempts to copy the NULL terminator too.	2015-10-16 21:43:09 +02:00
fjut	4c3d0c62bb	remove duplicate include ... duplicate include: #include "ui/CocosGUI.h"	2015-10-16 21:41:40 +08:00
dimon4eg	d317cd75e1	Improved code a bit	2015-10-16 11:28:34 +03:00
mogemimi	8af6531c94	Replace deprecated CCApplication with Application	2015-10-16 15:02:06 +09:00
mogemimi	4600c41f9b	Add override keywords	2015-10-16 15:01:10 +09:00
pandamicro	efeb6a44fb	Merge pull request #14143 from MSOpenTech/v3-win10-curl ... V3 win10 curl	2015-10-16 13:35:48 +08:00
남준현	5118a31faf	// cross pro'c'uct of 2 vector. A->B X C->D ... // cross pro'd'uct of 2 vector. A->B X C->D	2015-10-16 03:24:54 +09:00
Sebastien Flory	bd83fc1474	PMA Handling issue ... Hi, I compared to cocos2D-x v2.x and it seems that there is an issue with the _hasPremultipliedAlpha flag not beeing set correctly for mipmaps and compressed textures. I guess it's a mistake due to the reorganization of the code between the old CCTexture2D and the new one. In our tests, this fixes the issue. Best, Sebastien	2015-10-15 15:48:21 +02:00
dimon4eg	ee3c000b43	Fix crash in web view on android	2015-10-15 16:43:53 +03:00
yangxiao	907189ed14	correct wrong presion, which leads to failed on some devices	2015-10-15 11:59:38 +08:00
Dale Stammen	3e3e47de10	added Win10 UWP curl support	2015-10-14 16:47:52 -07:00
pandamicro	07c2ec49db	Merge pull request #14140 from xiaofeng11/v3 ... Bug fix	2015-10-14 21:12:06 +08:00
mogemimi	59d7868d4c	Fix minor typos	2015-10-14 15:12:22 +09:00
pandamicro	40aa4187be	Merge pull request #14138 from songchengjiang/cocos2d-v3-bugfix2 ... fix the #23272 bug	2015-10-14 14:05:09 +08:00
XiaoFeng	a6a3e24fdd	Fix when image size of variable button status texture are different, Helper::restrictCapInsetRect result may cause pressed & disabled status picture won't display.	2015-10-14 13:58:58 +08:00
songchengjiang	02f20db82a	fix the #23272 bug	2015-10-14 13:24:38 +08:00
yangxiao	4c7edd457e	set _hasPremultipliedAlpha to false	2015-10-13 15:45:24 +08:00
pandamicro	b19bf82170	Merge pull request #14108 from loadrunner/label2 ... Changed label font size type to float	2015-10-13 11:55:14 +08:00
pandamicro	5e43cfa129	Merge pull request #14107 from loadrunner/label1 ... Removed scale factor for label shadow	2015-10-13 11:54:14 +08:00
pandamicro	5b35796093	Merge pull request #14091 from yangws/v3 ... Fix textfield input Chinese error with specific IME on Android.	2015-10-12 14:54:56 +08:00
mogemimi	daa29752db	Fix typo in UIEditBox	2015-10-12 13:57:50 +09:00
pandamicro	3dde02ba93	Merge pull request #14106 from loadrunner/tilemap ... TMXLayer cast bug	2015-10-11 18:43:24 +08:00
Danut Chereches	471c23930c	added line spacing/leading	2015-10-10 19:15:45 +03:00
Danut Chereches	019b549a20	changed font size type to float	2015-10-10 19:15:22 +03:00
Danut Chereches	aeb268f3cd	cast tile coordinates to int before calculating index	2015-10-10 19:05:51 +03:00
WenhaiLin	05c235f9fe	ParticleSystemQuad:Fixed incorrectly generate errors "Particle system: not enough memory"	2015-10-10 17:55:05 +08:00
pandamicro	f64105b3dc	Merge pull request #14047 from liamcindy/v3.9 ... update for light3d reader	2015-10-10 11:43:05 +08:00
pandamicro	376180c1d6	Merge pull request #14093 from cpascal/fix_audioplayer ... Fixed AudioPlayer crash in Win32	2015-10-10 11:32:46 +08:00
pandamicro	c2571f950c	Merge pull request #14003 from zilongshanren/fixWebViewCallback ... fix ui::WebView callback operate OpenGL issue.	2015-10-10 11:32:02 +08:00
pandamicro	8b0a6a6c29	Merge pull request #14099 from pandamicro/v3 ... [ci skip]Sync with CCBoot for web	2015-10-10 10:16:16 +08:00
pandamicro	5ae2812bf8	Sync with CCBoot for web	2015-10-10 10:15:36 +08:00
pandamicro	bf35655ce3	Merge pull request #14100 from CocosRobot/update_lua_bindings_1444440864 ... [ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-10-10 09:44:51 +08:00
pandamicro	ee3399a4a4	Merge pull request #14097 from TheCodez/patch-1 ... Add missing getChildByTag<>() api	2015-10-10 09:43:46 +08:00
CocosRobot	216438fb9b	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-10-10 01:40:55 +00:00
pandamicro	db0d23ede4	Merge pull request #14087 from geron-cn/v3 ... fix code error, redundant interface	2015-10-10 09:39:35 +08:00
pandamicro	27fc6b24ee	Merge pull request #14080 from 1scaR1/v3 ... Fixed enabling of scale9 background in ccui.Layout	2015-10-10 09:39:09 +08:00
pandamicro	7d4988f43f	Merge pull request #14095 from mogemimi/fix-typo ... Fix typos	2015-10-10 09:29:53 +08:00
Michael Kösel	493d95c3f6	Add missing getChildByTag<>() api	2015-10-10 00:08:38 +02:00
pandamicro	bc9b59b7f7	Merge pull request #14096 from pandamicro/v3 ... [ci skip]Add opacity/color cascade test case for Scale9Sprite	2015-10-09 21:07:27 +08:00
pandamicro	0ea54868e2	Add opacity/color cascade test case for Scale9Sprite	2015-10-09 21:01:49 +08:00
mogemimi	5993304e06	Fix typos	2015-10-09 17:59:11 +09:00
cpascal	13c1258f9d	Fixed AudioPlayer crash in Win32	2015-10-09 15:03:05 +09:00
Vincent Yang	90ef4be103	Fix textfield input chinese error with specific IME on Android.	2015-10-09 12:06:22 +08:00
子龙山人	cdf6fa8a54	Merge pull request #14052 from neokim/fix_listview_center_magnetic_issue ... Fix an issue that list view's Magnetic::CENTER is not working well when non-bounceable.	2015-10-09 08:27:18 +08:00
pandamicro	4b66caaed8	Merge pull request #14084 from super626/v3 ... correct spot light init value	2015-10-08 17:15:03 +08:00
geron-cn	6b9890472b	fix code error, redundant interface	2015-10-08 14:14:49 +08:00
pandamicro	f730a38db6	Merge pull request #14086 from CocosRobot/update_lua_bindings_1444275958 ... [ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-10-08 11:51:04 +08:00
pandamicro	2d73bbd9d4	Merge pull request #14056 from Dimon4eg/fix-crash-if-csb-file-is-missing ... fix crash if csb file is broken	2015-10-08 11:50:40 +08:00
CocosRobot	1919d1a679	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-10-08 03:50:33 +00:00
zilongshanren	7fd2ad7548	remove unneeded final temp string	2015-10-08 11:47:11 +08:00
pandamicro	a68d07b968	Merge pull request #14075 from TheCodez/getname_byref ... Node::getName() now returns string by reference	2015-10-08 11:43:03 +08:00
yangxiao	d6eb1b938f	correct spot light init value	2015-10-08 11:27:02 +08:00
pandamicro	5c816b5d9b	Merge pull request #14063 from kammy/improve_spriteframecache ... Inprove SpriteFrameCache::addSpriteFramesWithDictionary	2015-10-08 11:23:21 +08:00
pandamicro	e32e8b95a4	Merge pull request #14055 from Dimon4eg/fix-crash-in-LoadingBar ... fix crash in LoadingBar	2015-10-08 11:22:43 +08:00
pandamicro	2dbe0c1a90	Merge pull request #14016 from xiaofeng11/v3 ... Fix quickly click mouse in "41:Node:Physics -> 6:joints" in cpp-test may cause program crash	2015-10-08 11:12:36 +08:00
pandamicro	c787e2c1b0	Merge pull request #14073 from mogemimi/fix-compiler-warning ... Fix -Wformat-security warning on Xcode	2015-10-08 11:01:15 +08:00
pandamicro	255edd5b46	Merge pull request #14079 from ZeroHackeR/v3 ... Fixing SocketIO - Connect failed after Disconnected	2015-10-08 10:46:40 +08:00
pandamicro	6bafb2f6c2	Merge pull request #14082 from pandamicro/v3 ... Fix simulator android x86 release compilation issue	2015-10-08 10:43:35 +08:00
pandamicro	57ac40b9bc	Fix simulator android x86 release compilation issue	2015-10-08 09:46:50 +08:00
Nikita	0042f9f5cd	Fixed background size if scale9 enabled in Layout ... Fixes for issue: cocos2d#14001	2015-10-06 16:14:47 +03:00
ZeroHackeR	4cfe139991	Fixing SocketIO - Connect failed after Disconnected ... Fixes for issue: https://github.com/cocos2d/cocos2d-x/issues/14077	2015-10-06 13:21:22 +06:30
TheCodez	eb747cf808	Node::getName() returns string by reference	2015-10-05 21:42:07 +02:00
mogemimi	8c04c01953	Fix -Wformat-security warning on Xcode	2015-10-05 19:53:03 +09:00
Dale Stammen	49e8abbc58	added #if _MSC_VER < 1900	2015-10-04 09:32:48 -07:00
pandamicro	b38eec4d47	Merge pull request #13999 from igorzel/FixIntegerOverflowInIosDevice ... Fix crash (integer overflow) in Device::getTextureDataForText (ios)	2015-10-04 11:00:07 +08:00
pandamicro	1e298a2c1a	Merge pull request #14064 from MSOpenTech/v3-win10-fix ... V3: fixed Windows 10 UWP app manifest by correcting image asset paths	2015-10-04 10:53:52 +08:00
Dale Stammen	32eeb560c3	clean up include files for WINRT platforms	2015-10-02 18:49:41 -07:00
Dale Stammen	548fc94eb8	added missing std includes	2015-10-02 18:17:11 -07:00
Dale Stammen	27f2397142	undefine ABSOLUTE for CC_PLATFORM_WINRT	2015-10-02 18:04:31 -07:00
KURA Shuichi	0469632cf8	Inprove addSpriteFramesWithDictionary ... - Moved initialization of image to an appropriate location, because it always called twice in SpriteFrameCache::addSpriteFramesWithFile()	2015-10-03 03:18:07 +09:00
mogemimi	9f768bc1ab	Add missing override keyword	2015-10-02 18:18:23 +09:00
Joachim Grill	c49b60ae40	SpriteFrameCache: added plist file format documentation, fixed broken link	2015-10-01 10:36:18 +02:00
Joachim Grill	9a0ea79b61	remove set/get/hasPolygonInfo methods from js / lua api; fixed C++11 issue	2015-09-30 15:20:53 +02:00
dimon4eg	168b295b2e	fix crash if csb file is missing	2015-09-30 14:44:30 +03:00
dimon4eg	ec20b48775	fix crash in LoadingBar	2015-09-30 13:04:13 +03:00
dimon4eg	fe8c1a12b5	Fix for text field	2015-09-30 12:39:44 +03:00
dimon4eg	2785a4313f	Set focus for widgets	2015-09-30 12:31:33 +03:00
Neo Kim	423cbb83a9	Fix an issue that list view's Magnetic::CENTER is not working well around boundaries if it is non-bounceable.	2015-09-30 16:55:48 +09:00
Joachim Grill	79656ffe13	fixed typo, indentation	2015-09-29 16:50:14 +02:00
Joachim Grill	ac24612e98	extend SpriteFrameCache to load PolygonInfo from plist file	2015-09-29 15:42:04 +02:00
Liam	8368762b37	update for light3D	2015-09-29 18:33:28 +08:00
CocosRobot	246fa7ffd8	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-09-29 07:45:48 +00:00
Liam	87a406febe	update for light3d reader	2015-09-29 11:27:01 +08:00
XiaoFeng	84347bb056	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3	2015-09-29 09:35:35 +08:00
Danut Chereches	8944f9e1cd	removed scale factor for label shadow	2015-09-28 16:27:20 +03:00
Yukio Murakami	bc4bd99863	Support the new line element. Fixed a problem that protrude from the drawing area.	2015-09-28 14:47:09 +09:00
CocosRobot	b082620d85	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-09-27 15:24:49 +00:00
pandamicro	7b85211cfe	Remove ScriptComponent ... Because windows platform can't successfully compile in previous architecture	2015-09-27 22:18:59 +08:00
WenhaiLin	f4c56e8605	Fixed compile errors	2015-09-26 19:43:36 +08:00
pandamicro	2a3526a3fd	Fix lua project	2015-09-26 19:43:36 +08:00
pandamicro	91928aa23d	Add ComponentJS test case and fix windows platforms	2015-09-26 19:43:36 +08:00
pandamicro	ddb636a022	Add ScriptComponent and ComponentJS	2015-09-26 19:43:36 +08:00
pandamicro	7e2b8c71a7	Improve lua script component	2015-09-26 19:43:35 +08:00
minggo	26632ec69a	linjia demo finish	2015-09-26 19:43:35 +08:00
XiaoFeng	47d9a59b41	Fix quickly click mouse in "41:Node:Physics -> 6:joints" in cpp-test may cause program crash.	2015-09-25 18:12:16 +08:00
CocosRobot	c135587962	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-09-25 08:43:00 +00:00
pandamicro	970300c3e2	Merge pull request #14012 from jianglong0156/customSpine ... add custom spine skeletonAnimation test	2015-09-25 16:34:57 +08:00
Vincent Yang	5c0d6691ca	Fix bug: FileUtils::GetFileSize can't treat multi-char path.	2015-09-25 14:50:20 +08:00
江龙	9eb05707fb	add custom spine skeletonAnimation test	2015-09-25 13:36:48 +08:00
pandamicro	e16404c280	Merge pull request #14008 from thuydx55/fix_android_compile_script_load_pluginx ... Fix loading pluginx lib when compile Android with --compile-script flag	2015-09-24 14:08:46 +08:00
pandamicro	95379c5dc2	Merge pull request #13995 from xiaofeng11/v3 ... Fix issue http://punchbox.info:3000/issues/23146	2015-09-24 13:03:59 +08:00
Nick	003920f826	fix loading pluginx when compile Android with --compile-script flag	2015-09-24 11:41:18 +07:00
XiaoFeng	6db2cd7b9c	Fix issue : http://punchbox.info:3000/issues/23182 ... When time scale set to negative value, it will cause emitCounter been set to negative value and cause render crash	2015-09-23 18:37:12 +08:00
zilongshanren	bee52e378d	fix ui::WebView callback operate OpenGL issue. ... All the OpenGL operations should be in OpenGL thread. This PR wraps the callbacks in OpenGL thread.	2015-09-23 11:22:36 +08:00
XiaoFeng	f5c88c32af	Fix click slider bar but not drag ball, after slider position changed won't send percentChangedEvent	2015-09-23 10:55:01 +08:00
igorzel	40a6789765	Fixed integer overflow in Device::getTextureDataForText (in CCDevice-ios.mm) ... There was the problem when “height” and “width” were typecast to short integer. So for values more than sizeof(short) we had integer overflow. Steps to reproduce: Create simple application with EditBox. Start it. Add 1000 (just example) characters at a time to the EditBox. Method Device::getTextureDataForText will be called and there will be integer overflow for “height” and “width”. As a result application will crash later.	2015-09-22 13:25:43 +03:00
CocosRobot	b09b146f97	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-09-22 09:23:14 +00:00
Martin Taylor	62e36e8006	fix typos and syntax error. A thorough check by tool VSSpellChecker.	2015-09-22 16:08:23 +08:00
XiaoFeng	573f5868ca	Fix issue http://punchbox.info:3000/issues/23146	2015-09-22 14:52:16 +08:00
pandamicro	08204ec0bd	Merge pull request #13991 from MSOpenTech/v3-win10-fix ... V3 Win10 UWP fixes	2015-09-22 02:44:45 +08:00
pandamicro	d3504a9216	Update versions and html5 engine	2015-09-22 02:31:21 +08:00
Dale Stammen	6a5db06115	added missing CCMotionStreak3D files. Re-added all Physics and 3D files to project	2015-09-21 11:11:34 -07:00
pandamicro	b54a06a55e	Merge pull request #13987 from Dimon4eg/Fix-crash-in-FontFreeType ... Fix crash in destructor of FontFreeType	2015-09-22 01:59:34 +08:00
pandamicro	deacab9222	Merge pull request #13990 from MSOpenTech/v3-win10-fix ... V3 Win10 UWP fixes	2015-09-22 01:57:53 +08:00
pandamicro	eec67ea13b	Merge pull request #13975 from zilongshanren/fixIssue11259 ... don't change Text's dimension when label scale.	2015-09-22 01:49:20 +08:00
Dale Stammen	70e157a44a	removed CCComponentPhysics2d from Win10 UWP project	2015-09-21 10:44:30 -07:00
pandamicro	7fcea1ccaf	Merge pull request #13976 from lsybblll/lsybblll-patch-1 ... Update CCPhysics3DComponent.cpp	2015-09-22 01:44:03 +08:00
Dale Stammen	d5151952bb	fixed compiler warning	2015-09-21 10:43:28 -07:00
dimon4eg	09b5b7fcc3	Fix crash in destructor of FontFreeType	2015-09-21 18:18:58 +03:00
CocosRobot	9ef7991b99	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-09-21 10:43:59 +00:00
子龙山人	f2190c79b9	Merge pull request #13835 from neokim/add_jump_to_item_to_listview ... Add a feature of jumping to a specific item in list tview	2015-09-21 18:36:05 +08:00
lsybblll	84489d322a	Update CCPhysics3DComponent.cpp ... there should save old bool.	2015-09-21 17:11:45 +08:00
zilongshanren	fd8cfd8ccb	don't change Text's dimension when label scale. ... Fixed issue: https://github.com/cocos2d/cocos2d-x/issues/11259	2015-09-21 17:03:29 +08:00
CocosRobot	0af77fca90	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-09-21 08:35:18 +00:00
Neo Kim	b09a0bd0e3	Add a missing parameter in comment for document.	2015-09-21 17:07:32 +09:00
pandamicro	5511d42cd4	Merge pull request #13716 from fusijie/particle_performance ... Refactory particle system update.	2015-09-21 14:19:55 +08:00
子龙山人	aa6d5e1a04	Merge pull request #13961 from zilongshanren/fix-xcode7-override-issue ... fix missing override keyword	2015-09-21 11:34:43 +08:00
pandamicro	6ab7f3804e	Merge pull request #13960 from TimothyZhang/jsb-writeDataToFile ... Add jsb.fileUtils.writeDataToFile()	2015-09-21 10:48:25 +08:00
zilongshanren	511b58a3b2	fix missing override keyword	2015-09-21 09:51:27 +08:00
pandamicro	9246d50a7f	Merge pull request #13234 from perminovVS/v3-dev-check-create-window ... glfwCreateWindow not guarantee create	2015-09-20 23:22:47 +08:00
pandamicro	fa9afd6c2b	Merge pull request #13953 from himynameschris/fix-socketio ... Fix socketio to work with servers v1.0+	2015-09-20 23:15:27 +08:00
pandamicro	c2214e56af	Merge pull request #13954 from geron-cn/v3 ... format apis added in https://github.com/cocos2d/cocos2d-x/pull/13770	2015-09-20 17:01:41 +08:00
fusijie	d871b1aa8a	Refactory particle system.	2015-09-20 16:46:09 +08:00
pandamicro	44329d96ba	Merge pull request #13946 from WenhaiLin/v3-binding-tool-refine ... Refine lua/js binding tool	2015-09-20 16:42:40 +08:00
geron-cn	f93cfac0f7	rename setAnimationEndCallFunc	2015-09-20 16:24:41 +08:00
zhangting	caaf912a28	add writeDataToFile() for jsb	2015-09-20 15:38:15 +08:00
geron-cn	0cfc33e4d3	format apis added in https://github.com/cocos2d/cocos2d-x/pull/13770	2015-09-20 12:34:34 +08:00
Chris Hannon	bd7f90f993	adds initializing value and corrects spelling of variable _endpointseparator ... Signed-off-by: Chris Hannon <chris@channon.us>	2015-09-19 20:47:54 -04:00
Chris Hannon	e7c2436d85	fixes bug in socketio extension when connecting to socketio servers v1+ (incorrect separator in v1 packet strings) ... Signed-off-by: Chris Hannon <chris@channon.us>	2015-09-19 20:31:48 -04:00
WenhaiLin	b77d04f593	Fixed link errors	2015-09-19 00:59:28 +08:00
CocosRobot	c562a57030	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-09-18 16:32:43 +00:00
pandamicro	6bf54a3eda	Merge pull request #13770 from geron-cn/v3 ... add Frame End Call Back and Animation Clip End Call Back	2015-09-19 00:24:21 +08:00
CocosRobot	37cb9afb3f	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-09-18 14:04:49 +00:00
pandamicro	0cbc1e5f40	Merge pull request #13923 from WenhaiLin/v3-physics-refine ... Refine components to improve physics performance	2015-09-18 21:56:36 +08:00
pandamicro	ce0166ef6e	Merge pull request #13940 from CocosRobot/update_lua_bindings_1442584025 ... [ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-09-18 21:55:21 +08:00
pandamicro	cc8e944050	Merge pull request #12220 from hanxi/v3 ... add UIEditBox support linux platform	2015-09-18 21:53:09 +08:00
CocosRobot	ad65343814	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-09-18 13:51:58 +00:00
pandamicro	add24ccf95	Merge pull request #13913 from fusijie/revert-12889-fix_clippingRectangle_bug ... Revert "remove CCClippingRectangleNode transform error support."	2015-09-18 21:43:42 +08:00
pandamicro	724011f19b	Merge pull request #12071 from waiter/v3 ... Fix a bug in Scheduler which may case Force Close	2015-09-18 21:39:36 +08:00
pandamicro	7ac0b861c9	Merge pull request #13905 from perminovVS/win32-remove-dir-correct-point ... FileUtilsWin32 removeDirectory correct remove file begins with point	2015-09-18 18:14:20 +08:00
pandamicro	6a975fe641	Merge pull request #13599 from perminovVS/winrt-mouse-support ... WinRT support mouse	2015-09-18 17:26:15 +08:00
hanxi	b1ed1a8a51	add UIEditBox support linux platform.	2015-09-18 17:11:58 +08:00
pandamicro	13f3d46ad4	Merge pull request #13897 from super626/v3 ... SkyboxBrush : Make the shader parameter take effect at once	2015-09-18 16:14:06 +08:00
CocosRobot	79a7878687	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-09-18 07:41:46 +00:00
WenhaiLin	a17a702cd1	Refine components to improve performance	2015-09-18 14:34:02 +08:00
yangxiao	36d4f5564d	merge cocos	2015-09-18 14:08:33 +08:00
fusijie	23246b006b	fixed region x,y scale bug.	2015-09-18 13:39:22 +08:00
CocosRobot	fe41739584	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-09-18 04:07:18 +00:00
pandamicro	3f5df0ccc3	Merge pull request #13647 from super626/motionstreak3d ... Motionstreak3d	2015-09-18 11:59:33 +08:00
偶尔e网事	eb480fb021	Revert "remove CCClippingRectangleNode transform error support."	2015-09-18 11:31:37 +08:00
yangxiao	6f1b04fd89	merge cocos	2015-09-18 09:37:26 +08:00
Vladimir Perminov	06b74695c2	unzOpen use getSuitableFOpen for correct open utf8 file name on Windows. ... Fix bags, can't open file on windows platforms, if this contains utf8 chars	2015-09-17 23:30:32 +03:00
Vladimir Perminov	fdacdcae07	FileUtilsWin32 removeDirectory correct remove file begins with point ... Need check fileName . and .. for delete folders and files begin name.	2015-09-17 22:36:43 +03:00
Vladimir Perminov	583e780e29	Correct all templates	2015-09-17 22:09:41 +03:00
pandamicro	ded9a9e6d4	Merge pull request #13893 from yangws/downloader ... Remove AssetsManager dependence with CRUL.	2015-09-17 22:18:56 +08:00
yangxiao	757209e59e	make the shader parameter take effect at once	2015-09-17 18:14:17 +08:00
pandamicro	1f0006efe8	Merge pull request #13859 from geron-cn/v3bugfixs ... fix bug: ReEntry a same frameindex after scaled action's speed.	2015-09-17 17:48:06 +08:00
pandamicro	5f3a2bb000	Merge pull request #13874 from super626/light ... Fix shader light parameter bug	2015-09-17 17:46:46 +08:00
pandamicro	4aaf017e4c	Merge pull request #13890 from jianglong0156/addsetUniformLocationWithMatrix ... add CCGLProgram function binding setUniformLocationWithMatrix	2015-09-17 17:45:16 +08:00
Vincent Yang	5eafc93d86	Remove AssetsManager dependence with CRUL.	2015-09-17 16:52:31 +08:00
pandamicro	1eeafed072	Merge pull request #13884 from yangws/v3 ... Fix bug: in Widget::isClippingParentContainsPoint, _hittedByCamera may be null.	2015-09-17 16:32:56 +08:00
江龙	1b320ac248	add CCGLProgram function binding setUniformLocationWithMatrix	2015-09-17 15:34:41 +08:00
yangxiao	256832d000	replace genGLProgramState to genMaterial	2015-09-17 14:45:16 +08:00
yangxiao	572ee3adb2	merge cocos	2015-09-17 14:24:01 +08:00
Vincent Yang	4b83240bed	Fix bug: in ui::Widget::isClippingParentContainsPoint, _hittedByCamera may be null.	2015-09-17 11:20:36 +08:00
James Chen	0eaf4c6866	[lua] Wrong callback setting for webview:setOnDidFailLoading	2015-09-17 10:52:17 +08:00
pandamicro	d8289ca676	Merge pull request #13843 from yangws/issue_13551 ... Fixed #13551 : MenuItemImage Camera Issue.	2015-09-17 00:08:54 +08:00
andyque	1be5402050	Merge branch 'v3' into addiOSMultiline-support ... # Conflicts: # build/cocos2d_libs.xcodeproj/project.pbxproj	2015-09-16 21:49:55 +08:00
yangxiao	fb7ade6578	reset set material	2015-09-16 18:08:23 +08:00
yangxiao	b5e69930cd	fix shader light parameter	2015-09-16 18:04:52 +08:00
geron-cn	e6fb2f8924	fix ReEntry a same frame when scale action's speed.	2015-09-16 15:44:43 +08:00
Neo Kim	d9be26cd98	Use another dirty flag for list view layout other than 'Layout::_doLayoutDirty' because 'Layout::onEnter()' forces '_doLayoutDirty' to be true always. List view should have a way not to do layout in 'onEnter()'.	2015-09-16 16:21:11 +09:00
Mazyad Alabduljaleel	3090599f83	Oops, committed duplicate code by mistake	2015-09-16 10:12:07 +03:00
pandamicro	0479cca364	Merge pull request #13832 from yangws/downloader ... Restructure CCDownloader implement on iOS and Android don't use libcurl.	2015-09-16 14:01:28 +08:00
Vincent Yang	36337ad694	Fixed #13551 : MenuItemImage Camera Issue.	2015-09-16 11:24:55 +08:00
yangxiao	ea538cd9da	merge cocos	2015-09-16 10:37:24 +08:00
Vincent Yang	ea585f4b7d	Fix compile problems.	2015-09-16 09:34:24 +08:00
Mazyad Alabduljaleel	61980d1a8b	[refactor] Break down the file into separate files, because it exceeded 1 kLOC 🙀 ... [refactor] Consolidate `UITextView` and `UITextField` APIs. [refactor] rename classes that start with `UI` to `CCUI`, since that prefix is reserved by Apple. [bugfix] setting the placeholder for `CCUISingleLineTextField` was missing in `createSingleLineTextField` [bugfix] In `MultiLineTextView`, if `placeholder` changed, there doesn't seem to be a deterministic way of updating the `placeholderLabel`. We are relying on `drawRect:`. Instead, `placeholder` is now a computed property on top of `placeholderLabel.text`. [bugfix] If the user wants multi-line secure input, we should set it, since it is possible, right? [minor] `[viewWithTag:999]` was used instead of calling the property itself. [minor] `drawRect:` was used to load properties, when it is normally in the getter. [minor] fix ObjC code style	2015-09-15 23:36:26 +03:00
Neo Kim	11d80f47f8	Refactor list view's layout refreshing logic.	2015-09-15 22:34:00 +09:00
Neo Kim	f58cbad6c2	Add 'jumpToItem()' to list view.	2015-09-15 22:33:50 +09:00
CocosRobot	ae8a35a726	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-09-15 10:36:16 +00:00
Vincent Yang	848fa2c0d0	Merge cocos2d.	2015-09-15 18:30:45 +08:00
子龙山人	f2bee23696	Merge pull request #13789 from neokim/fix-13668 ... Fix for #13668	2015-09-15 18:28:24 +08:00
子龙山人	f5848290a2	Merge pull request #13673 from Almax27/patch-3 ... Removed ScrollView::_innerContainer pointer copy	2015-09-15 17:42:20 +08:00
子龙山人	6eece55e80	Merge pull request #13828 from CocosRobot/update_lua_bindings_1442298458 ... [ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-09-15 16:55:14 +08:00
子龙山人	2157059fef	Merge pull request #13826 from zilongshanren/enableSliderBodyTouch ... Enable tapping Slider bar to scroll	2015-09-15 16:55:00 +08:00
CocosRobot	19561ca84b	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-09-15 06:32:52 +00:00
子龙山人	73d2c5d1b8	Merge pull request #13577 from fusijie/fix_13454 ... Fixed sprite debug draw.	2015-09-15 14:24:23 +08:00
andyque	fe5a43c428	Enable tapping Slider bar to scroll ... Fixed issue: https://github.com/cocos2d/cocos2d-x/issues/13434	2015-09-15 14:13:52 +08:00
pandamicro	5e037c9ad8	Merge pull request #13806 from xiaofeng11/v3 ... Fix 1.6 version bone animation crash when perform getBoneAtPoint(0,0)	2015-09-15 14:05:02 +08:00
andyque	556175df1e	add iOS EditBox multiline support ... When the inputMode is ANY, then we use TextView to input. otherwise we use normal UITextField. Fixed issue https://github.com/cocos2d/cocos2d-x/issues/13436	2015-09-15 13:52:39 +08:00
CocosRobot	c9b30bd391	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-09-15 05:45:47 +00:00
andyque	2fea4db9fc	fix ui::Button title location issue	2015-09-15 13:37:32 +08:00
pandamicro	dbe3e062bc	Merge pull request #13801 from chengstory/OptimizateDoLayout ... Move "ui::Helper::DoLayout" to "CreateNode"。	2015-09-15 13:37:00 +08:00
zhangcheng	fb104189d4	Multiplexing ccs.load.	2015-09-15 13:04:45 +08:00
zhangcheng	fa7f97b26e	Adjustment spaces.	2015-09-15 11:35:43 +08:00
子龙山人	02eca21b78	Merge pull request #13701 from seivan/patch-3 ... Don't call release() before retain() #13656	2015-09-15 11:28:56 +08:00
Vincent Yang	bf477c6bfb	Restructure AssetsManagerEx.	2015-09-15 11:23:46 +08:00
zhangcheng	83f5f85f56	add loadWithVisibleSize js function.	2015-09-15 11:16:02 +08:00
CocosRobot	4b3e71e353	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-09-15 01:35:59 +00:00
子龙山人	1d7d283ee6	Merge pull request #13549 from neokim/add_getters_for_renderers_into_button ... Add getters for the internal renderer instances of Button	2015-09-15 09:26:34 +08:00
pandamicro	89d81bd959	Merge pull request #12281 from lijinlong/v3 ... luabinding enumerateChildren bug	2015-09-14 22:32:56 +08:00
pandamicro	dd6c1bc611	Merge pull request #13802 from geron-cn/v3bugfixs ... fix crash recall a cached timeline after exit scene	2015-09-14 22:12:06 +08:00
XiaoFeng	12f0f7f580	Fix 1.6 version bone animation crash when perform getBoneAtPoint(0,0)	2015-09-14 17:36:19 +08:00
zhangcheng	224f392a9c	Add createNodeWithVisibleSize to CSLoader.	2015-09-14 16:51:58 +08:00
Vincent Yang	ebf308d88c	Test case Downloader Test restructured.	2015-09-14 15:33:34 +08:00
Neo Kim	c224a81497	Rectify typos	2015-09-14 15:27:51 +09:00
geron-cn	c800d0d824	fix crash recall a cached timeline after exit scene	2015-09-14 14:24:42 +08:00
pandamicro	1fd2e65b48	Merge pull request #13799 from CocosRobot/update_lua_bindings_1442203019 ... [ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-09-14 13:12:36 +08:00
zhangcheng	f88b23f52b	Move "ui::Helper::DoLayout" to "CreateNode".	2015-09-14 13:07:15 +08:00
CocosRobot	a4cb98d993	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-09-14 04:01:38 +00:00
Neo Kim	3fff195c20	Override 'jumpToSomewhere' functions in list view to recalculate inner container's size if necessary.	2015-09-13 22:32:22 +09:00
Neo Kim	7f9c8acc2a	ScrollView - Add a guard statement in setContentSize() to avoid resetting inner container's position if not necessary.	2015-09-13 21:43:34 +09:00
James Chen	6073456f23	[Lua] Life control fix for XMLHttpRequest	2015-09-12 17:49:30 +08:00
pandamicro	4022fb65e1	Merge pull request #13760 from super626/materialfix2 ... fix material clone	2015-09-11 18:24:05 +08:00
子龙山人	0e9ae83376	Merge pull request #13782 from CocosRobot/update_lua_bindings_1441965150 ... [ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-09-11 18:06:47 +08:00
CocosRobot	e79678454b	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-09-11 09:59:04 +00:00
pandamicro	2795d0a488	Merge pull request #13779 from pandamicro/v3 ... Fix Chipmunk setCollisionType issue by initializing variables	2015-09-11 17:58:48 +08:00
子龙山人	96d6221daf	Merge pull request #13723 from neokim/add_scroll_to_item_and_magnetic_scroll_into_listview ... Add scrolling to item and magnetic scroll into ListView	2015-09-11 17:48:40 +08:00
pandamicro	5a918608c1	Fix Chipmunk setCollisionType issue by initializing variables	2015-09-11 15:23:29 +08:00
yangxiao	ca24e6eba3	fix clone	2015-09-11 15:08:59 +08:00
Neo Kim	f39644d129	Remove default arguments in APIs and rename the parameter 'time' to 'timeInSec'.	2015-09-11 16:00:53 +09:00
yangxiao	6fd9784fce	setParent for RenderState	2015-09-11 11:47:36 +08:00
geron-cn	966e568051	add ActionTimeline Frame End Call Back and Animation Clip End Call Back	2015-09-10 18:29:09 +08:00
CocosRobot	cfe0be269b	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-09-10 10:14:45 +00:00
pandamicro	f281ae31b0	Merge pull request #13725 from WenhaiLin/v3-comonent-refine ... Refine ComponentContainer to improve performance	2015-09-10 18:04:26 +08:00
Vincent Yang	bd80eb6f46	CCDownloader-android implements Data Task Download.	2015-09-10 18:03:15 +08:00
Seivan Heidari	ea12b601d9	Don't call release() before retain()	2015-09-10 11:09:17 +02:00
pandamicro	7611f99ee4	Merge pull request #13746 from WenhaiLin/v3-menuitemtoggle-refine ... Uncoupling the implementation of MenuItemToggle dependence on tag.	2015-09-10 16:15:18 +08:00
Vincent Yang	7e2fe05050	CCDownloader-android implements File Task Download.	2015-09-10 15:56:06 +08:00
pandamicro	98f29e4dee	Merge pull request #13764 from fusijie/fix_autopolygon_comments ... [ci skip]Fixed autopolygon comments	2015-09-10 15:22:55 +08:00
fusijie	d957e0c032	Fixed auto polygon comments out of date.	2015-09-10 15:18:04 +08:00
pandamicro	941cd3c9de	Merge pull request #13717 from jianglong0156/assetsmanagerContinue ... fix the AssetsManagerEx can not continuous transmission	2015-09-10 11:34:03 +08:00
yangxiao	d5fab0bd38	merge cocos	2015-09-10 10:44:09 +08:00
yangxiao	8f5cd6cdc8	remove setParent	2015-09-10 09:28:01 +08:00
yangxiao	64471fab85	fix material clone	2015-09-10 09:23:02 +08:00
CocosRobot	b164ac059d	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-09-09 10:45:05 +00:00
pandamicro	d03b100ec1	Merge pull request #13706 from WenhaiLin/v3-ios-phonecall-fix ... [IOS platform]AudioEngine:Fixed audio can not resume if it is interrupted cause by an incoming phone call.	2015-09-09 18:37:13 +08:00
pandamicro	f31ebfe331	Merge pull request #13748 from jianglong0156/uniformConversion ... add uniform conversion	2015-09-09 18:04:07 +08:00
江龙	4509a316cc	add uniform conversion ... relate issue:https://github.com/cocos2d/cocos2d-x/issues/13747 relate pr:https://github.com/cocos2d/bindings-generator/pull/191	2015-09-09 16:03:57 +08:00
WenhaiLin	e251866d23	Uncoupling the implementation of MenuItemToggle dependence on tag.	2015-09-09 15:32:44 +08:00
CocosRobot	b3976cdd63	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-09-09 06:08:45 +00:00
WenhaiLin	34be2065e4	Refine ComponentContainer to improve performance	2015-09-09 11:53:55 +08:00
Martin Taylor	e592a1a02d	fix typos	2015-09-09 11:37:41 +08:00
yangxiao	153bdb7170	add comment	2015-09-09 11:11:17 +08:00
pandamicro	f7f8a42ecf	Merge pull request #13722 from NatWeiss/patch-17 ... Fix crash in FrameBuffer if no DepthStencil	2015-09-09 10:46:58 +08:00
子龙山人	ae7b45a569	Merge pull request #13732 from CocosRobot/update_lua_bindings_1441765845 ... [ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-09-09 10:42:04 +08:00
CocosRobot	2423f05024	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-09-09 02:37:17 +00:00
子龙山人	20531061a2	Merge pull request #13728 from CocosRobot/update_lua_bindings_1441765050 ... [ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-09-09 10:36:54 +08:00
pandamicro	9814851355	Merge pull request #13659 from seivan/patch-2 ... EventListenerMouse will dispatch EventMouse events	2015-09-09 10:34:12 +08:00
pandamicro	dc607a1784	Merge pull request #13726 from jianglong0156/actionExtendSquash ... support custom action, and rewrite update function	2015-09-09 10:25:56 +08:00
CocosRobot	a78f5e3dcc	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-09-09 02:23:01 +00:00
江龙	badd80bf3a	support custom action, and rewrite update function ... support custom action in js, and developer can rewrite the update function in custom action class. useage: // custom action sample code var customMoveBy = cc.MoveBy.extend({ ctor:function (duration, deltaPos, deltaY) { this._super(duration, deltaPos, deltaY); }, update:function (dt) { this._super(dt); if (this.getTarget()) { // rand color this.getTarget().setColor(cc.color(cc.rand()%255, cc.rand()%255, cc.rand()%255)); } } });	2015-09-09 10:08:07 +08:00
Neo Kim	586af44fe6	ListView - Add getter / setter for magnetic out of boundary flag.	2015-09-09 10:29:19 +09:00
Neo Kim	b28b8146e7	ListView - Add the logic for magnetic bounce back.	2015-09-09 10:29:19 +09:00
Neo Kim	3085e1385c	ListView - Add 'startMagnetScroll()' for non-inertia scroll.	2015-09-09 10:29:18 +09:00
Neo Kim	e58c073186	ListView - Apply magnetic to inertia scroll.	2015-09-09 10:29:18 +09:00
Neo Kim	ca3ea53ffd	ListView - Add enum for magnetic type and test cases for magnetic scroll.	2015-09-09 10:29:18 +09:00
Neo Kim	d8fc04d109	ListView - Add 'scrollToItem' method and its test cases.	2015-09-09 10:29:18 +09:00
Neo Kim	2599271410	ListView - Add APIs which return the closest item in specific position in current view.	2015-09-09 10:29:17 +09:00
Neo Kim	a4e5f7c0a8	ScrollView - Refactor the logic about getting out of boundary amount.	2015-09-09 10:28:47 +09:00
Neo Kim	90891f9efb	ScrollView - Add a utility function 'flattenVectorByDirection()'	2015-09-09 10:28:46 +09:00
Neo Kim	ea79d92aa1	ScrollView - Fix an issue which occurs when auto scroll is started during already bouncing back.	2015-09-09 10:28:46 +09:00
Neo Kim	7394b3f467	ScrollView - Rename 'startAutoScrollChildrenWithDestination()' to 'startAutoScrollToDestination' and 'duration' to 'time'.	2015-09-09 10:28:46 +09:00
Neo Kim	c037769e62	ScrollView - Correct auto scroll direction	2015-09-09 10:28:45 +09:00
Neo Kim	2dec85e175	ScrollView - Fix that the last touch when release was not considered for inertia scroll	2015-09-09 10:28:45 +09:00
Neo Kim	5f469264fc	ScrollView - Refactor auto scroll for simpler implementation ... - Remove auto scroll callback	2015-09-09 10:28:45 +09:00
Neo Kim	ad01bc7699	ScrollView - Add startAttenuatingAutoScroll()	2015-09-09 10:28:44 +09:00
Neo Kim	3cff03e8ed	ScrollView - Remove movement callback from auto scroll.	2015-09-09 10:28:44 +09:00
Neo Kim	0c4414625a	ScrollView - Rectify wrong indentations	2015-09-09 10:28:44 +09:00
Nathanael Weiss	14b9c2e75c	Fix crash in FrameBuffer if no DepthStencil ... This fixes a debug-config crash if a FrameBuffer has no `RenderTargetDepthStencil`.	2015-09-08 13:13:38 -07:00
江龙	d6934cfc4b	rename var resumeDownloaded to resumeDownloaded.	2015-09-08 16:38:02 +08:00
江龙	8daf026c6c	fix the AssetsManagerEx can not continuous transmission for large zip file. ... the testcase is extension/assetsmanager	2015-09-08 16:34:02 +08:00
yangxiao	f944750627	add material cache	2015-09-08 15:29:54 +08:00
pandamicro	d60eb21d59	Merge pull request #13710 from minggo/implement-function-in-cpp ... fix crash on xiaomi2 if cocos2d-x is built as a dynamic library	2015-09-08 13:28:19 +08:00
pandamicro	eab6dbe6fd	Merge pull request #13711 from minggo/crash-in-dynamic-library ... don't define static variable in header file or each dynamic lib will have a copy	2015-09-08 11:45:12 +08:00
minggo	d86b256396	don't define static variable in header file or each dynamic lib will have a copy	2015-09-08 11:04:51 +08:00
minggo	bbe5861367	fix crash on xiaomi2 if cocos2d-x is built as a dynamic library	2015-09-08 10:26:37 +08:00
minggo	8326ed6535	add physics component	2015-09-08 09:54:01 +08:00
Seivan Heidari	2f02690394	EventListenerMouse will dispatch EventMouse events	2015-09-07 20:05:51 +02:00
子龙山人	75882e64a0	Merge pull request #13646 from neokim/refactor_scrollview_inertia_scroll ... Refactor scroll view's inertia scroll	2015-09-07 22:38:20 +08:00
pandamicro	00abec6c2c	Merge pull request #13707 from pandamicro/fix_layerrgba ... [ci skip] Fix compile error in __LayerRGBA	2015-09-07 17:27:46 +08:00
TheCodez	d77045818c	Fix compile error in __LayerRGBA	2015-09-07 17:25:56 +08:00
WenhaiLin	e500b960f3	AudioEngine:Fixed audio can not resume if it is interrupted cause by an incoming phone call.	2015-09-07 16:29:57 +08:00
pandamicro	0eee625788	Merge pull request #13697 from pabitrapadhy/patch-1 ... Updated spelling and grammar mistakes	2015-09-07 15:02:27 +08:00
pandamicro	4fb34ba190	Merge pull request #13703 from cocos2d/v3.8 ... Sync v3.8 to v3	2015-09-07 14:56:37 +08:00
yangxiao	c3ac446f35	resolve conflict	2015-09-07 14:45:09 +08:00
yangxiao	97c59c87ac	built in material for sprite3d	2015-09-07 13:59:38 +08:00
yangxiao	137d180dc9	fix material clone	2015-09-07 13:59:08 +08:00
Vincent Yang	9b4fe5b5a1	Add CCDownloader-android class frame to android project.	2015-09-07 11:55:00 +08:00
pandamicro	2739be06bb	Update COCOS2D_VERSION	2015-09-07 11:45:04 +08:00
WenhaiLin	42b24a9c5b	Rename AVAudioPlayer to CCAudioPlayer for avoid conflicting with system framework	2015-09-07 11:12:13 +08:00
Vincent Yang	3a078540a0	Modify CCDownloader-apple.mm support continuly download.	2015-09-07 10:08:28 +08:00
Pabitra Padhy	d4c60144f0	Updated spelling and grammar mistakes	2015-09-06 15:29:36 +05:30
Vincent Yang	0afa2bdfc6	Modify CCDownloader-curl.cpp to support continue download.	2015-09-06 15:57:51 +08:00
子龙山人	f9eef5ceed	Merge pull request #13636 from zilongshanren/refactorEditBox ... refactor EditBox iOS&Android implementation	2015-09-06 10:03:54 +08:00
pandamicro	2dfd22dfef	Merge pull request #13690 from pandamicro/v3.8 ... [ci skip][JS] Add common APIs for compatibility with web engine	2015-09-06 08:59:27 +08:00
pandamicro	86fb0fc3bc	[JS] Add common APIs for compatibility with web engine	2015-09-06 08:57:43 +08:00
Dale Stammen	030157ded0	update libcococs2d name to v3.9 for WinRT platforms	2015-09-04 08:46:08 -07:00
pandamicro	f9c20caa67	Merge pull request #13603 from perminovVS/correct-key-code ... Desktop and WinRT use correct keyboard codes	2015-09-04 14:39:44 +08:00
Aaron	59fab25804	Removed innerContainer pointer copy when cloning ... Copied pointer becomes invalid when model widget destructs. Instead we simply copy the position.	2015-09-03 11:29:58 +01:00
pandamicro	ab5b634976	Merge pull request #13625 from frranck/patch-4 ... Update CCImage.cpp	2015-09-03 00:10:16 +08:00
Vladimir Perminov	527e254617	Remove glfwError	2015-09-02 18:41:23 +03:00
Vladimir Perminov	c1ac27fffb	glfwError no static member	2015-09-02 15:02:23 +03:00
Vincent Yang	ea580ed2ee	Restructure CCDownload Interface and implements with curl.	2015-09-02 18:26:42 +08:00
andyque	c0f40ad4a5	fix Android EditBox font size issue	2015-09-02 18:25:30 +08:00
songchengjiang	addce6c565	add CC_DLL	2015-09-02 15:55:58 +08:00
linguofeng	7fc382055b	lua add UPDATE_FAILED ERROR_DECOMPRESS ... add cc.EventAssetsManagerEx.EventCode.UPDATE_FAILED cc.EventAssetsManagerEx.EventCode.ERROR_DECOMPRESS	2015-09-02 11:27:47 +08:00
子龙山人	4530043d9b	Merge pull request #13649 from WenhaiLin/v3-string-empty-check ... Use string::empty() to check whether string is empty.	2015-09-01 18:04:41 +08:00
Neo Kim	3656ce99bd	Fix an issue regarding non-bouncing scroll view	2015-09-01 15:13:18 +09:00
yangxiao	5cabc592e0	add motionstreak3d to cocos2d header	2015-09-01 11:34:35 +08:00
WenhaiLin	5fdb041856	Use string::empty() to check whether string is empty.	2015-09-01 11:26:09 +08:00
yangxiao	c23805889f	add motionstreak3d	2015-09-01 11:02:22 +08:00
Neo Kim	129f4b3186	Implement the inertia scroll using auto scroll feature. Consolidate them into one.	2015-09-01 11:52:05 +09:00
Neo Kim	ecd947d9f4	Change auto scroll feature to receive callbacks to remove dependencies.	2015-09-01 11:45:42 +09:00
Neo Kim	137a05a2aa	Rectify the wrong indentations in switch statements	2015-09-01 11:45:42 +09:00
Neo Kim	69d23eb00c	Extract the touch move speed calculation logic from inertia concept.	2015-09-01 11:45:42 +09:00
Neo Kim	81795f6d73	Add a guard statement in setInnerContainerPosition().	2015-09-01 11:45:42 +09:00
Neo Kim	96a78f687c	Remove redundant codes	2015-09-01 11:45:42 +09:00
子龙山人	2e9e660cbb	Merge pull request #13220 from zilongshanren/testEditBoxWin32 ... Improved EditBox implement for platform win32	2015-09-01 10:40:11 +08:00
yangxiao	b6c4f4cf50	add comment	2015-09-01 10:39:14 +08:00
pandamicro	7f04a191c7	Merge pull request #13635 from super626/v3.8 ... Enable depth write for transparent object	2015-09-01 10:30:50 +08:00
子龙山人	59c1b21d0b	Merge pull request #13634 from WenhaiLin/v3.8-textreader-refine ... This is a small optimization about TextReader.	2015-09-01 09:40:52 +08:00
Jeff Wang	b8105349c7	revert to the original state when user cancel input	2015-09-01 00:06:18 +08:00
WenhaiLin	a3b5becb45	Sync v3.8 to v3	2015-08-31 22:05:37 +08:00
andyque	367a105a48	refactor EditBox iOS&Android implementation ... Fixed issue: https://github.com/cocos2d/cocos2d-x/issues/13616#issuecomment-135742727	2015-08-31 18:36:27 +08:00
yangxiao	030ab8858d	enable depth write for transparent object	2015-08-31 18:34:09 +08:00
WenhaiLin	df383de894	This is a small optimization about TextReader.	2015-08-31 17:06:11 +08:00
geron-cn	e7c7b248d6	fix bug: bone can be see by other cameras	2015-08-31 16:04:17 +08:00
pandamicro	8f6f5c1191	Update engine versions	2015-08-31 13:52:15 +08:00
frranck	8e195723e6	Update CCImage.cpp ... When you're creating a sprite (e.g. with Sprite* Sprite::create(filename)) There's no way to test the file before, without getting "a unsupport image format!" thrown.	2015-08-30 09:40:15 +02:00
yangxiao	bc07d7954a	fix render state	2015-08-28 23:00:45 +08:00
Vincent Yang	cf664800ac	refine #22483 : Restructure CCDownload Interface and implements on iOS.	2015-08-28 16:40:11 +08:00
pandamicro	9d72d6a924	Merge pull request #13496 from ZhangMenghe/v3-notification ... [ci rebuild] Notification effect enhancement	2015-08-28 14:10:42 +08:00
yangxiao	6fa6f1f0da	enable depth write	2015-08-28 11:46:11 +08:00
yangxiao	bc2e66d03b	add motionstreak3d	2015-08-28 11:40:12 +08:00
子龙山人	4fe9517ec7	Merge pull request #13592 from neokim/fix_13591 ... Fix #13591	2015-08-28 10:19:20 +08:00
pandamicro	1264863b2f	Merge pull request #13598 from zilongshanren/fixSliderConstructor ... fix Slider create missing res type.	2015-08-28 09:28:19 +08:00
Liam	69da65d7a4	update for jsb_opengl_constants	2015-08-28 08:42:55 +08:00
Vladimir Perminov	b5688f504c	Desktop and WinRT use correct keyboard codes ... Desktop: GLFW_KEY_ENTER equals KEY_ENTER ( GLFW_KEY_KP_ENTER = KEY_KP_ENTER) WinRT: VK_PRIOR equals KEY_PG_UP ( not KEY_KP_PG_UP )	2015-08-27 23:46:24 +03:00
Vladimir Perminov	104013aebe	commit v3.8 overwrite this unused code ... From commit #13397	2015-08-27 23:19:30 +03:00
Vladimir Perminov	bf40c1acd1	WinRT support mouse event ... Mouse event implemented similar Desktop version. Left button send mouse event and touch. Support other mouse button and scroll wheel.	2015-08-27 21:34:25 +03:00
Vladimir Perminov	b5c289c622	WinRT support Show/Hide mouse cursor	2015-08-27 21:19:59 +03:00
andyque	40492e6169	fix Slider create missing res type. ... fixed https://github.com/cocos2d/cocos2d-x/issues/13575	2015-08-27 23:34:39 +08:00
Liam	ed49250b9b	update for reader ... 1.update for sprite3d cullface 2.sync js code	2015-08-27 18:29:45 +08:00
pandamicro	032bc590b7	Merge pull request #13593 from jianglong0156/fixActionParamError ... fix Action:Place, RotateTo param wrong number error	2015-08-27 17:44:46 +08:00
江龙	a060a82d88	fix Action:Place, RotateTo param wrong number error	2015-08-27 17:35:09 +08:00
Neo Kim	30d52d1394	Fix #13591	2015-08-27 17:12:07 +09:00
子龙山人	30d6c82da6	Merge pull request #13585 from WenhaiLin/v3.8-scheduleOnce-hotfix ... [Node::scheduleOnce]Fixed the callback will be executed multiple times if the value of delay parameter equal zero.	2015-08-27 10:54:04 +08:00
pandamicro	d6045fdbea	Merge branch 'v3.8' of github.com:cocos2d/cocos2d-x into v3 ... Conflicts: cocos/audio/winrt/Audio.cpp cocos/platform/winrt/CCCommon.cpp cocos/platform/winrt/CCWinRTUtils.cpp cocos/platform/winrt/CCWinRTUtils.h	2015-08-27 10:40:04 +08:00
Ricardo Quesada	d5d1be93cc	make it compile on win32	2015-08-26 10:16:50 -07:00
Dale Stammen	09a1211c96	use isWindowsPhone() to check for Windows Phone platform	2015-08-26 09:47:59 -07:00
Dale Stammen	161954da87	fixed pdb file output location	2015-08-26 09:41:23 -07:00
Dale Stammen	4cb3d88232	added isWindowsPhone() to correctly detect Windows 10 phone	2015-08-26 09:19:28 -07:00
Dale Stammen	fcae139857	removed old WP8_SHADER_COMPILER defines	2015-08-26 08:50:11 -07:00
WenhaiLin	393af19237	[Node::scheduleOnce]Fixed the callback will be executed multiple times if the value of delay equal zero.	2015-08-26 23:41:48 +08:00
pandamicro	405e6c24c8	Merge pull request #13578 from geron-cn/v3.8 ... bone's color and opacity cannot cascade to bone	2015-08-26 22:33:31 +08:00
pandamicro	8459978dfa	Merge pull request #13572 from zilongshanren/fixIssue13564 ... fix Scale9Sprite draw extra pixels in spritesheet	2015-08-26 21:35:00 +08:00
pandamicro	d49edbb4f5	Merge pull request #13574 from super626/v3.8 ... Skybox brush set depth test function to always	2015-08-26 21:31:19 +08:00
pandamicro	9d1cf6eab3	Merge pull request #13579 from CocosRobot/update_lua_bindings_1440593794 ... [ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-08-26 21:29:56 +08:00
pandamicro	ee5c541cd1	Merge pull request #13573 from songchengjiang/v3.8 ... add annotations	2015-08-26 21:12:43 +08:00
CocosRobot	3d6866279a	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-08-26 13:01:17 +00:00
pandamicro	8a5fb709ad	Merge pull request #13566 from liamcindy/V3.8 ... update reader with skybox valid	2015-08-26 20:52:05 +08:00
geron-cn	7d01b16f62	bone's color and opacity cannot cascade to bone, also bone can not cascade from its parent.	2015-08-26 20:24:20 +08:00
fusijie	5f527bfc1d	Fixed sprite debug draw.	2015-08-26 18:18:58 +08:00
songchengjiang	f9e9871bcc	supplement annotations	2015-08-26 17:24:36 +08:00
yangxiao	2f72a88a20	depth test always	2015-08-26 16:37:48 +08:00
yangxiao	d17c04cf0e	tmp	2015-08-26 16:35:42 +08:00
songchengjiang	2239b624a8	add annotations	2015-08-26 16:19:30 +08:00
andyque	7f73415189	fix Scale9Sprite draw extra pixels in spritesheet ... Fixed https://github.com/cocos2d/cocos2d-x/issues/13564	2015-08-26 16:15:00 +08:00
Liam	5a997cec1c	update reader with skybox valid	2015-08-26 10:22:20 +08:00
Ricardo Quesada	dfed33f6f2	Adds `PrimitiveCommand` test	2015-08-25 15:07:03 -07:00
andyque	6cea66f932	fixed Scale9Sprite default capInset bug. ... Fixed https://github.com/cocos2d/cocos2d-x/issues/13560	2015-08-25 23:31:34 +08:00
pandamicro	8165775a3d	Merge pull request #13554 from super626/v3.8 ... disable blend when drawing skybox	2015-08-25 16:50:52 +08:00
子龙山人	734388d2bd	Merge pull request #13556 from zilongshanren/fix-listview-intial-position ... fix ListView innerContainer initial position error	2015-08-25 16:50:02 +08:00
pandamicro	68444bc3b1	Merge pull request #13553 from liamcindy/V3.8 ... update reader with new skybox	2015-08-25 16:34:28 +08:00
Liam	c998639c30	update interface for gamenode3d	2015-08-25 15:18:09 +08:00
andyque	65b78d4a49	fix ListView innerContainer initial position error	2015-08-25 15:15:18 +08:00
yangxiao	7884138dcc	disable blend when drawing skybox	2015-08-25 14:32:25 +08:00
Liam	650a5c2318	update reader with new skybox	2015-08-25 13:20:19 +08:00
Neo Kim	ab85406bc8	Added version comments	2015-08-25 11:21:26 +09:00
Neo Kim	d2fb1bda7d	Add getters for the internal renderer instances	2015-08-25 11:21:02 +09:00
子龙山人	b0561749bd	Merge pull request #13537 from neokim/fix_issue_13516 ... Fix issue 13516	2015-08-25 10:01:03 +08:00
Dale Stammen	43687bf7a0	moved CCTextureCube from 3D to renderer	2015-08-24 03:45:55 -07:00
CocosRobot	7117fa24be	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-08-24 10:13:27 +00:00
Neo Kim	edd9fecf39	Update scroll bar when the inner container's size changes	2015-08-24 18:47:12 +09:00
Neo Kim	9f693ef8f3	Enhance readability	2015-08-24 18:46:43 +09:00
Neo Kim	e1ed3ecb09	Add a method to change selected radio button without event dispatch.	2015-08-24 17:39:49 +09:00
Neo Kim	887efdca1b	Add 'removeAllRadioButtons()'	2015-08-24 17:39:48 +09:00
Neo Kim	202b549073	Add getters for the internal renderer instances	2015-08-24 17:39:47 +09:00
Neo Kim	da85b16292	Change not to dispatch event when add radio buttons	2015-08-24 17:39:46 +09:00
CocosRobot	31a09c9f23	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-08-24 06:13:37 +00:00
pandamicro	0c5b377f00	Merge pull request #13531 from pandamicro/texturecube ... Move CCTextureCube From 3d to renderer to solve compilation issue	2015-08-24 14:06:08 +08:00
yangxiao	7dcc3dd982	Move CCTextureCube From 3d to renderer to solve compilation issue	2015-08-24 14:01:50 +08:00
pandamicro	24282e6e55	Merge pull request #13397 from perminovVS/v3-dev-winrt-correct-unicode ... Correct use and convert unicode from utf8. WinRT	2015-08-24 11:36:30 +08:00
pandamicro	585990071d	Merge pull request #13528 from songchengjiang/v3.8 ... fix crash of CameraBackgroundColorBrush	2015-08-24 11:08:01 +08:00
songchengjiang	be24586f4b	fix crash of CameraBackgroundColorBrush	2015-08-24 10:23:59 +08:00
pandamicro	11113c85da	Improved logic of skybox reader fix	2015-08-24 10:02:38 +08:00
Liam	110de9ee3e	fix skybox crash with error data	2015-08-24 10:02:37 +08:00
pandamicro	055ef23931	Fix AssetsManager crash by protecting Downloader with shared_ptr	2015-08-22 22:13:53 +08:00
pandamicro	5c4b67d04e	Merge pull request #13518 from MSOpenTech/v3.8-win10 ... V3.8: Win10 UWP add missing CCCameraBackgroundBrush files	2015-08-22 12:01:28 +08:00
pandamicro	6ee33499b4	Update changelog and versions for v3.8 rc0	2015-08-22 11:56:25 +08:00
Dale Stammen	fc1a2b2f99	fixed for winrt audio issue 13254	2015-08-21 09:59:46 -07:00
Dale Stammen	b4f2fb0928	added missing CCCameraBackgroundBrush files	2015-08-21 09:23:01 -07:00
pandamicro	486af79a47	Merge pull request #13511 from fusijie/fix_13509 ... fixed renderTexture crash bug.	2015-08-21 18:24:27 +08:00
fusijie	cbd7eed9c4	fixed renderTexture crash bug.	2015-08-21 17:38:56 +08:00
CocosRobot	6b6c6b242c	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-08-21 06:44:25 +00:00
pandamicro	66fbc33ccb	Merge pull request #13501 from pandamicro/camera ... Add JS and Lua bindings for CCCameraBackgroundBrush	2015-08-21 14:35:15 +08:00
子龙山人	369d7474b8	Merge pull request #13499 from zilongshanren/fix-scrollview-initil-posotion ... fix scrollview innerContainer initial position.	2015-08-21 13:51:04 +08:00
pandamicro	006f300ac9	Add JS and Lua bindings for CCCameraBackgroundBrush	2015-08-21 12:42:36 +08:00
pandamicro	306a0e4df7	Merge pull request #13471 from super626/v3.8 ... skybox should not be transparent	2015-08-21 12:22:48 +08:00
CocosRobot	9a6c779580	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-08-21 03:59:12 +00:00
andyque	29f97d63ed	fix scrollview innerContainer initial position.	2015-08-21 11:56:19 +08:00
pandamicro	350182c1aa	Refactor BackGround to Background	2015-08-21 10:43:59 +08:00
yangxiao	3e2001bdb1	Add CCCameraBackgroundBrush ... including Color, Depth, SkyBox brushes Squashed from https://github.com/cocos2d/cocos2d-x/pull/13490	2015-08-21 10:43:59 +08:00
ZhangMenghe	1bcc2dec37	Notification effect enhancement	2015-08-21 10:20:59 +08:00
pandamicro	f377a9bff1	Merge pull request #13491 from zilongshanren/v3.8 ... add RadioButton and RadioButtonGroup event type	2015-08-21 09:17:46 +08:00
Dale Stammen	c47de9d04f	make new render surface current after device lost	2015-08-20 13:26:03 -07:00
Dale Stammen	d55bc653e0	update c++ debug info settings	2015-08-20 13:25:17 -07:00
andyque	15156a015a	add RadioButton and RadioButtonGroup event type	2015-08-20 22:49:42 +08:00
pandamicro	c6c1b429c6	Merge pull request #13489 from jianglong0156/fixwin32textureCacheTest ... fix texturecache didn't show correctly in win32	2015-08-20 22:39:01 +08:00
jianglong0156	895c29efe4	fix texturecache didn't show correctly in win32	2015-08-20 18:11:05 +08:00
pandamicro	81ca089d27	Merge pull request #13479 from liamcindy/V3.8_reader ... fix object size error while data is error	2015-08-20 18:09:28 +08:00
pandamicro	7bd5cc4e34	Merge pull request #13486 from fusijie/fix_11677 ... Fixed SpriteProgressToRadialMidpointChanged bug.	2015-08-20 18:06:38 +08:00
Liam	788be3016a	update annotation	2015-08-20 18:04:49 +08:00
pandamicro	a54f01ce2b	Merge pull request #13485 from VisualSJ/v3.8-webIndex ... Update Studio js parser	2015-08-20 18:02:55 +08:00
pandamicro	5ef4f3159e	Merge pull request #13487 from jianglong0156/fixopenglErrorSquash ... fix opengl test error	2015-08-20 17:47:08 +08:00
jianglong0156	10d5b73c7e	fix opengl test error ... fix opengl test error, add the condition, when the data type is samewith long, it will reset data relate pr:#13449 fix open gl show error	2015-08-20 17:42:26 +08:00
fusijie	f133e5a754	Fixed SpriteProgressToRadialMidpointChanged bug.	2015-08-20 17:07:53 +08:00
VisualSj	a4fec3a5e0	Update Studio js parser	2015-08-20 17:02:41 +08:00
子龙山人	5b0dcd8a10	Merge pull request #13484 from CocosRobot/update_lua_bindings_1440055948 ... [ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-08-20 15:42:06 +08:00
CocosRobot	a3b8423977	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-08-20 07:39:25 +00:00
子龙山人	f79d2c8a0a	Merge pull request #13483 from zilongshanren/fix-lua-ui-v3.8 ... [ci skip]add missing ui test in Lua	2015-08-20 15:28:25 +08:00
andyque	72496ae426	add missing ui test in Lua	2015-08-20 15:25:09 +08:00
pandamicro	13a271d96d	Merge pull request #13478 from xiaofeng11/v3.8 ... Fix Cocos Studio Bugs	2015-08-20 14:42:36 +08:00
XiaoFeng	6bdb5431f1	Update code, using condition macro to determine studio or user project	2015-08-20 13:33:48 +08:00
Vincent Yang	b4f585732e	Add CCDownloader-apple for mac and ios.	2015-08-20 11:35:40 +08:00
Liam	aa6f2ec4b6	fix object size error while data is error	2015-08-20 11:27:01 +08:00
XiaoFeng	93f026f8e6	Fix https://github.com/cocos2d/cocos2d-x/issues/9488	2015-08-20 11:18:59 +08:00
XiaoFeng	935b0f006b	Fix https://github.com/cocos2d/cocos2d-x/issues/10205	2015-08-20 10:55:30 +08:00
yangxiao	8f81267960	skybox is not transparent	2015-08-19 18:25:34 +08:00
pandamicro	2605865ca6	Fixed #12570: Correct `cc.pIsSegmentIntersect` for lua	2015-08-19 16:21:31 +08:00
XiaoFeng	f26509efe4	Fix when picture file used by TMX map file missing or broken, create TMX object will cause program crashed	2015-08-19 14:02:12 +08:00
CocosRobot	bf723eab91	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-08-19 05:55:16 +00:00
子龙山人	4f9a81198b	Merge pull request #13456 from WenhaiLin/v3.8-label-globalZOrder ... Fixed `Label::setGlobalZOrder ` is invalid if label create with system font.	2015-08-19 13:46:00 +08:00
pandamicro	31bc04a301	Merge pull request #13455 from MSOpenTech/v3-win10 ... Windows 10 UWP and WP8.1 app certification fixes	2015-08-19 13:36:29 +08:00
子龙山人	1f735b4f0e	Merge pull request #13437 from fusijie/fix_lua_testcase_setPointer_error ... Fixed setVertexAttribPointer luabinding and Test case.	2015-08-19 11:43:18 +08:00
子龙山人	da9971f04f	Merge pull request #13449 from fusijie/fix_JSB_glGetUniformfv ... fixed JSB_glGetUniformfv uniform location is different from index.	2015-08-19 11:42:36 +08:00
WenhaiLin	827f05c5e1	Fixed `Label::setGlobalZOrder ` is invalid when label create with system font.	2015-08-19 10:22:48 +08:00
fusijie	2dbb4ad50e	fixed JSB_glGetUniformfv uniform location is different from index.	2015-08-19 09:53:52 +08:00
Dale Stammen	47b72ba30e	Merge branch 'v3' into v3-win10	2015-08-18 11:07:38 -07:00
Dale Stammen	8493365be7	updates to pass Windows App Certification tests	2015-08-18 11:06:47 -07:00
子龙山人	593eb0737f	Merge pull request #13440 from WenhaiLin/v3.8-rc0 ... Fixed `Label::getLetter(index)->setVisible(true)` cause draws duplicate letters.	2015-08-18 17:06:37 +08:00
WenhaiLin	6bf15885b8	Fixed `Label::getLetter(index)->setVisible(true)` cause draws duplicate letters.	2015-08-18 15:42:05 +08:00
fusijie	223d5a7a5c	fix copy construct & assignment operator memory leakage.	2015-08-18 14:48:16 +08:00
fusijie	a799c99b1a	fix setVertexAttribPointer luabinding	2015-08-18 11:46:45 +08:00
pandamicro	d2bc03f80f	Merge pull request #13424 from WenhaiLin/v3.8-rc0 ... Label:Fixed display not as expected(Redmine issue:22133).	2015-08-18 10:00:36 +08:00
Dale Stammen	ee7b9377de	removed old wp8 code that breaks Win10 WACK tests	2015-08-17 18:40:07 -07:00
Vladimir Perminov	24d06bb1c9	More use StringUtf8ToWideChar and PlatformStringFromString	2015-08-17 23:04:05 +03:00
CocosRobot	24a63e12ec	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-08-17 15:08:00 +00:00
pandamicro	81d5a8377f	Merge pull request #13418 from jianglong0156/fixTMXTileFlagsError ... Remove duplicate function definition, Add function adaptation	2015-08-17 22:56:59 +08:00
WenhaiLin	990a25f759	Label:Fixed display not as expected(Redmine issue:22133).	2015-08-17 22:46:19 +08:00
肖峰	0473b08dbb	Fix gamenode3d parse failed error ... - Fix the parser issue - Add GameNode3DReader to win8 universal project - Add GameNode3d reader to Android & Linux project Squashed from https://github.com/cocos2d/cocos2d-x/pull/13369	2015-08-17 22:42:21 +08:00
pandamicro	be165ef900	Permit webp image loading	2015-08-17 18:55:53 +08:00
jianglong0156	b19e02bdf6	Remove duplicate function definition, Add function adaptation	2015-08-17 18:18:38 +08:00
pandamicro	f2edb1c8f9	Merge pull request #13410 from ZhangMenghe/v3-retinaEffect ... [ci skip] Fix invisiable testcase of effects	2015-08-17 17:51:04 +08:00
pandamicro	e380b0cffa	Merge pull request #13415 from VisualSJ/v3-13359 ... [ci skip] Update JS parser	2015-08-17 17:29:12 +08:00
ZhangMenghe	eaa5643c7c	Fix invisiable testcase of effects	2015-08-17 17:26:25 +08:00
VisualSj	c52a81a2c2	Update JS parser	2015-08-17 17:25:17 +08:00
pandamicro	f1cbd00b30	Merge pull request #13414 from liamcindy/V3.8_reader ... fix code informal	2015-08-17 17:21:01 +08:00
Liam	b40ef51337	fix code informal	2015-08-17 17:16:26 +08:00
pandamicro	d0580f09e8	Merge pull request #13383 from geron-cn/3.7.1 ... add blendfunc cascade to its skin in BoneNode	2015-08-17 17:12:04 +08:00
pandamicro	096410a31a	Merge pull request #13406 from xiaofeng11/v3_reader_update ... Add BlendFrame supporting to Skeleton Animation	2015-08-17 17:09:25 +08:00
pandamicro	66d99d392c	Merge pull request #13409 from liamcindy/V3.8_reader ... fix userCamera flag error with old version files	2015-08-17 17:01:59 +08:00
pandamicro	9db78b2bb7	Merge pull request #13407 from liamcindy/v3.8 ... fix the skybox display error from editor files	2015-08-17 16:57:32 +08:00
XiaoFeng	442669d6f1	Remove unused easing data processing in blend frame parsing	2015-08-17 16:19:29 +08:00
Liam	e3ac9414f4	fix userCamera flag error with olg version files	2015-08-17 14:37:28 +08:00
geron-cn	008b06c01c	set blendfunc cascade to its skin in BoneNode	2015-08-17 13:44:00 +08:00
XiaoFeng	72d21ff810	Update reader, add BlendFrame supporting to Skeleton Animation ... Update json parser to prepare compatible for both current version output json description file and future optimized version json description file.	2015-08-17 13:05:29 +08:00
Liam	7aa36d14be	fix the skybox display error from editor files	2015-08-17 13:04:25 +08:00
子龙山人	8e01326cfa	Merge pull request #13387 from WenhaiLin/v3-replace-tab-withSpaces ... Replace tab with spaces	2015-08-17 11:29:03 +08:00
Vladimir Perminov	a16d04fb53	CCUtf8ToUnicode and CCUnicodeToUtf8 deprecated	2015-08-16 13:08:00 +03:00
Vladimir Perminov	d70a21aa25	Correct use and convert unicode from utf8 ... Move StringUtf8ToWideChar and StringWideCharToUtf8 to CCWinRTUtils( Replace CCUtf8ToUnicode) Use StringUtf8ToWideChar for convert utf8 to unicode Use StringWideCharToUtf8 for convert unicode to utf8	2015-08-16 12:51:41 +03:00
pandamicro	487c99e632	Merge pull request #13378 from jianglong0156/fixNodeGrid ... [ci skip]add NodeGrid bind	2015-08-15 21:43:00 +08:00
子龙山人	6d630152c8	Merge pull request #13381 from zilongshanren/fix-radiobutton-disallowselection ... fix RadioButton disallow selection issue.	2015-08-15 19:20:18 +08:00
江龙	06ab98b0ac	improve the comment	2015-08-15 17:04:32 +08:00
WenhaiLin	a0c270234b	Replace tab with spaces	2015-08-14 21:17:51 +08:00
andyque	d45897ec53	fix RadioButton disallow selection issue.	2015-08-14 18:07:13 +08:00
jianglong0156	ae8332eb85	add NodeGrid bind	2015-08-14 17:46:34 +08:00
子龙山人	83de0e798e	Merge pull request #13365 from WenhaiLin/v3-label-ignore-r ... Label:ignore '\r' character.	2015-08-14 17:22:33 +08:00
minggo	1e415a0b5b	Merge pull request #13364 from WenhaiLin/v3-Scheduler-eloopfix ... Fixed `Scheduler::update(float dt)` can lead to an infinite loop when the value of `dt` is zero.	2015-08-14 15:11:09 +08:00
WenhaiLin	d855722c20	Fixed `Scheduler::update` can lead to an infinite loop when the value of `dt` is zero.	2015-08-14 15:05:25 +08:00
子龙山人	ac5f8d0f4c	Merge pull request #13367 from CocosRobot/update_lua_bindings_1439522923 ... [ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-08-14 11:54:38 +08:00
子龙山人	f36d6a5c8c	Merge pull request #13363 from GammaEspeon/v3 ... [bugfix] SimpleAudioEngine misreporting whether music is playing when paused/resumed	2015-08-14 11:54:12 +08:00
CocosRobot	9b003c9cfc	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-08-14 03:34:30 +00:00
WenhaiLin	d25decb414	Label:ignore '\r' character.	2015-08-14 11:07:34 +08:00
Ricardo Quesada	5baa90c79e	libcurl.h not included in the header to avoid... ... too many dependencies	2015-08-13 19:28:38 -07:00
James Windiate	fa02751e45	fixed whitespace	2015-08-13 19:24:41 -04:00
James Windiate	61a2e0d2ad	Added _playing flag switching on pause and resume ... Issue # 13254	2015-08-13 18:52:32 -04:00
Ricardo Quesada	7047e0fbdb	Merge branch 'v3' into downloader_decouple_squash	2015-08-13 11:07:49 -07:00
子龙山人	c4af7b8c45	Merge pull request #13360 from CocosRobot/update_lua_bindings_1439456784 ... [ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-08-13 17:25:26 +08:00
CocosRobot	2de6b4ed4c	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-08-13 09:11:00 +00:00
子龙山人	aa7b96bb40	Merge pull request #13352 from zilongshanren/fixIssue12519 ... fix iOS EditBox Chinese input maxLength issue.	2015-08-13 17:04:19 +08:00
子龙山人	20729e16ae	Merge pull request #13349 from yangws/v3 ... Fix bug: timer dt time error when interval = 0.	2015-08-13 17:02:55 +08:00
Ricardo Quesada	d2cf4bfc79	Squashed commit of the following: ... commit 2c810a8e931e07b06498c07db37cbf20a2bcfc92 Merge: 61788a0 082caaf Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Aug 13 00:13:38 2015 -0700 Merge branch 'v3' into downloader_decouple commit 61788a0b34188fed5367cab121817db97198bcd8 Merge: 8c1e211 5e21580 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Aug 12 20:45:12 2015 -0700 Merge branch 'v3' into downloader_decouple commit 8c1e2119a5c671c00da5ce1fb244029f2bfab09f Merge: 2ea66af 8d73883 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Aug 12 20:42:04 2015 -0700 Merge pull request #6 from minggo/downloader_decouple fix js binding error commit 8d7388302ff1d8da575b277e47a3f8ceb1017e98 Author: minggo <ming@cocos2d-x.org> Date: Thu Aug 13 11:09:58 2015 +0800 fix js binding error commit 2ea66af7684f5ec8a20067b1a49347920dbbbb40 Merge: 8cdb0b6 bc964e8 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Aug 12 09:14:22 2015 -0700 Merge branch 'v3' into downloader_decouple commit 8cdb0b6e4b83210b1f68b4568c74ccb36f504806 Merge: 9272765 08eeca9 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Aug 11 20:11:46 2015 -0700 Merge pull request #5 from minggo/downloader_decouple fix lua-binding error commit 08eeca9d99b5160c48bac1bfecf03b459d05ed15 Author: minggo <ming@cocos2d-x.org> Date: Wed Aug 12 10:34:05 2015 +0800 fix lua-binding error commit 927276589d57432477f8ffc033e19a21a215b246 Merge: 8252464 6f4ed8a Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Aug 11 10:39:22 2015 -0700 Merge branch 'v3' into downloader_decouple commit 8252464020dbe86da4e5e5aa6e4e45f6997f6b9b Merge: 5dddbb6 138df42 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Aug 11 06:53:48 2015 -0700 Merge pull request #4 from minggo/downloader_decouple fix linking error in lua-tests on Android commit 138df42a3acfdcfae29eeab1b03ef5dd062f0145 Author: minggo <ming@cocos2d-x.org> Date: Tue Aug 11 16:23:53 2015 +0800 fix link error in lua-tests commit 5dddbb61a1bcda96aa93bfcbe78f42c639eb6247 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 23:22:50 2015 -0700 works for real on win32 commit ddadaf82231b60c8e343718561c0d78657afe7c2 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 22:26:59 2015 -0700 compiles on win32 commit 733f1d4c2e4f8382ff19f1793f7f09950774fe78 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 21:57:49 2015 -0700 compiles on iOS!! commit f706f97962eb393bf7dfec79739ff8dfdec103d5 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 21:27:03 2015 -0700 compiles and runs Ok on windows. Tested all downloadertests + assetmanagertest commit 5e333f4407952d9c2e71e18cb9393d8b6cd170b4 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 20:24:28 2015 -0700 updates windows projects commit e77fd8a278594fefc24ff13cbee038508429294d Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 19:56:10 2015 -0700 compiles on Android commit 5f515e3519a0688d11476ea6ef235007e8378c96 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 18:34:33 2015 -0700 trying to fix a compile issue on iOS WIP commit b144ea67dfe7a06e7bfb515adf16f536ba2ead98 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 18:25:11 2015 -0700 make bug fixes adds public `getHeader` commit a228799ba74eb8642c43d215a802f811a576a4aa Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 17:42:19 2015 -0700 some linux fixes commit 2cab23d87acc138823ebe9dcec9d42f827690d99 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 16:58:53 2015 -0700 Squashed commit of the following: commit 86227e9138c1fb523bd28186d355de65cc64c588 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 16:55:17 2015 -0700 works %100 and uses less memory than before commit a9cafa6f2fe7847e279934d2c162287680760dda Merge: 0bbc62e 0cbd71f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 15:49:33 2015 -0700 Merge branch 'v3' into cocos_net commit 0bbc62ee1fbfd107a935131d5d93994e87865afa Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 15:46:55 2015 -0700 more tests... and works but there is huge bug. ProgData <vector> needs the position of DownloadUnits <unordered_map> but <unordered_map> does not guaranty the order. So in my next commit I"ll merge DownloadUnit with ProgressData commit 389ed8639a1942f628773616a8e340bc66a0c1d7 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 13:47:07 2015 -0700 debugging info commit af0dc45bb9c4705934ced2c1d67e5afc06b6f317 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 11:47:31 2015 -0700 sync and async tests working ok commit 999fa7a7bfb28565492f47b39caef7f1a079c183 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 11:38:38 2015 -0700 adding tests commit 91ee294942510718400edc0d00d3c744d00339ee Merge: 76ab703 7f215e9 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 10:03:50 2015 -0700 Merge branch 'v3' into cocos_net commit 76ab7032d3a21156f05395a021391a16649f755a Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 00:22:20 2015 -0700 Downloader tests commit b65c4dad7089660bfe697c0dab3e9290d1a6d013 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Aug 6 21:34:54 2015 -0700 compiles on Xcode 7 commit ec0d66340b8daf0b042d36333dff759cd424f465 Merge: 878e4b5 0d77838 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Aug 6 11:02:24 2015 -0700 Merge branch 'v3' into cocos_net commit 878e4b5d0f87bc6d5d6e507102ab15e2c24a1c8f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Aug 5 18:07:02 2015 -0700 working, yeah! commit ad1e7637a5ac2e6bff44d35429f5556ea1cb8a4c Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Aug 5 17:49:59 2015 -0700 code is more thread-safe friendly commit 8c6baaee6b898d4b90e5d8988a174d8a33702f60 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Aug 5 16:39:02 2015 -0700 fixes callbacks commit ddab4d753106c6ff11304c1c69739c5611e3f20a Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Aug 5 15:43:51 2015 -0700 cleaner code runs callbacks in cocos2d thread only if needed commit ef75844aaa010633e6e27ae6e69460174460d5c7 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Aug 5 11:58:04 2015 -0700 removed weak_ptr<> from ProgressData that logic of the code is added in the callbacks commit d9c7436cbadc611592b3c80ca2a3a9edeaa00853 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Aug 5 11:54:07 2015 -0700 checks whether or not the callbacks are in the cocos2d thread commit ae6594a6f866f6b5015ba293db23343887063d2f Merge: 4c61069 6831e24 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Aug 5 10:48:34 2015 -0700 Merge branch 'v3' into cocos_net commit 4c61069a7e0e33fa0332df700cc8df4807178caf Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Aug 4 21:36:50 2015 -0700 almost there... Downloader has std::vector<FILE*> instead of FileDescriptors code cleaner... commit c34d04a8218d2be5c316e0487e5ac46792bbed76 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Aug 4 20:38:44 2015 -0700 passes progressData to batch no need to alloc memory for each ProgressData commit f7e8bbd8b85f214b919bce6118d4158dd6d26368 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Aug 4 17:47:23 2015 -0700 tidier code and more optimizations commit a486dc78aedcf9c6178e490292edd572f8a7b374 Merge: 4178327 a06421b Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Aug 4 14:03:22 2015 -0700 Merge branch 'v3' into cocos_net commit 417832705910a6ebd16a876cd98064ea16f0f45c Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Aug 3 18:13:13 2015 -0700 not finished yet... ...but trying to have a common inteface with batched and non-batched downloads commit 1d0e4652763c2e1511ac102a62defae6c6a89220 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Aug 3 16:29:39 2015 -0700 ErrorCallback compiles starting the batching code commit 6645a287c47dc01cbf1f2d80e9c0fdd2b16e3e18 Merge: c180425 8d836da Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Aug 3 10:28:51 2015 -0700 Merge branch 'v3' into cocos_net commit c180425d8181b8e6f53be766d8d2b94f908ae168 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Jul 31 15:35:53 2015 -0700 More progress on migrating multiple-file downloader to the implementation file commit 5fa273e265963af3c0cb6338bf49dc5e1b54173b Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Jul 31 14:00:02 2015 -0700 Dowloader moved to `cocos2d::network` commit 14b1d0825106701b5435a266b255f09291b6486b Merge: 13cfc8d f744383 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Jul 31 11:13:55 2015 -0700 Merge branch 'v3' into cocos_net commit 13cfc8de4eb4835ffb8f8d671d3d070c411b0a2e Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Jul 31 11:11:45 2015 -0700 DownloadUnits belong to network commit e6e17564ead1fb7f6f7df343b0627a104cd756f8 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Jul 30 12:23:36 2015 -0700 adds `check for option` commit 5cb76dfaaed42011a0c536d01b82a0a94487d6aa Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Jul 30 10:37:51 2015 -0700 Downloader: using URLDownload in one case. 3 more to go. Not tested yet commit 9b26e9cfac425635027189ccab835054b68bc83d Merge: 20fe063 253d9c4 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Jul 30 08:35:53 2015 -0700 Merge branch 'v3' into cocos_net commit 20fe0636e36ae7f1da048545b3345f526d5b64de Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Jul 29 17:36:07 2015 -0700 URLDownload: initial commit HttpAsyncConnection -> HttpAsyncConnection-apple: follows the cocos2d guidelines Adds `CCIRULDownload` interface. Adds `CCURLDownload` implementation based on libcurl. Not working yet. `Downloader` uses `URLDownload` for some of its functions. WIP commit 3a5d3b83838bee53e3bbea182f3ad09d7bec32d0 Merge: e408fe0 642ccac Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Jul 29 14:00:43 2015 -0700 Merge remote-tracking branch 'cocos2d/v3' into cocos_net commit e408fe0b9303813d20bab2f7bf548f3b7af416a6 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Jul 29 13:59:46 2015 -0700 Adds more files to Xcode project ...even if they are not being compiled. Much easier to add missing functionality to the rest of the platforms commit 11d86acebeb61348e4ccf7e6af9a2eaf1b6bb534 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Jul 29 11:36:57 2015 -0700 removes unneeded headers	2015-08-13 00:14:10 -07:00
子龙山人	082caaf3e0	Merge pull request #13342 from WenhaiLin/v3-label-miss-letter ... Label:Fixed display incorrect if label content is changed after invoking `getLetter(letterIndex)`	2015-08-13 15:09:54 +08:00
andyque	f9385d1604	fix iOS EditBox Chinese input maxLength issue. ... https://github.com/cocos2d/cocos2d-x/issues/12519	2015-08-13 15:01:14 +08:00
Vincent Yang	d333d24177	Fix bug: timer dt time error when interval = 0.	2015-08-13 12:55:07 +08:00
CocosRobot	9fd18f987e	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-08-13 02:53:50 +00:00
WenhaiLin	c06994de34	Label:Fixed display incorrect if label content is changed after invoking `getLetter(letterIndex)`	2015-08-13 10:29:58 +08:00
minggo	bc964e8314	Merge pull request #13335 from pandamicro/v3 ... Upgrade Spine runtime	2015-08-12 18:46:59 +08:00
子龙山人	da9b894494	Merge pull request #13336 from zilongshanren/v3 ... [ci skip]merge v3.7.1 back to v3.	2015-08-12 18:12:25 +08:00
andyque	68a90743c7	Sync PR: https://github.com/cocos2d/cocos2d-x/pull/13303	2015-08-12 18:09:32 +08:00
pandamicro	cb143963ce	Upgrade Spine runtime	2015-08-12 18:07:28 +08:00
子龙山人	a84553ae17	Merge pull request #13311 from WenhaiLin/v3-audio-crashfix ... AudioEngine:Fixed possible crash on iOS/Mac.	2015-08-12 18:02:00 +08:00
andyque	82f597ce98	Merge branch 'v3.7.1' into v3 ... # Conflicts: # cocos/scripting/lua-bindings/auto/api/CheckBox.lua # cocos/ui/UICheckBox.cpp # cocos/ui/UICheckBox.h	2015-08-12 17:59:50 +08:00
子龙山人	86d674030e	Merge pull request #13307 from fusijie/fix_cocostudio_skin_flip ... fix cocostudio skin setfliped.	2015-08-12 14:34:46 +08:00
子龙山人	be1d3ccc67	Merge pull request #13324 from zilongshanren/fix-editbox-soft-keyboard-backissue ... fix ui::TextField status error.	2015-08-12 13:57:10 +08:00
andyque	763976d50c	fix ui::TextField status error. ... 1. Refactoring Cocos2dxEditText to reuse Cocos2dxEditBox. 2. Reorder the event handling in ui::TextField.	2015-08-12 11:05:07 +08:00
pandamicro	dbd0b6dd86	Merge pull request #13272 from yangws/bug_21800 ... fixed bug #21800 [CppTest]Node: Scene3D when player outof terrain app…	2015-08-12 10:25:30 +08:00
Wenhai Lin	b46000287e	AudioEngine:Fixed crash cause by multiple threads access into a shared unsynchronized data.[iOS/Mac]	2015-08-11 18:11:59 +08:00
CocosRobot	ef41cb27ca	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-08-11 08:02:58 +00:00
子龙山人	f3f67a10f9	Merge pull request #13232 from perminovVS/v3-dev-get-file-extension ... Add getFileExtension to FileUtils	2015-08-11 15:54:55 +08:00
子龙山人	65c4261cc6	Merge pull request #13301 from yangws/bug_21906 ... fix bug: #21906 Pause/Resume 's result not correct.	2015-08-11 15:54:02 +08:00
Vincent Yang	bb0a7a8533	fix bug: #21906 Pause/Resume 's result not correct.	2015-08-11 14:28:52 +08:00
Vincent Yang	47ecb246b8	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into bug_21906	2015-08-11 14:24:02 +08:00
andyque	b2bf8469f0	Fix EditBox turning black when soft keyboard hide. ... I disable a optimization when users start to type, the resize layout's doLayout event should be stoped. But it has bugs. If we could find reliable soft keyboard show/hide event detection method, we could enable this optimization again.	2015-08-11 11:42:37 +08:00
子龙山人	271ab08b59	Merge pull request #13306 from WenhaiLin/v3.8-label-letter-flipped ... Label:Fixed letter can be flipped.	2015-08-11 11:05:12 +08:00
子龙山人	f1c252a1a8	Merge pull request #13302 from WenhaiLin/v3.8-CocosBuilderTest-crash ... CppTests-->Extension-->CocosBuilderTest:Fixed crash on Android 5.0.x.	2015-08-11 11:04:54 +08:00
fusijie	aa1b1831e9	fix cocostudio skin setfliped.	2015-08-11 10:34:22 +08:00
WenhaiLin	eeb4a38715	Label:Fixed letter can be flipped.	2015-08-11 10:06:14 +08:00
CocosRobot	aa6ac72405	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-08-11 01:58:29 +00:00
WenhaiLin	2deeee70d2	CppTests-->Extension-->CocosBuilderTest:Fixed crash on Android 5.0.x.	2015-08-10 22:41:18 +08:00
pandamicro	6bcea5baee	Fix issue described in #13284 by reorder state setting and event dispatching ... The real reason of #13284 is that the `_selected` state is set after touch events dispatching. So I decided to override `onTouchEnded` function to set the `_selected` state.	2015-08-10 22:27:59 +08:00
Vincent Yang	d0a5c02399	fix bug: #21906 Pause/Resume 's result not correct.	2015-08-10 17:58:49 +08:00
Wenhai Lin	2983aed0a9	Label:Fixed crash cause by access an invalid address	2015-08-10 16:50:59 +08:00
pandamicro	1471936c2f	Merge pull request #13249 from pandamicro/v3 ... Made SocketIO events correctly fired when compile in release mode	2015-08-10 13:32:09 +08:00
pandamicro	3cc06d3f9b	Merge pull request #13267 from yangws/bug_21796 ... Fix bug: #21796 [Android 5.0][Cpp-Tests] Node::Scene3D menu unusable.	2015-08-10 12:40:32 +08:00
pandamicro	f4440f5613	Merge pull request #13229 from fusijie/fix_13228 ... Fixed SpriteBatchNode setFlipped bug.	2015-08-10 11:53:30 +08:00
pandamicro	c54a204bad	Synchronize enable state and bright state for Widget ... Fix issue: https://github.com/cocos2d/cocos2d-x/issues/8137	2015-08-10 07:42:35 +08:00
pandamicro	1f52f0971a	Fix CheckBox cross renderer state not updated correctly ... Issue description: When checkbox checked, its renderer adaptation may not be updated. Reported http://punchbox.info:3000/issues/21630	2015-08-09 20:57:37 +08:00
CocosRobot	8c76a194fa	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-08-09 02:32:59 +00:00
子龙山人	f6569f24f4	Merge pull request #13273 from zilongshanren/android-editbox-reimplement-fix ... Re-implement Editbox on Android platform.	2015-08-09 10:25:19 +08:00
pandamicro	99e1e00a5b	Merge pull request #13268 from dabingnn/v3_fixCrashOnAndroid ... fix engine crash because of wrong initialisation on some android device	2015-08-08 19:43:10 +08:00
CocosRobot	eb9d1ea205	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-08-07 22:55:48 +00:00
Ricardo Quesada	789da4edd8	compiles on xcode7	2015-08-07 14:00:18 -07:00
geron-cn	744fd74b3b	make skeleton's debugdraw contorls all subbone's debug draw	2015-08-08 00:39:01 +08:00
pandamicro	a8c729fb42	Merge pull request #13270 from jianglong0156/fixlabelColordisplay ... [ci skip]fix the node color property can not use	2015-08-07 17:50:27 +08:00
Vincent Yang	354f64ec51	fixed bug #21800 [CppTest]Node: Scene3D when player outof terrain app will no response.	2015-08-07 17:36:35 +08:00
andyque	a35e89225e	Re-implement Editbox on Android platform. ... This PR also fixed issue: https://github.com/cocos2d/cocos2d-x/issues/9572 For the new EditBox: 1. Added a ResizeLayout for updating layout when soft keyboard is shown. This is because some Android devices won't refresh the view and when the view is panned, the native EditText will turn black. This is really a hack, but it works for many Android devices from 2.3 to 5.0. When keyboard is beginning to show, the ResizeLayout's doLayout method will be called 24 frames per second. Once the keyboard is closed, or the user begins to input, the doLayout method will be disabled. 2. EditText is working in a different UI thread, so all the data are passed to GL thread via callbacks in UI thead. 3. It also overrides onKeyDown method in Cocos2dxEditBox. When the EditText got the focus, users could press back key to exit the game. This behavior is not allowed. We give developer the choice to handle back key event manually.	2015-08-07 17:27:15 +08:00
jianglong0156	2c3b9009cb	fix the node color property can not use ... code example: ```` node.color = xxxx // fix it ````	2015-08-07 17:26:35 +08:00
Huabing.Xu	ba02d9df1d	fix engine crash because of wrong initialisation on some android device	2015-08-07 16:37:41 +08:00
Vincent Yang	56204dbef9	Fix bug: #21796 [Android 5.0][Cpp-Tests] Node::Scene3D menu unusable.	2015-08-07 16:30:22 +08:00
geron-cn	e1108c594c	Merge branch 'v3.7.1' of github.com:cocos2d/cocos2d-x into 3.7.1 ... Conflicts: cocos/editor-support/cocostudio/ActionTimeline/CCBoneNode.cpp	2015-08-07 15:48:33 +08:00
geron-cn	c7bc84e19b	fix crash when BoneNode destruct after skeleton destructed.	2015-08-07 15:41:31 +08:00
geron-cn	c6bc81d420	add destruct	2015-08-07 13:13:48 +08:00
geron-cn	c569e70aea	fix BoneNode::visit for visit other node that is not a BoneNode or SkinNode	2015-08-07 11:44:06 +08:00
geron-cn	7b572bed9d	Fix crash when call removeChild from a bone which is already removed.	2015-08-07 09:37:18 +08:00
andyque	211dde38e9	Fix improper touch intercept event propagation. ... When the container widget is disabled, it shouldn't intercept touch. https://github.com/cocos2d/cocos2d-x/issues/8316	2015-08-06 22:50:53 +08:00
pandamicro	934764af83	Merge pull request #13250 from xiaofeng11/v3.7.1 ... Synchronize js parser with https://github.com/cocos2d/cocos2d-x/pull/13247	2015-08-06 22:23:40 +08:00
geron-cn	3ae3020d61	fix crash when fore call remove child bone from a bone which already removed from a skeleton.	2015-08-06 19:43:11 +08:00
XiaoFeng	91c88ec535	Synchronize js parser with https://github.com/cocos2d/cocos2d-x/pull/13247	2015-08-06 18:12:08 +08:00
pandamicro	0d778386f4	Merge pull request #13208 from dabingnn/v3_fixViewportCompile ... Make viewport constructor more compile friendly	2015-08-06 17:45:23 +08:00
pandamicro	a170b1caf1	Made SocketIO events correctly fired when compile in release mode ... Fixed https://github.com/cocos2d/cocos2d-x/issues/13248 Reason: `ScriptingCore::executeJSFunctionWithThisObj` is somehow broken in release mode. Solution: Use `JSFunctionWrapper` to manage callbacks instead of managing JS values manually. I also did the following in this commit: - Correct the coding style in jsb_socketio.cpp - Remove android.mk in the Xcode project	2015-08-06 17:20:04 +08:00
Liam	34000f4bde	fix particle3d crash with error file	2015-08-06 15:13:54 +08:00
子龙山人	41afa9695c	Merge pull request #13230 from WenhaiLin/v3.8-label-space-lost ... Spaces should not be lost if label created with Fingerpop.ttf	2015-08-06 11:01:35 +08:00
fusijie	9b148b08cd	Fixed SpriteBatchNode setFlipped bug.	2015-08-06 10:53:22 +08:00
Vladimir Perminov	8585120abb	glfwCreateWindow not guarantee create ... Need check glfwCreateWindow and show info, if there is a problem	2015-08-05 23:06:16 +03:00
Vladimir Perminov	7cacdaeaf1	Add getFileExtension to FileUtils ... Gets filename extension is a suffix (separated from the base filename by a dot) in lower case. More code need get filename extension, everyone does it differently. use check UPPER and lower case, use . and no(example ".csb", ".CSB", "csb" ) And bag in AudioEngineImpl: find point from left( ext = strchr(filePath.c_str(), '.'); ) If file path contains point. always unsupported media type	2015-08-05 22:21:16 +03:00
WenhaiLin	e81d5af12d	Spaces should not be lost if label created with Fingerpop.ttf	2015-08-05 23:46:41 +08:00
geron-cn	ee6253319a	delete useless code	2015-08-05 23:07:42 +08:00
pandamicro	881adf6f36	Merge pull request #13217 from jianglong0156/fixTextFieldBug ... fix textfield and editbox can not input emoticon	2015-08-05 17:41:19 +08:00
Jeff Wang	bbf7e994e7	Improved EditBox implement for platform win32	2015-08-05 17:33:54 +08:00
子龙山人	47fe470647	Merge pull request #13213 from jianglong0156/improUtfFunction ... add api getStringUTFCharsJNI newStringUTFJNI	2015-08-05 17:26:52 +08:00
jianglong0156	42ed314463	fix textfield and editbox can not input emoticon ... fix textfield and editbox can not input emoticon and improve the api comments	2015-08-05 17:03:06 +08:00
pandamicro	dae4385b61	Merge pull request #13214 from pandamicro/skeleton-fix ... Make BoneNodes ordered in Skeleton	2015-08-05 16:36:18 +08:00
geron-cn	9980397081	Make BoneNodes ordered in Skeleton ... 1. Order skins differently than bones and draw them with unified local z order 2. Check children has been remove when its ansester remove 3. Checkout cocos2d::map exists iter before remove Squashed from https://github.com/cocos2d/cocos2d-x/pull/13191	2015-08-05 16:33:32 +08:00
jianglong0156	9a257d8136	fix lua pai error	2015-08-05 16:15:22 +08:00
jianglong0156	fac7a78fc8	improve getUTFCharsFromJavaEnv api to getStringUTFCharsJNI and add newStringUTFJNI ... getUTFCharsFromJavaEnv: getUTFCharsFromJavaEnv:change jstring to utf8 std string newStringUTFJNI:change utf8 std string to jstring	2015-08-05 16:10:14 +08:00
WenhaiLin	2c220092e6	Fixed FontAtlasCache::purgeCachedData might cause crash.	2015-08-05 14:12:02 +08:00
Huabing.Xu	5f9a3b97fb	fix viewport constructor error in old compiler to make it more compatible.	2015-08-05 10:57:27 +08:00
pandamicro	8cdcade07a	Merge pull request #13186 from jianglong0156/addEmotionTest ... fix getStringUTFChars bug	2015-08-05 10:19:19 +08:00
WenhaiLin	b9edd6fc29	Fixed transform	2015-08-05 00:21:06 +08:00
WenhaiLin	2363622a67	Label:support auto batch with bitmap font or char map.	2015-08-04 21:49:14 +08:00
jianglong0156	3230ca154d	improve the code. fix network error	2015-08-04 16:42:16 +08:00
jianglong0156	00b7e98c89	improve the getUTFCharsFromJavaEnv logic and fix the httpclient response message memery leak.	2015-08-04 16:24:08 +08:00
VisualSj	b9b565e64a	Update JSON parser	2015-08-04 16:04:35 +08:00
pandamicro	744fa0b565	Merge pull request #13194 from VisualSJ/v3-boneTest ... [ci skip] Update JSON parser	2015-08-04 15:35:27 +08:00
VisualSj	04465ac4f4	Update JSON parser	2015-08-04 15:15:46 +08:00
pandamicro	b9602127a4	Merge pull request #13187 from xiaofeng11/v3.7.1 ... Remove file error notice label from TextBMFontReader	2015-08-04 13:38:17 +08:00
XiaoFeng	0f90999419	Remove file error notice label from TextBMFontReader to keep consistency with other components	2015-08-04 11:45:29 +08:00
jianglong0156	979700e343	there is a bug for getStringUTFChars function. it can't translate the emotion utf8 code. so change the getStringUTFChars to getStringChars. and translate unicode to utf8 in c++ program	2015-08-04 11:30:30 +08:00
pandamicro	d20052cc22	Fix line wrapper in CCDevice	2015-08-04 11:07:04 +08:00
pandamicro	f9249f0e49	Merge pull request #13180 from sridher/mac_dpi_fix ... getDPI for Mac Implemented	2015-08-04 10:49:14 +08:00
fusijie	8d2da20e5f	fix spelling mistake.	2015-08-04 09:36:33 +08:00
pandamicro	25cb0d2896	Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3 ... # Conflicts: # web	2015-08-03 19:47:56 +08:00
pandamicro	6d3a00ad67	Merge pull request #13173 from geron-cn/3.7.1 ... fix bug: crash when use bone after erase it form Vector.	2015-08-03 19:45:54 +08:00
Sridher Jakku	f48a9fb9f0	getDPI for Mac Implemented	2015-08-03 17:12:52 +05:30
CocosRobot	3e71ce33c8	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-08-03 10:09:10 +00:00
pandamicro	4b7b85f113	Merge pull request #12889 from fusijie/fix_clippingRectangle_bug ... remove CCClippingRectangleNode transform error support.	2015-08-03 18:01:01 +08:00
geron-cn	e4c47c811f	remove EMSCRIPTEN draw	2015-08-03 16:53:08 +08:00
geron-cn	cfc8da579f	fix bug: crash when use bone after erase it form Vector. move the operation after erase, make sure bone ref* is not realeaed	2015-08-03 16:47:54 +08:00
pandamicro	f10994c20b	Merge pull request #12467 from MagicTavern/v3_fix_websocket ... fix a problem where WebSocket messages may pile up	2015-08-03 16:25:56 +08:00
CocosRobot	dbb8792630	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-08-03 07:46:25 +00:00
pandamicro	b13fddb18e	Merge pull request #13162 from super626/v3 ... Terrain: Add light map support	2015-08-03 15:37:42 +08:00
yangxiao	fc4c25c51e	add comment	2015-08-03 13:30:30 +08:00
CocosRobot	167f9adca8	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-08-03 05:09:11 +00:00
pandamicro	702e667143	Merge pull request #13152 from zilongshanren/addVerticalPageView ... add PageView vertical scroll support	2015-08-03 13:00:48 +08:00
andyque	2427c15b60	modify vertical scroll direction	2015-08-03 11:38:23 +08:00
pandamicro	330eaf5239	Merge pull request #13161 from xiaofeng11/v3.7.1 ... Fix 3d particle can not show in simulator	2015-08-03 11:11:39 +08:00
fusijie	aaa5793b86	add IF-CASE to fix debug draw under SpriteBatchNode.	2015-08-03 10:47:58 +08:00
yangxiao	b6774a5f44	fix warning	2015-08-03 10:27:57 +08:00
yangxiao	929cd4fbfe	set default value for _lightDir	2015-08-03 10:12:04 +08:00
yangxiao	8a6c49b5a3	merge cocos	2015-08-03 09:54:29 +08:00
XiaoFeng	17a5d07183	Fix 3d particle can not show in simulator	2015-08-03 09:53:16 +08:00
CocosRobot	c281630fa6	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-08-03 00:13:29 +00:00
pandamicro	3c2e66e425	Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3 ... # Conflicts: # .travis.yml # build/cocos2d_js_tests.xcodeproj/project.pbxproj # build/cocos2d_tests.xcodeproj/project.pbxproj # cocos/2d/CCFont.h # cocos/2d/CCFontAtlas.cpp # cocos/2d/CCFontAtlas.h # cocos/2d/CCFontFreeType.cpp # cocos/2d/CCFontFreeType.h # cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj # cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj # cocos/2d/libcocos2d_win10/libcocos2d.vcxproj # cocos/cocos2d.cpp # cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp # cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp # templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj # templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj # tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp # tests/cpp-tests/Classes/LabelTest/LabelTestNew.h # tools/bindings-generator # tools/simulator/frameworks/runtime-src/proj.ios_mac/simulator.xcodeproj/project.pbxproj # tools/travis-scripts/generate-bindings.sh # tools/travis-scripts/generate-cocosfiles.sh # tools/travis-scripts/travis_mac.yml	2015-08-02 22:28:27 +08:00
andyque	63822566d2	refactor PageView implementation	2015-08-01 23:33:25 +08:00
CocosRobot	29208156d9	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-08-01 13:23:21 +00:00
pandamicro	46bb4f8aae	Merge pull request #13149 from jianglong0156/constructedWith3D_3#12404 ... Constructed with3d	2015-08-01 21:15:08 +08:00
jianglong0156	5d281d45ef	recover the physics3DShape initHeightfield api	2015-08-01 18:29:48 +08:00