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

8647 Commits

Author SHA1 Message Date
tangziwen 2be309d841 add reload method in case of GL context Lost. 2015-04-08 19:11:46 +08:00
minggo 8a1aa78f7d Merge pull request #11336 from xiaofeng11/v3 
Update reader
 2015-04-08 18:40:32 +08:00
minggo 3ce6602f3a Merge pull request #11335 from super626/v3 
Modify changelog and add getAABBRecursively
 2015-04-08 18:03:48 +08:00
andyque 24c0c8d811 fix wp8 compile issue 2015-04-08 18:01:56 +08:00
pipu ca74486f60 Update CSParseBinary_generated 2015-04-08 16:54:58 +08:00
yangxiao a7a39d71f5 modify getAABBRecursively 2015-04-08 16:40:04 +08:00
yangxiao 0d0bad186f resolve conflict 2015-04-08 16:23:35 +08:00
minggo 263506fb74 Merge pull request #11282 from hawkwood/patch-8 
Fix iOS 5.1.1 crash caused by interruptionHandler
 2015-04-08 16:23:12 +08:00
andyque f52899c257 update freetype2 and chipmunk on wp8 and wp8.1 2015-04-08 16:21:19 +08:00
tangziwen dc7cd520b2 update terrain 2015-04-08 15:17:05 +08:00
minggo 00c0e4c432 Merge pull request #10909 from babcca/webview_ios_load_data_fix 
Webview ios load data fix
 2015-04-08 14:34:42 +08:00
minggo e4099acdc8 Merge pull request #11328 from CocosRobot/update_lua_bindings_1428464979 
[AUTO]: updating luabinding automatically
 2015-04-08 13:54:22 +08:00
CocosRobot 58ca1b7911 [AUTO]: updating luabinding automatically 2015-04-08 03:52:03 +00:00
minggo e9cdf333f9 Merge pull request #11246 from xiaofeng11/v3 
V3 reader fix
 2015-04-08 11:46:40 +08:00
minggo 4bcfcb1d09 Merge pull request #11320 from samuele3hu/v3_terrain 
#issue 10819:Add lua bindings for Terrain and two test cases about it.
 2015-04-08 11:45:46 +08:00
minggo 21c5bc96e5 Merge pull request #11319 from CocosRobot/update_lua_bindings_1428458531 
[AUTO]: updating luabinding automatically
 2015-04-08 10:53:07 +08:00
minggo 4d9e376a18 Merge pull request #11284 from perminovVS/v3-dev-image-format-detect-log 
Log message can't detect image format
 2015-04-08 10:52:56 +08:00
minggo dff62e329e Merge pull request #11313 from stari4ek/v3-FileUtils-constness 
FileUtils: replace const_cast with mutable in path getters
 2015-04-08 10:50:43 +08:00
tangziwen 3ab4e75a71 update 2015-04-08 10:10:05 +08:00
CocosRobot 4bcf6b7b67 [AUTO]: updating luabinding automatically 2015-04-08 02:04:07 +00:00
samuele3hu 3a2601a1f8 Add lua bindings for Terrain and two test cases about it. 2015-04-08 10:03:50 +08:00
andyque 8a4a7344b0 fix freetype include 2015-04-08 09:24:34 +08:00
andyque e4cf3885a5 use prebuilt zlib for android and mac 2015-04-07 23:20:02 +08:00
Michael Sotnikov f962e14b43 replace const_cast with mutable in path getters; 
more getters (is*/get*) became const;
 2015-04-07 17:15:15 +03:00
tangziwen a220a8f669 fix wrong attribute location bind, fix memory leak, enable back-face culling 2015-04-07 18:47:19 +08:00
minggo ca090281a4 Merge pull request #11307 from WenhaiLin/v3-label-effect 
Add Label::disableEffect(LabelEffect effect) for better support disable the effect of Label.
 2015-04-07 18:22:35 +08:00
minggo 50fa15c0cd Merge pull request #11301 from samuele3hu/v3_lua_jit 
Add luajit support for iOS 64bit devices and related test cases
 2015-04-07 18:17:09 +08:00
lvlong c9014e12b4 Merge branch 'v3' of github.com:super626/cocos2d-x into v3 
Conflicts:
	CHANGELOG
 2015-04-07 16:40:57 +08:00
lvlong 99ef79f940 modify INT_NEAR 2015-04-07 16:37:51 +08:00
WenhaiLin 927cda3f0d Add Label::disableEffect(LabelEffect effect) for better support disable the effect of Label. 2015-04-07 15:51:57 +08:00
minggo eb928432ce Merge pull request #11302 from WenhaiLin/v3-label-shadowcolor 
Label: Fixed shadow color is incorrect.
 2015-04-07 15:27:19 +08:00
minggo 353c2b0d75 Merge pull request #11288 from perminovVS/v3-dev-optimize-vec3 
Optimize Vec3
 2015-04-07 14:04:57 +08:00
WenhaiLin c5c5d3e39d Label: Fixed shadow color is incorrect. 2015-04-07 11:17:01 +08:00
minggo 1646278be2 [ci skip] update version 2015-04-07 10:36:38 +08:00
minggo 295b6d7044 [ci skip] update version 2015-04-07 10:35:49 +08:00
minggo deaa6a19f0 Merge pull request #11257 from super626/terrain 
Terrain
 2015-04-07 09:32:35 +08:00
