Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos/2d
History
Ricardo Quesada 9b118e5e96 Squashed commit of the following: 
commit 519fcd7f68e3586c376fd5e8d4a0ee220a48d225
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 10:10:06 2014 -0700

    Updates templates files

commit 2b07843ebe592f56b2abc544ccf66d441bb19fc5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 10:08:19 2014 -0700

    compiles on Windows

commit b175522ef7205eaab3bd3f26c27c5d6514cbe2a4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:55:30 2014 -0700

    adds cocos2d.h

commit 4c3d14f929bac017b93ca843b4f149d352264a30
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:54:24 2014 -0700

    re-adds missing files

commit f729181728959260d14c4152555534f5beec8e05
Merge: 148da79 2adac67
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:51:12 2014 -0700

    Merge branch 'includes_fixes' of github.com:ricardoquesada/cocos2d-x into includes_fixes

commit 148da79010c5dffeab885933624cffaf3d588852
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:49:12 2014 -0700

    Adds SimpleAudioEngine

commit 2adac67019180ec82b7bd03f0b67c12f62e29e77
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:47:45 2014 -0700

    Compiles for Android

commit 4a300d1b9225fa5708f25a69a50bb531f0ac1a32
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:13:35 2014 -0700

    Fixes the includes
 		2014-04-26 10:11:22 -07:00
