Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
28,259 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

8298 Commits

Author SHA1 Message Date
SuYaohui 5e236fd753 progressTimer,ApplicationProtocol 2015-03-19 21:42:31 +08:00
Jacky 85c04ff605 [ci skip]add comments to CCLayer & CCNode & CCConfiguration. 2015-03-19 21:41:40 +08:00
dingpinglv 41822ef131 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Iss_Annotate 2015-03-19 21:27:52 +08:00
dingpinglv 3413c716df Issue: Added js annotates to CCScheduler.h 2015-03-19 21:25:09 +08:00
minggo 8e32933dd3 Merge pull request #10340 from seobyeongky/network_bugfix2 
receive content data even though status code is not 2xx
 2015-03-19 21:12:51 +08:00
SuYaohui c295952c71 NodeGrid,Config,NS,ApplicationProtocol 2015-03-19 21:03:28 +08:00
dingpinglv c03703ddab Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Iss_Annotate 2015-03-19 21:01:17 +08:00
dingpinglv 069791a0a2 Corrected a wrong indent in CCSpriteFrameCache.h 2015-03-19 21:00:33 +08:00
minggo 35078b70da Merge pull request #10997 from CocosRobot/update_lua_bindings_1426768076 
[AUTO]: updating luabinding automatically
 2015-03-19 20:44:33 +08:00
CocosRobot 21e46efb00 [AUTO]: updating luabinding automatically 2015-03-19 12:30:15 +00:00
dingpinglv 67169443df Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Iss_Annotate 
Conflicts:
	cocos/audio/include/SimpleAudioEngine.h
 2015-03-19 20:28:29 +08:00
dingpinglv baa723a899 Issue : Added js annotates to CCController.h 2015-03-19 20:26:44 +08:00
Vincent Yang 93ccdae7df Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2015-03-19 20:22:59 +08:00
Vincent Yang ca4c71bf0e Add MainPageWhiteBook.h, and move doxygen_modules.h to docs. 2015-03-19 20:21:40 +08:00
dingpinglv 1b179c2b02 Issue : added js annotates to SimpleAudioEngine, CCVertexIndexBuffer.h, CCVertexIndexData.h 2015-03-19 20:20:16 +08:00
minggo 0b19781d8c Merge pull request #10989 from pipu/serialize_InnerActionSpeed 
Serialize attribute "InnerActionSpeed" during create from .csd file.
 2015-03-19 20:11:34 +08:00
minggo 1539b5de78 Merge pull request #10991 from VisualSJ/v3-docs 
Add javascript notes...
 2015-03-19 20:09:41 +08:00
minggo 8075cc1602 Merge pull request #10986 from samuele3hu/v3_5_comment 
[ci skip]Update comments of some header files
 2015-03-19 20:01:43 +08:00
minggo f3e518b103 Merge pull request #10985 from dabingnn/v3_fixRenderTextureCrash 
fix crash problem when switch to a new scene after call RenderTexture::s...
 2015-03-19 20:00:31 +08:00
minggo 5601eed02f Merge pull request #10987 from samuele3hu/v3_5_f_bug 
issue #10875: fix a lua bindings bug for GLProgram::setUniformLocationF32
 2015-03-19 19:59:28 +08:00
dingpinglv 7a50af4407 Issue : added js annotate to CCLight.h 2015-03-19 19:54:46 +08:00
dingpinglv 194c8d8f17 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Iss_Annotate 2015-03-19 19:46:01 +08:00
VisualSJ f87b06a1c8 Add javascript notes... 
cocos/2d/CCAction.h
  cocos/2d/CCActionCamera.h
  cocos/2d/CCActionCatmullRom.h
  cocos/2d/CCActionInstant.h
  cocos/2d/CCActionInterval.h
  cocos/2d/CCActionManager.h
  cocos/audio/include/AudioEngine.h
  cocos/audio/include/SimpleAudioEngine.h
 2015-03-19 18:41:11 +08:00