XiaoFeng 16aa704ffd Merge branch 'v3' of github.com:xiaofeng11/cocos2d-x into v3 2015-04-07 09:11:14 +08:00
XiaoFeng 4929d8102a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2015-04-07 09:06:06 +08:00
Ricardo Quesada a782eb022d fixes warnings on Xcode 6.3 
instead of using `abs()` it uses `std::abs()`
 2015-04-06 12:08:30 -07:00
samuele3hu a64e90d469 Update the related project setting for Luajit and related test cases 2015-04-06 22:41:34 +08:00
Aaron Baumbach 9edfa5bb29 RenderQueue command buffer optimisation 
Made _commands an array of vectors that is no longer reallocated every frame
Provided method to reallocate queues manually and reserve memory in order to minimise std::vector dynamic reallocation
 2015-04-06 14:45:19 +01:00
Vladimir Perminov 105bac2d55 Optimize Vec3 
small function Vec3 move to Vec3.inl
Added:
add(float xx, float yy, float zz);
setZero();

Change all code:
_vec3 = Vec3(x, y, z);   ->   _vec3.set(x, y, z);
Vec3 vec3 = Vec3(x, y, z);   ->  Vec3 vec3(x, y, z);
_vec3 += Vec3(x, y, z);   ->   _vec3.add(x, y, z);
_vec3 = Vec3::ZERO;   ->   _vec3.setZero();
 2015-04-05 13:09:50 +03:00
Vladimir Perminov 3931273a58 Log message can't detect image format 
Wrong log message DDS and KTX check image format(other format no log
message).
isS3TC and isATITC protected, no use dev code.

Log message if format unknown
 2015-04-04 13:19:47 +03:00
minggo 0f09fd8956 Merge pull request #11278 from CocosRobot/update_lua_bindings_1428047459 
[AUTO]: updating luabinding automatically
 2015-04-04 07:18:39 +08:00
Justin Hawkwood 84fd73630a Fix iOS 5.1.1 crash caused by interruptionHandler 
checks OS version and sets handling based on what is available.
 2015-04-03 15:57:47 -07:00
lvlong 4c6eec9ec1 add getAABBRecursively 2015-04-03 18:04:33 +08:00
zhukaixy 6eb86f736c add for wp8 support --ziwen.tang 2015-04-03 17:12:44 +08:00
tangziwen 72f5121959 Merge branch 'terrain' of https://github.com/super626/cocos2d-x into terrain 2015-04-03 16:58:27 +08:00
tangziwen d79c38e17a add WP8 support 2015-04-03 16:50:09 +08:00
yangxiao 7ea1c1ac1f reset 2015-04-03 16:15:09 +08:00
CocosRobot e20a747138 [AUTO]: updating luabinding automatically 2015-04-03 07:53:06 +00:00
tangziwen 0193420dfc Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into terrain 
Resovle Conflicts:
	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
 2015-04-03 15:45:51 +08:00
Daiki Asahi fc92acf587 remove interlevel argument. 2015-04-03 16:43:39 +09:00
tangziwen ee41c9b3f1 add win rt support 2015-04-03 14:36:29 +08:00
tangziwen 8a7b318c1a Add some helper function to detect the heightMap size,refact Terrain::Create, fix typo ,add doxygen comment 2015-04-03 13:49:07 +08:00
Huabing.Xu 98371e4fbb Merge pull request #11267 from WenhaiLin/v3-at01 
Disable MessageBox when the device does not have an accelerometer on WinRT.
 2015-04-03 11:53:07 +08:00
WenhaiLin fdba25cdde Disable MessageBox when the device does not have an accelerometer on WinRT 2015-04-03 11:51:00 +08:00
Huabing.Xu cb77d0145a Merge pull request #11266 from WenhaiLin/v3-at01 
Add getInScene,getDuration for TransitionScene class.
 2015-04-03 11:50:44 +08:00
WenhaiLin f2dc7958bf Add getInScene,getDuration for TransitionScene class. 2015-04-03 11:49:15 +08:00
Huabing.Xu bf31214796 Merge pull request #11263 from WenhaiLin/v3-menuitem-fix 
MenuItem: Fixed crash if MenuItem::onExit is called multiple times.
 2015-04-03 09:53:57 +08:00
tangziwen e4ae88ef15 add new line at end of file 2015-04-03 09:11:09 +08:00
Dale Stammen d8b6a0aaf9 removed unused method 2015-04-02 09:11:19 -07:00
Dale Stammen 47b338e4e6 fix deprecated warnings 2015-04-02 09:08:26 -07:00
Dale Stammen 957bf48790 fire foreground and background events 2015-04-02 09:07:44 -07:00
WenhaiLin aaae566b7b Performance: Fixed lag if Director::setContentScaleFactor is called frequently 2015-04-02 23:35:56 +08:00
WenhaiLin a544eadab8 MenuItem: Fixed crash if MenuItem::onExit is called multiple times. 2015-04-02 23:27:07 +08:00
XiaoYang 63a27d14b7 Merge pull request #282 from lvlonggame/terrain 
fix bug: about minFilter and magFilter
 2015-04-02 17:26:35 +08:00
