Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'issue_418' of https://github.com/minggo/cocos2d-x into minggo-issue_418

This commit is contained in:
walzer 2011-03-19 14:20:30 +08:00
parent abd2725ed4 22b55eaf78
commit adfad22b2e
58 changed files with 812 additions and 746 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CocosDenshion/include/SimpleAudioEngine.h
View File

@ -1,5 +1,6 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2010 Steve Oldmeadow
http://www.cocos2d-x.org

3
cocos2dx/include/CCAction.h
View File

@ -1,5 +1,6 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2008-2010 Ricardo Quesada
http://www.cocos2d-x.org

3
cocos2dx/include/CCActionCamera.h
View File

@ -1,5 +1,6 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2008-2010 Ricardo Quesada
http://www.cocos2d-x.org

3
cocos2dx/include/CCActionEase.h
View File

@ -1,5 +1,6 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2008-2009 Jason Booth
http://www.cocos2d-x.org

3
cocos2dx/include/CCActionGrid.h
View File

@ -1,5 +1,6 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2009 On-Core
http://www.cocos2d-x.org

3
cocos2dx/include/CCActionGrid3D.h
View File

@ -1,5 +1,6 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2009 On-Core
http://www.cocos2d-x.org

3
cocos2dx/include/CCActionInstant.h
View File

@ -1,5 +1,6 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2008-2010 Ricardo Quesada
http://www.cocos2d-x.org

3
cocos2dx/include/CCActionInterval.h
View File

@ -1,5 +1,6 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2008-2010 Ricardo Quesada
http://www.cocos2d-x.org

4
cocos2dx/include/CCActionManager.h
View File

@ -1,5 +1,7 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2008-2010 Ricardo Quesada
Copyright (c) 2009 Valentin Milea
http://www.cocos2d-x.org

3
cocos2dx/include/CCActionPageTurn3D.h
View File

@ -1,5 +1,6 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2009 Sindesso Pty Ltd http://www.sindesso.com/
http://www.cocos2d-x.org

3
cocos2dx/include/CCActionProgressTimer.h
View File

@ -1,5 +1,6 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (C) 2010 Lam Pham
http://www.cocos2d-x.org

3
cocos2dx/include/CCActionTiledGrid.h
View File

@ -1,5 +1,6 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2009 On-Core
http://www.cocos2d-x.org

3
cocos2dx/include/CCAnimation.h
View File

@ -1,5 +1,6 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2008-2010 Ricardo Quesada
http://www.cocos2d-x.org

3
cocos2dx/include/CCAnimationCache.h
View File

@ -1,5 +1,6 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2010 Ricardo Quesada
http://www.cocos2d-x.org

3
cocos2dx/include/CCAtlasNode.h
View File

@ -1,5 +1,6 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2008-2010 Ricardo Quesada
http://www.cocos2d-x.org

3
cocos2dx/include/CCCamera.h
View File

@ -1,5 +1,6 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2008-2010 Ricardo Quesada
http://www.cocos2d-x.org

3
cocos2dx/include/CCDirector.h
View File

@ -1,5 +1,6 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2008-2010 Ricardo Quesada
http://www.cocos2d-x.org

3
cocos2dx/include/CCDrawingPrimitives.h
View File

@ -1,5 +1,6 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2008-2010 Ricardo Quesada
http://www.cocos2d-x.org

3
cocos2dx/include/CCFileUtils.h
View File

@ -1,5 +1,6 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2008-2010 Ricardo Quesada
http://www.cocos2d-x.org

3
cocos2dx/include/CCGL.h
View File

@ -1,5 +1,6 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2010 Ricardo Quesada
http://www.cocos2d-x.org

3
cocos2dx/include/CCLabelAtlas.h
View File

@ -1,5 +1,6 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2008-2010 Ricardo Quesada
http://www.cocos2d-x.org

3
cocos2dx/include/CCLabelBMFont.h
View File

@ -1,5 +1,6 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2008-2010 Ricardo Quesada
http://www.cocos2d-x.org

3
cocos2dx/include/CCLabelTTF.h
View File

@ -1,5 +1,6 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2008-2010 Ricardo Quesada
http://www.cocos2d-x.org

3
cocos2dx/include/CCLayer.h
View File

@ -1,5 +1,6 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2008-2010 Ricardo Quesada
http://www.cocos2d-x.org

3
cocos2dx/include/CCMenu.h
View File

@ -1,5 +1,6 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2008-2010 Ricardo Quesada
http://www.cocos2d-x.org

3
cocos2dx/include/CCMenuItem.h
View File

@ -1,5 +1,6 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2008-2010 Ricardo Quesada
http://www.cocos2d-x.org

3
cocos2dx/include/CCMotionStreak.h
View File

@ -1,5 +1,6 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2008, 2009 Jason Booth
http://www.cocos2d-x.org

4
cocos2dx/include/CCNode.h
View File

@ -1,5 +1,7 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2008-2010 Ricardo Quesada
Copyright (c) 2009 Valentin Milea
http://www.cocos2d-x.org

3
cocos2dx/include/CCParallaxNode.h
View File

@ -1,5 +1,6 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2009-2010 Ricardo Quesada
http://www.cocos2d-x.org