calfjohn 97048c8fdc Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2015-03-19 18:00:08 +08:00
calfjohn c2cded367c add document for physics 2015-03-19 17:58:08 +08:00
pipu e9b6ca724d Serialize attribute "InnerActionSpeed" during creating project node from .csd file for cocosstudio simulator. 2015-03-19 17:54:26 +08:00
samuele3hu 5a5acc624a issue #10875: fix a lua bindings bug for GLProgram::setUniformLocationF32 2015-03-19 17:31:57 +08:00
samuele3hu 1eb1057875 Update comments of some header files 2015-03-19 16:59:21 +08:00
samuele3hu 31b34ddf77 Update comments of some header files 2015-03-19 16:45:53 +08:00
Huabing.Xu 8b04a15ee8 fix crash problem when switch to a new scene after call RenderTexture::saveToFile() 2015-03-19 16:39:45 +08:00
CocosRobot 0afd385412 [AUTO]: updating luabinding automatically 2015-03-19 08:29:09 +00:00
zhangbin f196d213ee Solve the error format of comments in header files. 2015-03-19 15:59:58 +08:00
zhukaixy 0587122ccc Move Skybox.shader from Sprite3DTest to Shader3D folder 2015-03-19 15:11:24 +08:00
minggo a8471dd507 Merge pull request #10978 from natural-law/v3 
[ci skip] Update comments of some header files.
 2015-03-19 13:42:48 +08:00
zhangbin d755a7b46a Update comments of some header files. 2015-03-19 13:41:21 +08:00
minggo a8d29b6122 Merge pull request #10970 from CocosRobot/update_lua_bindings_1426737203 
[AUTO]: updating luabinding automatically
 2015-03-19 11:56:41 +08:00
minggo 1d37016912 Merge pull request #10962 from dingpinglv/Iss_Annotate 
[ci skip] added js annotate to classes
 2015-03-19 11:56:07 +08:00
CocosRobot f2c49b3311 [AUTO]: updating luabinding automatically 2015-03-19 03:55:42 +00:00
minggo 194510dacc Merge pull request #10969 from pipu/parse_csd_position 
Fix that parse position from .csd file.
 2015-03-19 11:53:31 +08:00
minggo b3d9b72f27 Merge pull request #10944 from pipu/manage_actiontimelinedata_reference 
Manage reference count of ActiontimelineData object.
 2015-03-19 11:53:07 +08:00
minggo aec86d7e61 Merge pull request #10967 from VisualSJ/v3-docs 
Add javascript notes...
 2015-03-19 11:52:44 +08:00
pipu c1f147b7a1 Avoid crash during parse armature node. 2015-03-19 11:51:34 +08:00
minggo 74de66a286 Merge pull request #10964 from CocosRobot/update_lua_bindings_1426687157 
[AUTO]: updating luabinding automatically
 2015-03-19 11:49:54 +08:00
pipu 46741e1035 Fix that parse position from .csd file. 2015-03-19 11:22:11 +08:00
minggo b469f460c7 Merge pull request #10968 from WenhaiLin/v3-update-document 
[ci skip]Update document
 2015-03-19 10:46:06 +08:00
WenhaiLin e528531b4b [ci skip]Update document 2015-03-19 10:38:12 +08:00
VisualSJ 62b3f537ce Add javascript notes...Fixed error 2015-03-19 10:33:11 +08:00
SuYaohui 2edb7f7d50 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into cocosapi 2015-03-19 10:05:24 +08:00
SuYaohui bc2b897dc6 ProgressTimer 2015-03-19 10:00:30 +08:00
dingpinglv 9be573e92f Added js annotate to CCSpriteFrameCache.h 2015-03-18 22:24:03 +08:00
dingpinglv 4bb78a2eec Added js annotate to CCScene.h 2015-03-18 22:08:50 +08:00
CocosRobot b7881eab88 [AUTO]: updating luabinding automatically 2015-03-18 14:02:42 +00:00
dingpinglv ee44f024f1 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Iss_Annotate 
Conflicts:
	cocos/2d/CCActionGrid.h
	cocos/2d/CCAnimation.h
	cocos/2d/CCAnimationCache.h
	cocos/base/CCRef.h
 2015-03-18 21:58:07 +08:00
minggo 8306aaaab2 Merge pull request #10955 from dabingnn/v3_comments 
[ci skip] update comments CCRenderCommand.h
 2015-03-18 21:48:47 +08:00
minggo ddb6230c13 Merge pull request #10953 from fusijie/cocosapi 
[ci skip]update CCActionManager & CCActionInstant & CCActionInterval & CCScene & ...
 2015-03-18 21:48:28 +08:00
minggo a9f13148f4 Merge pull request #10961 from minggo/add-documentation 
[ci skip]update document for ccUtils.h
 2015-03-18 21:46:20 +08:00