lvlong 60bed4f461 revert alpha map minFilter 2015-04-02 15:10:51 +08:00
lvlong c3cc8b917c fix bug: about minFilter and magFilter 2015-04-02 15:01:14 +08:00
yangxiao 827231f5c9 add to cocos2d 2015-04-02 14:29:02 +08:00
yangxiao 1b63e5168a add to linux 2015-04-02 14:21:51 +08:00
yangxiao 9aabbabe6e reset 2015-04-02 14:20:36 +08:00
yangxiao 9e115073a1 fix warning 2015-04-02 14:04:31 +08:00
XiaoYang 984babc9c9 Merge pull request #281 from tangziwen/terrain 
update terrain
 2015-04-02 10:19:11 +08:00
yusheng.lu 82c6e623e0 Remove CCNodeReader.h/cpp from libcocos2d_8_1.Shared.vcxitems, libcocos2d_8_1.Shared.vcxitems.filters 2015-04-02 10:15:36 +08:00
samuele3hu 826fe4cf31 Update the Xcode project setting for luajit 2015-04-02 10:07:31 +08:00
CocosRobot dfc2390659 [AUTO]: updating luabinding automatically 2015-04-02 01:51:14 +00:00
minggo 6cf344ded6 Merge pull request #10827 from mogemimi/remove-useless-cast-and-cleanup 
Remove useless (char*) casts in CCTMXXMLParser.cpp
 2015-04-02 09:45:22 +08:00
minggo e7a6c7eada Merge pull request #11245 from CocosRobot/update_lua_bindings_1427857074 
[AUTO]: updating luabinding automatically
 2015-04-02 09:39:36 +08:00
minggo 332ce1a8f3 Merge pull request #11249 from super626/v3 
Release note for texturecube skybox and animtion quality
 2015-04-02 09:39:16 +08:00
minggo 199fb2b694 Merge pull request #11250 from super626/texturecube 
Texturecube Modify
 2015-04-02 09:38:26 +08:00
lvlong 1da7ef121e _aabbDirty = true 2015-04-02 09:33:48 +08:00
tangziwen 6cd1077cb0 update terrain 2015-04-01 18:24:05 +08:00
yangxiao 2cc9814702 modify 2015-04-01 17:58:41 +08:00
yangxiao 4b7ae430a8 Merge branch 'texturecube' of https://github.com/super626/cocos2d-x into texturecube 2015-04-01 17:37:55 +08:00
yangxiao 9540fd590f modify skybox 2015-04-01 17:34:57 +08:00
yangxiao 591fff4046 release note for texturecube skybox and animtion quality 2015-04-01 16:40:40 +08:00
xiaofeng11 ea8538117b Merge pull request #7 from pipu/remove_CCNodeReader 
Remove CCNodeReader.h/.cpp.
 2015-04-01 14:12:09 +08:00
pipu 340e26d81a Supplement invoke destroyInstance() of some Reader in destroyCocosStudio(). 2015-04-01 14:08:09 +08:00
pipu 41661830ff Remove CCNodeReader.h/.cpp. 2015-04-01 13:37:36 +08:00
yusheng.lu 01a091ef2c Delete CCNodeReader for Win8.1 project 2015-04-01 11:49:36 +08:00
CocosRobot 17a80b0c54 [AUTO]: updating luabinding automatically 2015-04-01 02:59:47 +00:00
lvlong 72722ba5b0 fix aabbDirty bug. 2015-04-01 10:57:19 +08:00
minggo 02e8a08de7 Merge pull request #11241 from tangziwen/v3_doc 
update 3d doc
 2015-04-01 10:52:35 +08:00
minggo eefd06415b Merge pull request #11229 from xiaofeng11/v3 
Add destroyCocosStudio()
 2015-04-01 10:49:49 +08:00
tangziwen 3247acc0c1 ignore some method ,fix typo 2015-04-01 10:23:53 +08:00
tangziwen 8cde333d36 update 3d doc 2015-04-01 09:47:09 +08:00
minggo 7b2fcb5287 Merge pull request #11237 from perminovVS/v3-dev-rename-file-win32 
Win32 correct rename file
 2015-04-01 09:35:18 +08:00
pipu bc7d8f0a09 Add method destroyCocosStudio() for CocoStudio 2015-03-31 19:55:56 +08:00
Vladimir Perminov b7279524d6 Win32 correct rename file 
Old version, check GetLastError even if all ok, but LastError can be set
other code.
Write log info.
 2015-03-31 13:52:40 +03:00
CocosRobot 46f32142c7 [AUTO]: updating luabinding automatically 2015-03-31 10:26:49 +00:00
minggo cb0c9ad6ee Merge pull request #11233 from super626/texturecube 
Bug fix: ios devices crash on release mode
 2015-03-31 18:21:22 +08:00
minggo c1cd041912 Merge pull request #11221 from super626/v3 
3d animation quality control
 2015-03-31 17:23:58 +08:00
zhukaixy 3835675cab bugfix: TextureCube will be crashed on release environment 2015-03-31 16:56:02 +08:00
pipu bb110449be Reset method purge() definition for some Reader. 2015-03-31 14:56:24 +08:00
lvlong 336e719a2f initialize _forceDepthWrite 2015-03-31 14:41:07 +08:00
lvlong ab2c773c5c clean all action from s_fadeInAnimates, s_fadeOutAnimates, s_runningAnimates!!!! 2015-03-31 14:26:40 +08:00
pipu 91acd6aea9 Set macro CC_DEPRECATED_ATTRIBUTE for method purge() for all Reader. 2015-03-31 14:21:10 +08:00
CocosRobot 00792e98a3 [AUTO]: updating luabinding automatically 2015-03-31 04:01:57 +00:00
minggo 6ef27df2fc Merge pull request #11223 from hawkwood/patch-6 
Remove use of autorelease NSString and NSURL
 2015-03-31 11:57:00 +08:00