4
cocos2dx/include/CCPointExtension.h
View File

@ -1,5 +1,7 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2007 Scott Lembcke
Copyright (c) 2010 Lam Pham
http://www.cocos2d-x.org

3
cocos2dx/include/CCProgressTimer.h
View File

@ -1,5 +1,6 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2010 Lam Pham
http://www.cocos2d-x.org

3
cocos2dx/include/CCProtocols.h
View File

@ -1,5 +1,6 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2008-2010 Ricardo Quesada
http://www.cocos2d-x.org

3
cocos2dx/include/CCRenderTexture.h
View File

@ -1,5 +1,6 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2009 Jason Booth
http://www.cocos2d-x.org

3
cocos2dx/include/CCRibbon.h
View File

@ -1,5 +1,6 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2008, 2009 Jason Booth
http://www.cocos2d-x.org

3
cocos2dx/include/CCScene.h
View File

@ -1,5 +1,6 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2008-2010 Ricardo Quesada
http://www.cocos2d-x.org

3
cocos2dx/include/CCScheduler.h
View File

@ -1,5 +1,6 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2008-2010 Ricardo Quesada
http://www.cocos2d-x.org

3
cocos2dx/include/CCSprite.h
View File

@ -1,5 +1,6 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2008-2010 Ricardo Quesada
http://www.cocos2d-x.org

4
cocos2dx/include/CCSpriteBatchNode.h
View File

@ -1,5 +1,7 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2009-2010 Ricardo Quesada
Copyright (C) 2009 Matt Oswald
http://www.cocos2d-x.org

3
cocos2dx/include/CCSpriteFrame.h
View File

@ -1,5 +1,6 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2008-2010 Ricardo Quesada
http://www.cocos2d-x.org

5
cocos2dx/include/CCSpriteFrameCache.h
View File

@ -1,5 +1,8 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2008-2010 Ricardo Quesada
Copyright (c) 2009 Jason Booth
Copyright (c) 2009 Robert J Payne
http://www.cocos2d-x.org

4
cocos2dx/include/CCSpriteSheet.h
View File

@ -1,5 +1,7 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2009-2010 Ricardo Quesada
Copyright (C) 2009 Matt Oswald
http://www.cocos2d-x.org

3
cocos2dx/include/CCTMXLayer.h
View File

@ -1,5 +1,6 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2009-2010 Ricardo Quesada
http://www.cocos2d-x.org

4
cocos2dx/include/CCTMXObjectGroup.h
View File

@ -1,5 +1,7 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2010 Ricardo Quesada
Copyright (c) 2010 Neophit
http://www.cocos2d-x.org

3
cocos2dx/include/CCTMXTiledMap.h
View File

@ -1,5 +1,6 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2009-2010 Ricardo Quesada
http://www.cocos2d-x.org

3
cocos2dx/include/CCTMXXMLParser.h
View File

@ -1,5 +1,6 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2009-2010 Ricardo Quesada
http://www.cocos2d-x.org

3
cocos2dx/include/CCTexture2D.h
View File

@ -1,5 +1,6 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (C) 2008 Apple Inc. All Rights Reserved.
http://www.cocos2d-x.org

3
cocos2dx/include/CCTextureAtlas.h
View File

@ -1,5 +1,6 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2008-2010 Ricardo Quesada
http://www.cocos2d-x.org

3
cocos2dx/include/CCTextureCache.h
View File

@ -1,5 +1,6 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2008-2010 Ricardo Quesada
http://www.cocos2d-x.org

3
cocos2dx/include/CCTileMapAtlas.h
View File

@ -1,5 +1,6 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2008-2010 Ricardo Quesada
http://www.cocos2d-x.org

3
cocos2dx/include/CCTouchDelegateProtocol.h
View File

@ -1,5 +1,6 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2009 Valentin Milea
http://www.cocos2d-x.org

3
cocos2dx/include/CCTouchDispatcher.h
View File

@ -1,5 +1,6 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2009 Valentin Milea
http://www.cocos2d-x.org

3
cocos2dx/include/CCTransition.h
View File

@ -1,5 +1,6 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2008-2010 Ricardo Quesada
http://www.cocos2d-x.org

3
cocos2dx/include/CCTransitionPageTurn.h
View File

@ -1,5 +1,6 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2009 Sindesso Pty Ltd http://www.sindesso.com/
http://www.cocos2d-x.org

3
cocos2dx/include/CCTransitionRadial.h
View File

@ -1,5 +1,6 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2009 Lam Pham
http://www.cocos2d-x.org

3
cocos2dx/include/ccConfig.h
View File

@ -1,5 +1,6 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2008-2010 Ricardo Quesada
http://www.cocos2d-x.org

3
cocos2dx/include/ccMacros.h
View File

@ -1,5 +1,6 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2008-2010 Ricardo Quesada
http://www.cocos2d-x.org

3
cocos2dx/include/ccTypes.h
View File

@ -1,5 +1,6 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2008-2010 Ricardo Quesada
http://www.cocos2d-x.org

3
cocos2dx/include/cocos2d.h
View File

@ -1,5 +1,6 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2008-2010 Ricardo Quesada
http://www.cocos2d-x.org