dingpinglv a99c2c7893 Issue : added js annotate to CCActionGrid.h, CCAnimation.h, CCAnimationCache.h, CCAtlasNode.h, CCRef.h 2015-03-18 21:45:58 +08:00
minggo 7f825d3dae update document for ccUtils.h 2015-03-18 21:45:00 +08:00
VisualSJ 3576df4b89 Add javascript notes... 
cocos/base/CCDirector.h
 2015-03-18 21:39:50 +08:00
VisualSJ 785214ae12 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-docs 
Conflicts:
	cocos/base/CCAutoreleasePool.h
	cocos/base/CCData.h
 2015-03-18 21:38:56 +08:00
minggo bf0d48e483 Merge pull request #10957 from natural-law/v3 
[ci skip] Update comments of some header files.
 2015-03-18 21:33:13 +08:00
minggo 0267faa7d1 Merge pull request #10958 from minggo/add-documentation 
[ci skip]update document for CCUserDefault.h
 2015-03-18 21:27:13 +08:00
minggo 85811bd710 update document for CCUserDefault.h 2015-03-18 21:24:31 +08:00
zhangbin f31a833df4 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2015-03-18 21:10:17 +08:00
zhangbin a5e148c829 Update comments of some header files. 2015-03-18 20:56:17 +08:00
VisualSJ cb50c7d89a Add javascript notes... 
cocos/2d/CCActionPageTurn3D.h
  cocos/base/CCAutoreleasePool.h
  cocos/base/CCData.h
 2015-03-18 20:51:18 +08:00
minggo 660cfdf964 Merge pull request #10954 from minggo/add-documentation 
[ci skip]Add documentation
 2015-03-18 20:43:33 +08:00
Jacky 2d50327323 update CCActionManager & CCActionInstant & CCActionInterval & CCScene & CCSpriteFrame & CCSpriteFrameCache 2015-03-18 20:40:29 +08:00
minggo 19fc6a1495 update document for CCScheduler.h 2015-03-18 20:37:43 +08:00
minggo 10703bce66 Merge pull request #10952 from SuYaoHui/cocosapi 
[ci skip]Action,ActionCamera,ActionCatmullRom,Animation,AnimationCache,AtlasNode
 2015-03-18 20:33:00 +08:00
Huabing.Xu 0c8218581f [ci skip] update comments CCRenderCommand.h 2015-03-18 20:30:52 +08:00
SuYaohui 31944da08c [ci skip]Action,ActionCamera,ActionCatmullRom,Animation,AnimationCache,AtlasNode 2015-03-18 20:26:16 +08:00
Huabing.Xu 431b3593a7 [ci skip] update comments CCQuadCommand.h 2015-03-18 20:12:34 +08:00
calfjohn e67a57512f Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2015-03-18 20:10:16 +08:00
SuYaohui ee8776f041 [ci skip]Action,ActionCamera,ActionCatmullRom,Animation,AnimationCache,AtlasNode 2015-03-18 20:07:00 +08:00
Huabing.Xu a87c5755e9 [ci skip] update comments CCTrianglesCommand.h 2015-03-18 19:52:08 +08:00
Huabing.Xu 4ae4500a68 [ci skip]adjust comments 2015-03-18 19:32:10 +08:00
minggo 359e25327d Merge pull request #10946 from natural-law/v3 
[ci skip] Update comments of some header files.
 2015-03-18 18:25:31 +08:00
zhangbin b55916c283 Update comments of some header files. 2015-03-18 18:15:34 +08:00
Huabing.Xu fb1d9899c7 [ci skip]adjust comments CCVertexIndexBuffer.h and CCVertexIndexData.h 2015-03-18 17:40:10 +08:00
Huabing.Xu a71fb9f946 [ci skip]update comments CCVertexIndexBuffer.h 2015-03-18 17:18:25 +08:00
pipu e7c89dadf1 Manage reference count of ActiontimelineData object in ObjectExtensionData. 2015-03-18 16:56:16 +08:00
calfjohn 83e69f4532 add comments for PhysicsWorld 2015-03-18 16:35:38 +08:00
minggo 0408fc0667 update document for CCRef.h 2015-03-18 15:02:03 +08:00
Huabing.Xu eb2786f40d [ci skip]update comments CCVertexIndexData.h 2015-03-18 14:43:44 +08:00
minggo aa5f257243 Merge pull request #10938 from minggo/add-documentation 
[ci skip]Add documentation
 2015-03-18 14:11:30 +08:00
minggo 723244f62d Merge pull request #10932 from lyubomirv/v3-bulgarian 
Added Bulgarian language.
 2015-03-18 14:01:26 +08:00