pipu a0a461f319 Supplement some Reader. 2015-03-31 11:22:34 +08:00
XiaoYang 45987b6a60 Merge pull request #276 from tangziwen/terrain 
update Terrain, support skirt
 2015-03-31 09:14:27 +08:00
Justin Hawkwood 237e809f23 Remove use of autorelease NSString and NSURL 
Since there is no autorelease pool, these were leaking.
 2015-03-30 16:27:05 -07:00
Justin Hawkwood 3641ef266c Remove use of autorelease NSString and NSURL 
Since there is no autorelease pool, these were leaking.
 2015-03-30 16:24:48 -07:00
VisualSJ a29becb185 [ci skip] Add javascript notes... 
cocos/ui/UIHBox.h
  cocos/ui/UIHelper.h
  cocos/ui/UIImageView.h
  cocos/ui/UILayout.h
  cocos/ui/UIText.h
  cocos/ui/UITextAtlas.h
  cocos/ui/UITextBMFont.h
  cocos/ui/UITextField.h
  cocos/ui/UIVBox.h
  cocos/ui/UIVideoPlayer.h
  cocos/ui/UIWebView.h
  cocos/ui/UIWidget.h
 2015-03-30 21:38:32 +08:00
tangziwen 1a93f87a15 update terrain 2015-03-30 18:25:22 +08:00
lvlong 4bc44c207d modify config-example.plist 2015-03-30 18:07:32 +08:00
lvlong cbdfd77400 modify some name. 2015-03-30 17:46:45 +08:00
pipu 6f20da4444 Add destroyCocosStudio() 2015-03-30 16:46:33 +08:00
lvlong 5032194e98 modify animate 3d quality to bool 2015-03-30 15:57:58 +08:00
samuele3hu 6c528c4a42 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_5_test 2015-03-30 15:51:01 +08:00
samuele3hu c3ad458a26 Update comment for Lua 2015-03-30 15:47:47 +08:00
minggo 0b400a0b20 Merge pull request #11207 from andyque/fix-remaining-missing-comments 
Finish the missing comments
 2015-03-30 14:54:48 +08:00
lvlong 6fe9f0d1c8 add comments for 3d animation quality!!! 2015-03-30 14:05:03 +08:00
yangxiao c6a86ac287 move shader to shaders 2015-03-30 13:45:50 +08:00
lvlong ccb5039411 Merge branch 'v3' of github.com:super626/cocos2d-x into v3 
Conflicts:
	cocos/base/CCConfiguration.h
 2015-03-30 11:50:01 +08:00
lvlong b2a7a753c2 add comments 2015-03-30 11:44:30 +08:00
andyque b5d10fb246 Merge branch 'v3' into fix-remaining-missing-comments 
Conflicts:
	cocos/base/CCIMEDelegate.h
 2015-03-30 10:56:42 +08:00
minggo d437ce3e59 Merge pull request #11208 from samuele3hu/v3_5_comment 
Update Sprite3DCubeMap  lua test case and the related bindings-generator submodule
 2015-03-30 10:48:36 +08:00
minggo 59441adc2c Merge pull request #11213 from super626/texturecube 
Texturecube bug fix
 2015-03-30 10:48:10 +08:00
yangxiao b469cfa928 merge cocos 2015-03-30 10:28:14 +08:00
yangxiao 7affd8edcf large value for min max 2015-03-30 10:00:06 +08:00
minggo 30db8ab7fa Merge pull request #11159 from super626/v3 
node animation support
 2015-03-30 09:32:36 +08:00
minggo 73279e3b3f Merge pull request #11205 from WenhaiLin/v3-doxygen 
[ci skip]Update comments.
 2015-03-30 09:31:36 +08:00
VisualSJ 875b5d95f4 [ci skip] Add javascript notes... 
cocos/ui/UIListView.h
  cocos/ui/UILoadingBar.h
  cocos/ui/UIPageView.h
  cocos/ui/UIRelativeBox.h
  cocos/ui/UIRichText.h
  cocos/ui/UIScale9Sprite.h
  cocos/ui/UIScrollView.h
  cocos/ui/UISlider.h
 2015-03-28 16:02:47 +08:00
VisualSJ 6285e72d1e [ci skip] Add javascript notes... 
cocos/3d/CCBundle3D.h
  cocos/3d/CCBundle3DData.h
  cocos/3d/CCBundleReader.h
  cocos/3d/CCFrustum.h
  cocos/3d/CCMeshSkin.h
  cocos/3d/CCMeshVertexIndexData.h
  cocos/3d/CCOBB.h
  cocos/3d/CCObjLoader.h
  cocos/3d/CCPlane.h
  cocos/3d/CCRay.h
  cocos/3d/CCSprite3DMaterial.h
  cocos/base/CCAsyncTaskPool.h
  cocos/base/CCIMEDelegate.h
  cocos/base/CCIMEDispatcher.h
  cocos/base/CCMap.h
  cocos/base/CCScriptSupport.h
 2015-03-28 15:11:51 +08:00