..
platform Squashed commit of the following: 2014-04-26 10:11:22 -07:00
renderer Squashed commit of the following: 2014-04-26 10:11:22 -07:00
Android.mk Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCAction.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCAction.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCActionCamera.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCActionCamera.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCActionCatmullRom.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCActionCatmullRom.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCActionEase.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCActionEase.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCActionGrid.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCActionGrid.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCActionGrid3D.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCActionGrid3D.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCActionInstant.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCActionInstant.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCActionInterval.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCActionInterval.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCActionManager.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCActionManager.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCActionPageTurn3D.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCActionPageTurn3D.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCActionProgressTimer.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCActionProgressTimer.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCActionTiledGrid.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCActionTiledGrid.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCActionTween.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCActionTween.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCAnimation.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCAnimation.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCAnimationCache.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCAnimationCache.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCAtlasNode.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCAtlasNode.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCClippingNode.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCClippingNode.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCComponent.cpp remove isRenderer. 2014-03-26 17:02:37 +08:00
CCComponent.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCComponentContainer.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCComponentContainer.h
…
CCConfiguration.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCConfiguration.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCDirector.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCDirector.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCDrawNode.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCDrawNode.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCDrawingPrimitives.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCDrawingPrimitives.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCEvent.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCEvent.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCEventAcceleration.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCEventAcceleration.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCEventCustom.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCEventCustom.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCEventDispatcher.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCEventDispatcher.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCEventKeyboard.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCEventKeyboard.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCEventListener.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCEventListener.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCEventListenerAcceleration.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCEventListenerAcceleration.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCEventListenerCustom.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCEventListenerCustom.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCEventListenerKeyboard.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCEventListenerKeyboard.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCEventListenerMouse.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCEventListenerMouse.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCEventListenerTouch.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCEventListenerTouch.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCEventMouse.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCEventMouse.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCEventTouch.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCEventTouch.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCEventType.h
…
CCFont.cpp
…
CCFont.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCFontAtlas.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCFontAtlas.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCFontAtlasCache.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCFontAtlasCache.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCFontCharMap.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCFontCharMap.h
…
CCFontFNT.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCFontFNT.h replace Point with Vector2 2014-04-15 18:08:29 +08:00
CCFontFreeType.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCFontFreeType.h closed #4561:Fixed read file more than once for label created by different font size. 2014-03-27 17:04:05 +08:00
CCGLBufferedNode.cpp
…
CCGLBufferedNode.h
…
CCGLProgram.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCGLProgram.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCGrabber.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCGrabber.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCGrid.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCGrid.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCIMEDelegate.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCIMEDispatcher.cpp fix cocos2dx engine internal warnings 2014-03-20 10:58:04 +08:00
CCIMEDispatcher.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCLabel.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCLabel.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCLabelAtlas.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCLabelAtlas.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCLabelBMFont.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCLabelBMFont.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCLabelTTF.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCLabelTTF.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCLabelTextFormatter.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCLabelTextFormatter.h
…
CCLayer.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCLayer.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCMenu.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCMenu.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCMenuItem.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCMenuItem.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCMotionStreak.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCMotionStreak.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCNode.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCNode.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCNodeGrid.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCNodeGrid.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCParallaxNode.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCParallaxNode.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCParticleBatchNode.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCParticleBatchNode.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCParticleExamples.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCParticleExamples.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCParticleSystem.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCParticleSystem.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCParticleSystemQuad.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCParticleSystemQuad.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCProfiling.cpp issue #4401. resolve conflicts 2014-03-26 14:54:50 +08:00
CCProfiling.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCProgressTimer.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCProgressTimer.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCProtocols.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCRenderTexture.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCRenderTexture.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCScene.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCScene.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCScheduler.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCScheduler.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCScriptSupport.cpp issue #4401. resolve conflicts 2014-03-26 14:54:50 +08:00
CCScriptSupport.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCShaderCache.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCShaderCache.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCSprite.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCSprite.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCSpriteBatchNode.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCSpriteBatchNode.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCSpriteFrame.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCSpriteFrame.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCSpriteFrameCache.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCSpriteFrameCache.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCTMXLayer.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCTMXLayer.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCTMXObjectGroup.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCTMXObjectGroup.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCTMXTiledMap.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCTMXTiledMap.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCTMXXMLParser.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCTMXXMLParser.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCTextFieldTTF.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCTextFieldTTF.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCTexture2D.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCTexture2D.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCTextureAtlas.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCTextureAtlas.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCTextureCache.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCTextureCache.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCTileMapAtlas.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCTileMapAtlas.h replace Point with Vector2 2014-04-15 18:08:29 +08:00
CCTouch.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCTouch.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCTransition.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCTransition.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCTransitionPageTurn.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCTransitionPageTurn.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCTransitionProgress.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCTransitionProgress.h
…
CCTweenFunction.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCTweenFunction.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCUserDefault.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCUserDefault.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCUserDefault.mm
…
CCUserDefaultAndroid.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCVertex.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCVertex.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CMakeLists.txt work on linux now 2014-04-25 15:10:37 +08:00
TGAlib.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
TGAlib.h
…
TransformUtils.cpp
…
TransformUtils.h
…
ZipUtils.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
ZipUtils.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
base64.cpp
…
base64.h
…
ccCArray.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
ccCArray.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
ccConfig.h replace Point with Vector2 2014-04-15 18:08:29 +08:00
ccFPSImages.c.REMOVED.git-id
…
ccFPSImages.h
…
ccGLStateCache.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
ccGLStateCache.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
ccMacros.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
ccShader_Label_frag_df.h Label:Refactoring related functions of color. 2014-03-20 20:56:10 +08:00
ccShader_Label_frag_df_glow.h Label:Refactoring related functions of color. 2014-03-20 20:56:10 +08:00
ccShader_Label_frag_normal.h Label:Refactoring related functions of color. 2014-03-20 20:56:10 +08:00
ccShader_Label_frag_outline.h Label:Refactoring related functions of color. 2014-03-20 20:56:10 +08:00
ccShader_Label_vert.h
…
ccShader_PositionColorLengthTexture_frag.h
…
ccShader_PositionColorLengthTexture_vert.h
…
ccShader_PositionColor_frag.h
…
ccShader_PositionColor_vert.h
…
ccShader_PositionTextureA8Color_frag.h
…
ccShader_PositionTextureA8Color_vert.h
…
ccShader_PositionTextureColorAlphaTest_frag.h
…
ccShader_PositionTextureColor_frag.h
…
ccShader_PositionTextureColor_noMVP_frag.h
…
ccShader_PositionTextureColor_noMVP_vert.h
…
ccShader_PositionTextureColor_vert.h
…
ccShader_PositionTexture_frag.h
…
ccShader_PositionTexture_uColor_frag.h
…
ccShader_PositionTexture_uColor_vert.h
…
ccShader_PositionTexture_vert.h
…
ccShader_Position_uColor_frag.h
…
ccShader_Position_uColor_vert.h
…
ccShaders.cpp closed #4635: ControlSwitch's marksprite is shown at a wrong place 2014-04-02 11:26:39 +08:00
ccShaders.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
ccTypes.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
ccTypes.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
ccUTF8.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
ccUTF8.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
ccUtils.cpp
…
ccUtils.h
…
cocos2d.vcxproj Squashed commit of the following: 2014-04-26 10:11:22 -07:00
cocos2d.vcxproj.filters Squashed commit of the following: 2014-04-26 10:11:22 -07:00
cocos2d_headers.props [win32] Fix typo in cocos2d_(winrt_|wp8_)headers.props, gui -> ui 2014-04-10 21:14:24 +08:00
cocos2d_winrt.props added winrt and wp8 project files and property sheets 2014-03-28 16:02:23 -07:00
cocos2d_winrt.vcxproj added missing files 2014-04-19 10:11:44 -07:00
cocos2d_winrt.vcxproj.filters added missing files 2014-04-19 10:11:44 -07:00
cocos2d_winrt_headers.props added missing include paths 2014-04-19 10:12:06 -07:00
cocos2d_wp8.vcxproj input event refactor. console enabled for wp8 2014-04-19 10:12:34 -07:00
cocos2d_wp8.vcxproj.filters input event refactor. console enabled for wp8 2014-04-19 10:12:34 -07:00
cocos2d_wp8_headers.props updated property sheet include paths and warnings 2014-04-19 10:09:10 -07:00
cocos2dx-Prefix.pch
…
cocos2dx.props
…
firePngData.h
…
uthash.h
…
utlist.h
…