minggo 5271c75c11 Merge pull request #10936 from super626/v3 
Camera mask for label
 2015-03-18 14:00:44 +08:00
minggo eeebe97547 Merge pull request #10937 from CocosRobot/update_lua_bindings_1426657990 
[AUTO]: updating luabinding automatically
 2015-03-18 13:57:08 +08:00
CocosRobot 611ec0a4a5 [AUTO]: updating luabinding automatically 2015-03-18 05:55:07 +00:00
Huabing.Xu edf785cec3 [ci skip]update version 2015-03-18 13:52:52 +08:00
yangxiao 44af57459e add comment 2015-03-18 11:58:36 +08:00
yangxiao 21d581a72c set camera mask when member created 2015-03-18 11:41:43 +08:00
pipu faf9d6b01c Avoid crash during parse .csd file. 2015-03-18 10:28:12 +08:00
minggo be2af44583 update document for CCDirector.h 2015-03-17 22:32:26 +08:00
lyubomirv 2aec39ad56 Added Bulgarian language. 2015-03-17 15:14:02 +02:00
minggo 44c04153a6 update document for CCDataVisitor.h 2015-03-17 20:54:47 +08:00
minggo 36bf7c6d39 update document for CCAutoreleaseData.h 2015-03-17 20:49:00 +08:00
minggo 5b55e873d0 update document for CCAutoreleasePool.h 2015-03-17 20:15:50 +08:00
minggo 1e271a9d96 Merge pull request #10899 from super626/v3 
Bug fix
 2015-03-17 19:29:21 +08:00
songchengjiang 73caf536da fix the bug of lighting shader 2015-03-17 16:43:08 +08:00
lvlong 3ce0449c97 decompose 2015-03-17 15:17:23 +08:00
CocosRobot 9df3f57e0d [AUTO]: updating luabinding automatically 2015-03-17 06:28:14 +00:00
minggo aa573a9553 Merge pull request #10904 from pipu/fixed_widget_reader_actiontag 
Optimize parse action tag for node and widget.
 2015-03-17 14:18:22 +08:00
minggo f51e2b9537 Merge pull request #10912 from perminovVS/v3-dev-console 
Create Console before any sub systems
 2015-03-17 14:17:35 +08:00
lvlong 733a89100e remove old code! 2015-03-17 13:13:03 +08:00
lvlong 080132d072 modify sub node transform! 2015-03-17 12:15:03 +08:00
Dale Stammen 5606fad642 Merge branch 'v3' into v3-wp8-fix 2015-03-16 20:47:55 -07:00
Vincent Yang 6bbb89a098 Add doxygen config for white book and cocos/doxygen_modules.h for doc mudules. 2015-03-17 11:26:33 +08:00
Dale Stammen 65c83378d0 Merge branch 'v3' into v3-wp8-fix 2015-03-16 20:22:28 -07:00
minggo f7d5a16734 Merge pull request #10873 from konopka/fix_compiler_override_warnings 
Fix compiler override warnings
 2015-03-17 10:38:19 +08:00
Vladimir Perminov e745d5949a Create Console before any sub systems 
Sub system use cocos2d::log in constructors.
 2015-03-16 20:22:20 +03:00
konopka 0387b13bb6 Adding missing virtual keywords 2015-03-16 16:39:43 +01:00
konopka 7fb79272ca Undo changes that are not allowed by spine license 2015-03-16 16:35:41 +01:00
Dale Stammen e2a5eb2f9f updated to Angle ddbf057c52 2015-03-16 08:18:26 -07:00
Dale Stammen 08ceae3de2 removed no-gl_PointSize shaders for Windows Phone 8.1 2015-03-16 08:08:02 -07:00
pipu a5e9ebc4e6 Fix parse action tag for widget. 2015-03-16 20:04:59 +08:00
yangxiao 8b3e116ed6 check running scene 2015-03-16 18:04:50 +08:00
Dale Stammen ef5e6fc473 fixed use of Color4B 2015-03-16 02:17:05 -07:00
yangxiao 5b26ba3c68 override setCameraMask 2015-03-16 17:11:17 +08:00
yangxiao f56d8c4784 fix camra mask for label does not work 2015-03-16 15:31:29 +08:00
CocosRobot a3ddd92307 [AUTO]: updating luabinding automatically 2015-03-16 07:11:12 +00:00
minggo f25be54e95 Merge pull request #10671 from kpkhxlgy0/v3 
enable setWritablePath on platform win32 and mac
 2015-03-16 14:57:26 +08:00