samuele3hu 921981833e Update Sprite3DCubeMap test case 2015-03-28 14:59:47 +08:00
VisualSJ 9ba82584a9 [ci skip] Add javascript notes... 
cocos/2d/CCClippingNode.h
  cocos/2d/CCTMXTiledMap.h
  cocos/2d/CCTMXObjectGroup.h
  cocos/2d/CCTMXLayer.h
  cocos/2d/CCSpriteBatchNode.h
  cocos/2d/CCSprite.h
  cocos/2d/CCRenderTexture.h
  cocos/2d/CCProtectedNode.h
  cocos/2d/CCMenuItem.h
  cocos/2d/CCMenu.h
  cocos/2d/CCLabelAtlas.h
  cocos/2d/CCLabel.h
  cocos/2d/CCGrid.h
  cocos/2d/CCGLBufferedNode.h
  cocos/2d/CCFastTMXTiledMap.h
  cocos/2d/CCFastTMXLayer.h
  cocos/2d/CCDrawingPrimitives.h
  cocos/2d/CCDrawNode.h
  cocos/2d/CCComponentContainer.h
  cocos/2d/CCClippingRectangleNode.h
  cocos/2d/CCTextFieldTTF.h
  cocos/2d/CCTileMapAtlas.h
 2015-03-28 14:28:16 +08:00
andyque e3fc9b082e Finish the missing comments 2015-03-27 20:56:12 +08:00
Wenhai Lin ff3777dfd1 [ci skip]Update comments. 2015-03-27 18:26:14 +08:00
zhukaixy 5bff8f5bf3 Bugfix: for glcontext recreated 2015-03-27 17:20:46 +08:00
minggo b78b0f7238 Merge pull request #11202 from minggo/add-documentation 
[ci skip]fix doxygen comment
 2015-03-27 17:12:37 +08:00
minggo b03900bbbf fix doxygen comment 2015-03-27 17:09:54 +08:00
minggo 8b5a6d9ccc Merge pull request #11196 from tangziwen/doc 
3d fix doxygen add to group
 2015-03-27 17:09:24 +08:00
minggo c4ac84d4f6 Merge pull request #11200 from samuele3hu/v3_5_comment 
[ci skip]Update comments of some header files
 2015-03-27 17:08:26 +08:00
zhukaixy a1bad14c1e Update ccShader_3D_Skybox.frag 2015-03-27 17:07:30 +08:00
yangxiao a45f0d1a76 merge cocos 2015-03-27 16:50:40 +08:00
minggo b6ac2fa422 Merge pull request #11199 from WenhaiLin/v3-doxygen 
[ci skip]Update comments
 2015-03-27 16:04:25 +08:00
samuele3hu f54512a618 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_5_comment 2015-03-27 15:59:05 +08:00
Wenhai Lin 6f117c4f49 [ci skip]Update comments 2015-03-27 15:31:42 +08:00
samuele3hu bb225d052e Update comments of some header files 2015-03-27 15:27:08 +08:00
minggo 3c3163d7dd Merge pull request #11193 from CocosRobot/update_lua_bindings_1427435046 
[AUTO]: updating luabinding automatically
 2015-03-27 15:26:36 +08:00
Wenhai Lin 8f3bbe3c40 [ci skip]Update comments 2015-03-27 15:25:44 +08:00
tangziwen 56c31845ff fix conflict again 2015-03-27 15:25:16 +08:00
tangziwen 12bcdc8868 fix conflict 2015-03-27 15:08:20 +08:00
minggo 7d0a49a98f Merge pull request #11198 from SuYaoHui/cocosapi 
[ci skip]Add comment
 2015-03-27 15:00:22 +08:00
SuYaohui 3d772df930 Add comment 2015-03-27 14:43:24 +08:00
minggo 9d428d8e48 Merge pull request #11194 from WenhaiLin/v3-doxygen 
[ci skip]Fixed warnings
 2015-03-27 14:34:26 +08:00
minggo 033a3e09b9 Merge pull request #11191 from fusijie/cocosapi 
[ci skip]update comments.
 2015-03-27 14:33:49 +08:00
tangziwen 68563494ae fix doxygen add to group 2015-03-27 14:10:41 +08:00
CocosRobot 4785e6e383 [AUTO]: updating luabinding automatically 2015-03-27 05:46:01 +00:00
Jacky d9b0c67f65 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into cocosapi 
Conflicts:
	cocos/2d/CCNode.h
 2015-03-27 13:43:38 +08:00
tangziwen a2cce0594b update 2015-03-27 13:43:09 +08:00
minggo 85530648a7 Merge pull request #11180 from andyque/fix-comments 
remove unneeded js & lua NA and remove deprecated list from navtree
 2015-03-27 13:40:54 +08:00
Jacky 4edf9e76fd update comments. 2015-03-27 12:07:19 +08:00
Huabing.Xu 0367d752af Merge branch 'v3' into v3_comments 
Conflicts:
	cocos/renderer/ccShaders.h
 2015-03-27 12:05:15 +08:00
andyque 602093e474 fix extra @ symbol in Base group 2015-03-27 12:01:20 +08:00
Wenhai Lin a47cad0354 [ci skip]Fixed warnings 2015-03-27 11:59:10 +08:00
Huabing.Xu 3d657df9f6 [ci skip]add group base to files in renderer folder 2015-03-27 11:54:40 +08:00
tangziwen 5a76a628d3 add some utility functions 2015-03-27 11:46:02 +08:00
minggo 29c5da8429 Merge pull request #11189 from SuYaoHui/cocosapi 
Add comments
 2015-03-27 11:46:02 +08:00
SuYaohui 17bd26e9d4 Add comments 2015-03-27 11:39:31 +08:00
minggo 8691602b81 Merge pull request #11185 from samuele3hu/v3_5_comment 
[ci skip]Update comments of some header files
 2015-03-27 11:35:11 +08:00
Huabing.Xu 6cb99312ee [ci skip]add group base to files in math folder 2015-03-27 11:34:52 +08:00
andyque 813bcc4017 Merge branch 'v3' into fix-comments 2015-03-27 11:26:46 +08:00
Huabing.Xu b22f92635f [ci skip]fix warning for doxygen 2015-03-27 11:20:50 +08:00
samuele3hu a1b054911c Update comments of some header files 2015-03-27 11:13:28 +08:00
minggo d9680b2c74 Merge pull request #11178 from calfjohn/v3 
[ci skip]fixed doxygen warning for physics and texture2d
 2015-03-27 11:11:28 +08:00
minggo 8b4f662ac0 Merge pull request #11179 from WenhaiLin/v3-doxygen 
[ci skip]Fixed warnings when generating docs by doxygen.
 2015-03-27 11:10:43 +08:00
minggo 2ea8b8272a Merge pull request #11177 from CocosRobot/update_lua_bindings_1427423082 
[AUTO]: updating luabinding automatically
 2015-03-27 11:10:19 +08:00
Huabing.Xu 49bf8d5e13 Merge pull request #11181 from dabingnn/v3_comments 
V3 comments
 2015-03-27 11:09:17 +08:00
minggo 24aef7c6bb Merge pull request #11164 from super626/texturecube 
Texturecube
 2015-03-27 11:06:28 +08:00
Huabing.Xu cbcdef11c3 [ci skip]fix warning for doxygen 2015-03-27 11:05:01 +08:00
Huabing.Xu f18fac48ed [ci skip]fix warning for doxygen 2015-03-27 11:03:21 +08:00
andyque bc2ffe4e19 remove unneeded js & lua NA and remove deprecated list from navtree 2015-03-27 11:02:04 +08:00
Wenhai Lin fdffad3956 [ci skip]Fixed warnings when generating docs by doxygen. 2015-03-27 10:52:59 +08:00
calfjohn 0af4f9f1ed fixed doxygen warning for physics and texture2d 2015-03-27 10:34:01 +08:00
CocosRobot c73602a523 [AUTO]: updating luabinding automatically 2015-03-27 02:26:35 +00:00
zhangbin 58bc56f759 Solve the warning when generating docs by doxygen. 2015-03-27 10:17:33 +08:00
tangziwen 8b376e511c update Terrain 2015-03-27 10:12:24 +08:00
CocosRobot a4e633a299 [AUTO]: updating luabinding automatically 2015-03-26 16:17:35 +00:00
samuele3hu fb085fc2ea Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_5_comment 
Conflicts:
	docs/doxygen_white_book.config
 2015-03-26 22:29:37 +08:00
samuele3hu e0bde0f789 Update comments of some header files 2015-03-26 22:07:44 +08:00
yangxiao 6cd1697240 config wp8 and add comment 2015-03-26 18:10:42 +08:00
minggo f7e11a2467 Merge pull request #11168 from andyque/fix-comments 
fix group error
 2015-03-26 16:10:06 +08:00
andyque 42cd63fe01 fix group error 2015-03-26 15:47:14 +08:00
minggo 590cd9dc52 Merge pull request #11167 from minggo/v3 
[ci skip]fix some documentation
 2015-03-26 15:42:52 +08:00
minggo 1f0ba8cf2b fix some documentation 2015-03-26 15:40:54 +08:00
minggo 4eadd1ce47 Merge pull request #11165 from calfjohn/v3 
[ci skip]Modify group name for physics and Texture2d, Texture2dCache, TextureAtla...
 2015-03-26 15:29:17 +08:00
calfjohn 587931faaa Modify group name for physics and Texture2d, Texture2dCache, TextureAtlas. 2015-03-26 15:20:25 +08:00
yangxiao 7d3154e2e9 add to linux 2015-03-26 14:34:11 +08:00
yangxiao c23746fbcd modify 2015-03-26 13:05:42 +08:00
yangxiao 000e34c6d0 merge cocos 2015-03-26 12:50:18 +08:00
yangxiao 84535feb0c merge cocos 2015-03-26 11:59:26 +08:00
lvlong 6c29385547 animate quality! 2015-03-26 11:33:16 +08:00
lvlong c999307150 add different animate quality. 2015-03-26 11:30:22 +08:00
CocosRobot f43b666929 [AUTO]: updating luabinding automatically 2015-03-26 02:44:28 +00:00
minggo f9589d166d Merge pull request #11161 from samuele3hu/v3_5_comment 
Update comments of some header files
 2015-03-26 10:37:41 +08:00
minggo 52d53fd7ee Merge pull request #11148 from andyque/finish-v3-comments 
Add missing comments for UI modules
 2015-03-26 10:02:42 +08:00
minggo fae951d928 Merge pull request #11150 from samuele3hu/v3_5_test 
[ci skip]Update comments of some header files
 2015-03-26 10:00:11 +08:00
zhukaixy aead9e5855 correct for code indent 2015-03-26 09:53:41 +08:00
XiaoYang 11c021881b Merge pull request #263 from lvlonggame/v3 
fix: obj file load material.
 2015-03-26 09:29:58 +08:00