minggo d0753674b2 Merge pull request #10514 from cpascal/uiEditBox_Win32 
Fixed missing ui::EditBox functionalities on Win32
 2015-03-16 14:56:49 +08:00
minggo 23dbbf6d99 Merge pull request #10887 from CocosRobot/update_lua_bindings_1426488653 
[AUTO]: updating luabinding automatically
 2015-03-16 14:54:26 +08:00
CocosRobot 7a4e727ee2 [AUTO]: updating luabinding automatically 2015-03-16 06:53:18 +00:00
minggo 1916bc1f1f Merge pull request #10693 from Mazyod/editbox-text-alpha-support 
Support Color4B for editbox text
 2015-03-16 14:52:36 +08:00
minggo 2ea88a30bb Merge pull request #10817 from garfieldkwong/fix_autorelease_branch 
fix issue autorelease will not release trigger by autorelease.
 2015-03-16 14:47:30 +08:00
minggo ebe5dff7a6 Merge pull request #10737 from newnon/v3_scale9_blend_func 
blending function for Scale9Sprite
 2015-03-16 14:45:08 +08:00
Martin Konopka 2c80b6ae3a Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] 2015-03-15 00:10:08 +01:00
Martin Konopka cd12d08a52 Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] 2015-03-14 19:33:15 +01:00
Nite Luo cfa1f0c84f Merge pull request #10843 from konopka/fix_compiler_reorder_warnings 
Get rid of compiler warnings: field '_xxx' will be initialized after field '_yyy'...
 2015-03-13 21:12:35 -07:00
Nite Luo 3194da4e7d Merge pull request #10720 from darkdukey/hide_cursor 
Hide cursor
 2015-03-13 10:48:15 -07:00
SunLightJuly 6871e30b8d define __G__TRACKBACK__ in cocos.init 2015-03-13 16:39:36 +08:00
CocosRobot 2f0eb6712d [AUTO]: updating luabinding automatically 2015-03-13 07:15:34 +00:00
Huabing.Xu 639ed335b3 Merge pull request #10839 from pipu/node_load_callback 
To add the function node load callback called during create node from csb file.
 2015-03-13 15:06:14 +08:00
Huabing.Xu 03c3a4d5ed Merge pull request #10836 from pipu/reconstruct_object_extension_data 
To reconstruct object extension data.
 2015-03-13 15:04:41 +08:00
CocosRobot fa2fe74986 [AUTO]: updating luabinding automatically 2015-03-13 06:19:29 +00:00
Huabing.Xu 1fa9145a56 Merge pull request #10832 from super626/v3 
fix bugs
 2015-03-13 14:13:24 +08:00
Huabing.Xu c3aea9f6c0 update version string and releaseNotes for 3.5 2015-03-13 11:51:32 +08:00
Martin Konopka 350b81501d Get rid of warnings: field '_xxx' will be initialized after field '_yyy' [-Wreorder] 
Initialization follows the order of declaration, not the order of the initialization list.
 2015-03-12 23:47:58 +01:00
pipu 56c3d1c6f6 To add the function node load callback called during create node from csb file. 2015-03-12 17:36:39 +08:00
pipu 7515fc78f5 To set csd version for serializing. 2015-03-12 16:15:17 +08:00
pipu c72c8e865d To reconstruct object extension data. 2015-03-12 15:47:15 +08:00
yangxiao 50c3a9cb4c fix removeAllChildren cause camera to be destroyed bug 2015-03-12 10:39:21 +08:00
byeonggee.seo a2274162b5 merged 2015-03-12 10:06:53 +09:00
GarfieldKwong 656842d6f1 fix issue autorelease will not release trigger by autorelease. 2015-03-11 15:31:06 +08:00
minggo d2be2290a3 Merge pull request #10796 from Mazyod/http-client-mac 
Http client mac
 2015-03-11 14:26:08 +08:00
CocosRobot e079216248 [AUTO]: updating luabinding automatically 2015-03-11 02:45:36 +00:00
minggo 04393854e8 Merge pull request #10789 from fusijie/fix-moveto-reverse 
disable MoveTo::reverse()
 2015-03-11 10:39:45 +08:00
minggo c4ac2b5f47 Merge pull request #10795 from pipu/optimize_ButtonReader 
To optimize ButtonReader for source path and source.
 2015-03-11 10:05:48 +08:00