lvlong f93dffdeb0 node frame animation test and resource 2015-03-26 09:25:37 +08:00
lvlong ecfd66cda3 node frame code!!!!! 2015-03-26 09:12:05 +08:00
andyque 86c3e60254 fix merge issue 2015-03-25 22:16:41 +08:00
samuele3hu 1bea6a52a2 Update comments of some header files 2015-03-25 18:54:33 +08:00
andyque f32b59d565 ignore GUIDefine.h 2015-03-25 18:24:35 +08:00
andyque 248325d055 Add missing comments for UI modules 
Squashed commit of the following:

commit eb23bf8972d1a580db537f3d341091eaeb99d626
Author: andyque <guanghui8827@126.com>
Date:   Wed Mar 25 17:08:07 2015 +0800

    finish all the documents

commit a64ec4196eb1b41771ac2f7b2ba48845d22b6211
Author: andyque <guanghui8827@126.com>
Date:   Wed Mar 25 09:49:33 2015 +0800

    finish scrollview

commit 4ff76623230f19dd25c4de29e2816754524570b2
Author: andyque <guanghui8827@126.com>
Date:   Tue Mar 24 21:40:26 2015 +0800

    add UIScale9Sprite comments

    Conflicts:
    	cocos/ui/UIScale9Sprite.h

commit e82a17b4e3cd07a03d4bfc906b0dc94d1fa08757
Author: andyque <guanghui8827@126.com>
Date:   Tue Mar 24 18:05:02 2015 +0800

    add comments for UIRichText

commit 7cbbcc6883ace0ef60a060f6c5808f4c296af4df
Author: andyque <guanghui8827@126.com>
Date:   Mon Mar 23 22:08:26 2015 +0800

    add comments for UIPageView and UIRelativeBox

commit 6fcf32a40d5407aefcba39e76aea5fb93a1a4e4a
Author: andyque <guanghui8827@126.com>
Date:   Mon Mar 23 21:12:27 2015 +0800

    finish loadingbar comments

commit 58e16b81dee833788018d913aef80e2ddd33d408
Author: andyque <guanghui8827@126.com>
Date:   Mon Mar 23 20:51:30 2015 +0800

    finished UiListView

commit 8278b3f1ee905c34dbd9c461975b1b4491eb7977
Author: andyque <guanghui8827@126.com>
Date:   Mon Mar 23 20:06:10 2015 +0800

    add comments for LayoutManager and LayoutParameter.

commit b2edfa06b83fbb0cdaf2f567c0d6f8d72e6f90c5
Author: andyque <guanghui8827@126.com>
Date:   Mon Mar 23 17:09:17 2015 +0800

    finish comments for UILayoutComponent

commit 730b5bc9c1a18139fbdef331b16c58b928cf999f
Author: andyque <guanghui8827@126.com>
Date:   Fri Mar 20 14:07:58 2015 +0800

    add missing comments

commit cecd97e830492e58dd07a2b1f5d0e87f19144856
Author: andyque <guanghui8827@126.com>
Date:   Fri Mar 20 09:31:51 2015 +0800

    add comments

commit ca0a6033bf61c7fc9caf70719ee5ea651953f580
Author: andyque <guanghui8827@126.com>
Date:   Thu Mar 19 21:02:36 2015 +0800

    add missing docs for UIButton, UILayout, UIIMageview and UIWidget

commit df98454583553e80d2ef4f72cc58de4b433f43c7
Author: andyque <guanghui8827@126.com>
Date:   Thu Mar 19 14:02:05 2015 +0800

    add missing comments for UIHbox and UIHelper

commit 4baf76dd92672b745d3d84e47e5fed8c680b01c7
Author: andyque <guanghui8827@126.com>
Date:   Thu Mar 19 11:28:32 2015 +0800

    add comments for UICheckbox

commit 77c4080b3c70268b6a07cfa12d1e9319c86a2f38
Author: andyque <guanghui8827@126.com>
Date:   Thu Mar 19 00:01:42 2015 +0800

    update coments

commit 4506327ace5b7786ee8b490aab1653462a834418
Author: andyque <guanghui8827@126.com>
Date:   Wed Mar 18 20:32:57 2015 +0800

    add comments for UIEditbox

commit 4937f30adb8912a02ab10353b6cc5fe2eed9d4bf
Author: andyque <guanghui8827@126.com>
Date:   Wed Mar 18 10:51:20 2015 +0800

    add missing comments for UIEditBox

commit 64a48c6b09f4eaf6b84cc8446ef59d382cf8767b
Author: andyque <guanghui8827@126.com>
Date:   Wed Mar 18 10:12:08 2015 +0800

    fix indentation problem

commit b38c921c114bb4a707be0f29dcdf8c46e43a445a
Author: andyque <guanghui8827@126.com>
Date:   Wed Mar 18 10:08:46 2015 +0800

    add missing comments for CCIMEDispatcher

commit 4412cf52429f22351a5c9fbb7c392bca64c2a2c6
Author: andyque <guanghui8827@126.com>
Date:   Wed Mar 18 09:57:52 2015 +0800

    add missing documents for CCIMedelegate

commit 53d3242f2cafde2bebedebe8353c6be625e5ce84
Author: andyque <guanghui8827@126.com>
Date:   Wed Mar 18 09:43:33 2015 +0800

    add missing documentation for CCTilemapatlas