minggo c701f89329 Merge pull request #10683 from Mazyod/mac-editbox-fix 
Fix editbox on Mac
 2015-03-11 10:00:50 +08:00
pipu 90da84a663 To modify that check whether or not string is not empty. 2015-03-11 09:59:07 +08:00
Jacky 605ce58293 disable MoveTo::reverse() 2015-03-11 09:55:32 +08:00
Mazyad Alabduljaleel 983ffd96c7 Now, mac uses ObjC HTTP client 2015-03-10 14:48:57 +04:00
minggo 858178ad8e Merge pull request #10772 from super626/v3 
refactor init method
 2015-03-10 17:50:06 +08:00
pipu 00bf9f5bfb To optimize the situation that source path is existed, but source is not existed. 2015-03-10 17:48:48 +08:00
minggo afb06b5c42 Merge pull request #10770 from m2q1n9/patch-1 
fix cocostudio anchor point bug
 2015-03-10 13:40:44 +08:00
minggo 8e6d9d5dd2 Merge pull request #10740 from newnon/v3_windows_network_path 
Windows network path fix
 2015-03-10 11:25:53 +08:00
minggo f3567ba1af Merge pull request #10780 from ryule/fix_CCDevice-ios_font_stroke_alpha 
Fix CCDevice-ios.mm to have the right alpha color for a stroke effect.
 2015-03-10 11:19:29 +08:00
minggo 5ac2fb398c Merge pull request #10774 from minggo/sync-from-v4 
Label:Fixed transform not update correctly
 2015-03-10 09:54:20 +08:00
minggo a4698eaaaf Merge pull request #10781 from mogemimi/add-const-to-member-function 
Add const to Value::getDescription() function
 2015-03-10 09:49:56 +08:00
yangxiao 5131a23de4 solve conflict 2015-03-10 09:18:13 +08:00
Dale Stammen 24d706cb7a added /bigobj to C++ compiler command line options 2015-03-09 09:39:36 -07:00
Dale Stammen 35222a8193 Merge branch 'v3' into v3-wp8-fix 2015-03-09 09:20:25 -07:00
Dale Stammen a828f73ccb updated expiration date of project certificates 2015-03-09 08:31:06 -07:00
mogemimi de4105516a Add const to Value::getDescription() function 2015-03-09 22:34:24 +09:00
Jongryul Kook 0d65dd13be Fix CCDevice-ios.mm to have the right alpha color for a stroke effect. 2015-03-09 21:20:17 +09:00
WenhaiLin cd95905a04 Label:Fixed transform not update correctly if this camera mask of Label isn't visible by the current visiting camera 2015-03-09 17:26:43 +08:00
yangxiao 45bd6180ad fix create bundle using empty path 2015-03-09 17:09:18 +08:00
yangxiao ff3eba6143 refact init 2015-03-09 16:29:57 +08:00
m2q1n9 c97742072f fix cocostudio anchor point bug 
fix a bug which will cause anchor point config not work
 2015-03-09 14:30:41 +08:00
Dale Stammen a9479a1585 updated WP8 precompiled shaders 2015-03-08 21:42:27 -07:00
Dale Stammen 6cd881d8f8 added missing Particle3D files 2015-03-08 21:37:29 -07:00
Dale Stammen 362edec6d6 added missing Particle3D files 2015-03-08 21:31:43 -07:00
minggo badfa5501d Merge pull request #10723 from pipu/reconstruct_parse_callbackbind 
To reconstruct callback binding for nest node
 2015-03-09 10:55:47 +08:00
pipu c21538e6e2 Merge branch 'v3' into reconstruct_parse_callbackbind 2015-03-09 10:38:02 +08:00
CocosRobot 1f78b18d22 [AUTO]: updating luabinding automatically 2015-03-09 02:27:14 +00:00
pipu 1fa9b2577a Merge branch 'v3' into reconstruct_parse_callbackbind 2015-03-09 10:16:14 +08:00
Mazyad Alabduljaleel ce377c4a1e Fix compilation issues on Android and Win 2015-03-06 16:05:05 +04:00
yangxiao 8137b01f23 merge cocos 2015-03-06 18:31:57 +08:00
XiaoYang 27ae60e626 Merge pull request #249 from songchengjiang/particle_merge 
support win8.1
 2015-03-06 17:57:34 +08:00