commit 1f6183086b6e21557e5b05bf4cede43d472611a1
Author: andyque <guanghui8827@126.com>
Date:   Wed Mar 18 09:38:59 2015 +0800

    add missing comments for CCTextfieldttf

commit a7fe234153cebc4113cc97064d20dfd3515f9611
Author: andyque <guanghui8827@126.com>
Date:   Tue Mar 17 22:03:31 2015 +0800

    supplement comments for ProtectedNode

commit 3b02d22850b6a9e99e779ca09e5ce0b5bf24d602
Author: andyque <guanghui8827@126.com>
Date:   Tue Mar 17 21:55:03 2015 +0800

    add comments to CCMenuitem.h

commit 58e054c5cd28986e4420c2ae44af7e9a2beab4ce
Author: andyque <guanghui8827@126.com>
Date:   Tue Mar 17 21:36:14 2015 +0800

    add comments to Menu
 2015-03-25 18:17:58 +08:00
yinjimmy 75a7927bad Load all lua module as default 2015-03-25 16:35:11 +08:00
minggo cb07aa4ae2 Merge pull request #11091 from super626/v3 
fix memory leak
 2015-03-25 16:16:28 +08:00
yangxiao c6af12bcd9 use CC_SAFE_DELETE 2015-03-25 14:33:53 +08:00
zhukaixy 54472497a4 fix comments 2015-03-25 13:43:55 +08:00
minggo 518536964f Merge pull request #11142 from CocosRobot/update_lua_bindings_1427255864 
[AUTO]: updating luabinding automatically
 2015-03-25 13:36:49 +08:00
minggo 326233ab02 Merge pull request #11105 from pipu/TextAtlas_parse_avoid_crash 
Avoid crash during parse TextAtlas.
 2015-03-25 13:36:28 +08:00
CocosRobot 1ced296b58 [AUTO]: updating luabinding automatically 2015-03-25 03:59:57 +00:00
minggo 5604c98558 Merge pull request #11122 from chengstory/AvoidTimelineCrash 
Avoid timeline crash when custom widget is placed in scene.
 2015-03-25 11:44:54 +08:00
minggo d67bd549f1 Merge pull request #11135 from fusijie/cocosapi 
[ci skip]add comments.
 2015-03-25 11:10:31 +08:00
minggo 51329ac130 Merge pull request #11136 from WenhaiLin/v3-doxygen 
[ci skip]Update comments.
 2015-03-25 11:10:08 +08:00
WenhaiLin f13065a038 [ci skip]Update comments 2015-03-25 11:07:11 +08:00
WenhaiLin 153d697f1a [ci skip]Update comments. 2015-03-25 10:59:04 +08:00
Jacky 8b57b66f16 add comments. 2015-03-25 10:13:17 +08:00
lvlong 7efd4c2df6 replace setAdditionnalTransform() 2015-03-25 10:04:51 +08:00
minggo 1f4d7c598f Merge pull request #11126 from samuele3hu/v3_5_test 
[ci skip]Update comments of some header files
 2015-03-25 09:53:28 +08:00
minggo bed7746459 Merge pull request #11120 from fusijie/cocosapi 
[ci skip]add comments.
 2015-03-25 09:49:52 +08:00
minggo 671be8e157 Merge pull request #11131 from natural-law/v3 
[ci skip] Update the group of CCClippingRectangleNode.
 2015-03-25 09:48:41 +08:00
zhangbin 2f7397f6b9 Update the group of CCClippingRectangleNode. 2015-03-25 09:46:00 +08:00
Huabing.Xu 63a65b1dd1 [ci skip]update comments CCAffineTransform.h 2015-03-24 23:29:41 +08:00
Huabing.Xu d06d575e6e Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_comments 2015-03-24 23:01:18 +08:00
samuele3hu f3890d3bb3 Update comments of some header files 2015-03-24 21:52:56 +08:00
samuele3hu 020b3ba5cb Update comments of some header files 2015-03-24 21:46:18 +08:00
Huabing.Xu 133955dba1 [ci skip]update comments CCGrid.h CCGrabber.h CCGLBufferNode.h 2015-03-24 21:34:20 +08:00
Huabing.Xu b84c1f2c2c [ci skip]update comments CCGeometry.h 2015-03-24 21:33:55 +08:00
Huabing.Xu e6d1dcef58 Merge pull request #11123 from WenhaiLin/v3-doxygen 
V3 doxygen
 2015-03-24 20:33:17 +08:00
WenhaiLin 89f9ae044d [ci skip]Update comments 2015-03-24 20:29:13 +08:00
WenhaiLin 9dd778edb0 [ci skip]Update comments 2015-03-24 20:23:51 +08:00
zhangcheng e2e0ed0595 Avoid timeline crash when custom widget is placed in scene. 2015-03-24 19:59:27 +08:00
Huabing.Xu 9923a0b575 [ci skip]update comments Mat4.h, MathUtil.h, Quaternion.h 2015-03-24 19:27:13 +08:00
Jacky 32f37b8701 [ci skip]add comments. 2015-03-24 18:22:52 +08:00
lvlong 5ce4fbe6df merge node transform problem！！！ 2015-03-24 17:59:24 +08:00
minggo 9e9d263a17 Merge pull request #11114 from VisualSJ/v3-docs 
[ci skip] Add javascript notes...
 2015-03-24 17:40:40 +08:00