minggo 2238cb0dbb Merge pull request #10546 from krishnanm86/knarasimhan_sourcerefactor_jni_audio 
Sourcr Refactor. Abstracted common functionality from two jni methods an...
 2015-03-06 16:14:59 +08:00
minggo 15853a435e Merge pull request #10738 from newnon/v3_mingw_build_fix 
MinGW build fix
 2015-03-06 15:49:13 +08:00
minggo 65926a9f0b Merge pull request #10734 from pipu/projectnode_animation_innerspeed 
Serialize and parse attribute "innerspeed" for ProjectNode.
 2015-03-06 15:43:57 +08:00
songchengjiang 4ca90341b9 support win8.1 2015-03-06 15:35:02 +08:00
minggo c96f3b135a Merge pull request #10733 from pipu/modify_layout_attribute_name 
To modify layout attribute name that are used in serialized and parsed.
 2015-03-06 15:00:33 +08:00
yangxiao 457ac3fdd7 reset unproject with viewport cocostudio using it 2015-03-06 11:29:40 +08:00
yangxiao d7c1d6b6aa add billboard to transparent queue 2015-03-06 09:57:48 +08:00
andyque e93f39fae1 fix typo 2015-03-05 17:05:08 +08:00
andyque a229793e31 fix Linux glfw linker error on v3 2015-03-05 16:34:51 +08:00
Sergey 8270355ad6 blending function for Scale9Sprite 2015-03-05 11:13:51 +03:00
Sergey de284c98ce MinGW build fix 2015-03-05 11:11:13 +03:00
Sergey Perepelitsa 215fe8a0c9 Windows network path fix 2015-03-05 11:10:03 +03:00
pipu fadac31868 Serialize and parse attribute "inner speed" for ProjectNode. 2015-03-05 15:48:17 +08:00
songchengjiang 444dbfdf9e replace .mesh with .c3b 
modify ParticleUniverse file structure
 2015-03-05 14:54:32 +08:00
pipu be1b0b7239 To modify layout attribute name that are used in serialized and parsed. 2015-03-05 14:34:35 +08:00
yangxiao faf299c5a1 make path shorter 2015-03-05 13:24:06 +08:00
Jacky c38c4a1373 fixed source coding error. 2015-03-04 18:15:05 +08:00
Krishna 35403439f3 Fixed compilation issue. Introduced missing CLASS_NAME 2015-03-04 10:48:30 +01:00
Krishna ec3a8d49f9 Fixed compilation error. 2015-03-04 10:43:31 +01:00
pipu 010a077fa8 To reconstruct callback binding for nest node as WidgetCallBackHandlerProtocol in CSLoader. 2015-03-04 17:29:40 +08:00
yangxiao ea7dfe1147 lua test 2015-03-04 10:42:08 +08:00
yangxiao 68eaadaffb merge cocos 2015-03-04 09:57:42 +08:00
Dale Stammen e93fe1b13b Merge branch 'v3' into v3-wp8-fix 2015-03-03 08:40:07 -08:00
CocosRobot 93c2b48779 [AUTO]: updating luabinding automatically 2015-03-03 15:15:43 +00:00
minggo 13e4525772 Merge pull request #10659 from super626/v3 
Remove expolosion particle
 2015-03-03 23:03:02 +08:00
cpascal db9985d7cd Added new line with the left curl bracket. 2015-03-03 20:39:25 +09:00
yangxiao 3db3d9ae11 merge cocos 2015-03-03 17:23:33 +08:00
byeonggee.seo b3335f34ae Merge branch 'network_bugfix2' of github.com:seobyeongky/cocos2d-x into network_bugfix2 2015-03-03 16:33:48 +09:00
byeonggee.seo 3811c9f1a3 connError added 2015-03-03 16:33:35 +09:00
Nite Luo 49912c2f62 clean up the formatting 2015-03-02 23:29:15 -08:00
Chad 395c14f07d Hide Cursor - Feature Request #8766 
Added the ability to hide or show the cursor on desktop builds.
 2015-03-02 23:21:18 -08:00
cpascal a6ee1451f4 changed one more indentation. 
I made mistake, (now replacing the spaces to tab)
 2015-03-03 13:44:43 +09:00
cpascal 4058e16f16 Added line break & removed function call in compare operator. 2015-03-03 13:40:40 +09:00
yangxiao 38636dc8b7 allow transition time to 0 2015-03-03 11:04:34 +08:00
yangxiao 874f7c7f99 fix transparent render bug 2015-03-03 10:42:47 +08:00
Dale Stammen 44b951a51a Merge branch 'v3' into v3-wp8-fix 2015-03-02 16:42:05 -08:00
Mazyad Alabduljaleel 9d5fdcb973 Support Color4B for editbox text 2015-03-02 15:31:59 +04:00
songchengjiang 5c460ebb2d add/update particle files 2015-03-02 13:07:32 +08:00
Mazyad Alabduljaleel 4387844176 Fix editbox on Mac 2015-03-01 23:56:18 +04:00
kpkhxlgy0 99dea9395d enable setWritablePath on platform win32 and mac 2015-02-28 18:21:57 +08:00
yangxiao 56f3f34ee3 add Animate3D::setTransitionTime 2015-02-28 17:40:25 +08:00
CocosRobot 84fb4094fc [AUTO]: updating luabinding automatically 2015-02-28 03:23:08 +00:00
minggo 0755400a79 Merge pull request #10279 from seobyeongky/motionstreak_bug_fix 
MotionStreak MoveTo/MoveBy action OK
 2015-02-28 11:17:28 +08:00
Dale Stammen fd11984e0a disable LTCG 2015-02-27 11:21:36 -08:00
Dale Stammen e4db9f396e disable LTCG. set warning level to W3 2015-02-27 11:16:40 -08:00
Dale Stammen f68a966485 disabled Check SDL to allow CC_DEPRECATED to work as warning and not error 2015-02-27 11:07:51 -08:00
Dale Stammen e04fd6eb1d updated cocos2d dll name from 3.4 to 3.5 2015-02-27 10:54:27 -08:00
Dale Stammen d486cc78fb updated cocos2d dll name from 3.4 to 3.5 2015-02-27 10:52:32 -08:00
Dale Stammen 8bc5b37b40 removed missing include files from project 2015-02-27 10:48:53 -08:00
Dale Stammen b5e936c657 disabled LTCG to speed up release builds 2015-02-27 10:43:13 -08:00
Dale Stammen 2eb919bb7a disabled Check SDL to allow CC_DEPRECATED to work as warning and not error 2015-02-27 10:36:48 -08:00
Dale Stammen e9ef92291f renamed cocos2d dll from 3.4 to 3.5 2015-02-27 10:26:58 -08:00
Dale Stammen 49b16718a2 removed missing .h files from solution 2015-02-27 10:24:02 -08:00
seobyeongky 91b0104fd0 Fix an issue with iOS HTTP Request code (https://github.com/cocos2d/cocos2d-x/pull/10543) 2015-02-27 21:31:33 +09:00
Wenhai Lin 5af895b24d Fixed the position of physics body is wrong when the position of parent node has been change. 2015-02-27 17:55:25 +08:00
minggo 7805adce94 Merge pull request #10325 from seobyeongky/httpclient_bugfix 
HttpResponse reference counting bug fixed
 2015-02-27 14:32:41 +08:00
CocosRobot 8a310c09c0 [AUTO]: updating luabinding automatically 2015-02-27 03:54:42 +00:00
yangxiao dd070e177e modify unproject 2015-02-27 10:20:32 +08:00
yangxiao 437a59fb9a modify project & unproject api 2015-02-27 10:01:57 +08:00
yangxiao 6f395edf0e modify according to minggo 2015-02-26 17:37:45 +08:00
yangxiao f13237c013 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2015-02-26 17:27:42 +08:00
minggo e69e648d7c Merge pull request #10483 from redism/ios-network-header-fix 
apply custom request header for every request type (ios)
 2015-02-26 16:40:12 +08:00
minggo e37bbee1c2 Merge pull request #10545 from Mazyod/ios-http-request-leaks 
Fix major memory leaks in iOS http request
 2015-02-26 15:41:10 +08:00
yangxiao a1642757f9 merge setcameramask 2015-02-26 15:33:18 +08:00
yangxiao 9a64eb18dd add project function 2015-02-26 15:20:20 +08:00
Krishna 58df860b4e Made the loadeffect utility method into a static method. Removed declaration of old method from header file 2015-02-26 06:53:20 +01:00
Nite Luo dbba9e36a1 Merge pull request #10431 from vovkasm/dev/fix-win32-resource-search-path 
Fix win32 resource search path to be relative to the executable.
 2015-02-25 20:24:07 -08:00
minggo 366a938a86 Merge pull request #10603 from sun-ray/v3 
CocosStudio 3DReader
 2015-02-26 11:01:28 +08:00