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

155 Commits

Author SHA1 Message Date
Rolando Abarca bee9099102 updates CCMenuItem and CCAnimation 2012-08-27 08:43:39 -07:00
Rolando Abarca 4ce9cc9810 adds typeinfo and fixes overloaded funcs 2012-08-27 08:43:38 -07:00
Rolando Abarca a114502929 removes OBJECT_TYPE thing 2012-08-27 08:43:38 -07:00
Rolando Abarca 4e640ecb35 uses new ADD_OBJECT_TYPE macro 2012-08-27 08:43:37 -07:00
Rolando Abarca e757d55a29 updates cocos2d-x API to support getObjectType() 2012-08-27 05:45:11 -07:00
minggo 56ce6869d6 Merge pull request #1227 from donaldalanmorrison/gles20 
Gles20
 2012-08-23 18:32:39 -07:00
minggo 2a9d29ba21 fixed #1440:convert offert point to pixel 2012-08-22 14:29:23 +08:00
Donald Alan Morrison c75f73aa41 Silenced Static Analyzer Warning by removing unneeded assignment. (Value never read.) 2012-08-20 14:33:34 -07:00
Walzer a77a4eac03 add more details in doxygen comments. 2012-08-10 13:58:34 +08:00
Walzer cc3d850892 fixed #1416, add object orientated APIs for CCGeometry, replace "CCFloat" with "float" 2012-08-01 15:30:12 +08:00
Walzer 685b70e6fb fixed #1402, résolve conflicting "create" functions 
1. Following https://docs.google.com/document/d/1eqvYjVah0R9nkjzJ_ga1-_cyjHnizVQ5dyESYNpYM0s/edit?pli=1
2. use CCSequence/CCSpawn::initWithTwoActions, createWithTwoActions instead of initOneTwo, create(one, two).
3. haven't re-generate lua-binding to resolve the conflicts yet.
 2012-07-23 22:49:11 +08:00
James Chen bde351dda7 fixed a bug in CCSpriteFrame::getTexture. 
if( m_strTextureFilename.length() <= 0 ) // logic error, must be > 0
    {
        return CCTextureCache::sharedTextureCache()->addImage(m_strTextureFilename.c_str());
    }
 2012-06-27 15:04:42 +08:00
James Chen a901b0bb12 fixed #1367: Refactor "createWith***" to "create". 2012-06-27 14:21:29 +08:00
Walzer 9eab0c19f8 add groups to all classes for doxygen 2012-06-20 18:09:11 +08:00
James Chen 24e3ec7499 fixed #1336: Updated comment information for deprecated apis. 2012-06-20 14:31:36 +08:00
James Chen b818c0afa6 fixed #1336: Used CC_DEPRECATED_ATTRIBUTE macro to mark deprecated interfaces. 2012-06-20 11:48:31 +08:00
minggo 90448ec7d0 issue #1269:fix some compiling error because of including error header files 2012-06-19 16:20:46 +08:00
minggo 9ec29d715a issue #1269:make tests HelloWorld HelloLua and testjs refer subproject cocos2dx 2012-06-19 13:50:11 +08:00
James Chen 595a402c83 fixed #1292:make some function names more readable. 2012-06-15 16:47:30 +08:00
minggo d0f905992a issue #1292:make some function names more readable 2012-06-15 15:10:40 +08:00
James Chen 3a410c14a1 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1324_create 
Conflicts:
	cocos2dx/extensions/CCBReader/CCBReader_v2.cpp
	cocos2dx/extensions/CCControlExtension/CCScale9Sprite.cpp
	cocos2dx/label_nodes/CCLabelBMFont.cpp
	cocos2dx/menu_nodes/CCMenuItem.cpp
	cocos2dx/menu_nodes/CCMenuItem.h
	cocos2dx/misc_nodes/CCRenderTexture.h
	cocos2dx/tileMap_parallax_nodes/CCTileMapAtlas.cpp
	tests/tests/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder.cpp
	tests/tests/LabelTest/LabelTest.cpp
 2012-06-14 17:36:31 +08:00
James Chen 7fe3f7357e issue #1324: Reverted old interfaces. 2012-06-14 17:18:05 +08:00
James Chen 23574172ff issue #1324: Added create() for static member functions that new an autorelease object, updated cocoa folder. 2012-06-14 16:05:58 +08:00
James Chen 3f7b44fc23 issue #1324: Added create() for static member functions that new an autorelease object 2012-06-14 15:13:16 +08:00
Nicolas Gramlich 5550d9f2b0 Merge with gles20. 2012-06-13 15:56:52 -07:00
James Chen b770010c41 issue #1310: Updated LabelTest. Added init method for CCLabelBMFont. Fixed a bug in CCLabelAtlas::initWithString. 
In CCSpriteBatchNode::initWithTexture, when capacity is equal to 0, set it to default value.
 2012-06-12 14:33:53 +08:00
Nicolas Gramlich e52d5ae223 CCSpriteFrameCache: Minor optimization. 2012-06-11 18:31:36 -07:00
Nicolas Gramlich 4378731418 Merge with gles20. 2012-06-11 10:43:07 -07:00
James Chen c9dc60b0f7 issue #1310: fixed a bug in CCSpriteFrameCache.cpp. Disable retina mode for tests project. 2012-06-08 17:58:21 +08:00
James Chen 76a560a474 issue #1310: Made CCFileUtils as a singleton. 2012-06-08 16:22:57 +08:00
James Chen c5cf23c859 issue #1310: First commit since sync to rc2. 2012-06-08 14:11:48 +08:00
Nicolas Gramlich 67d9b8ea25 Minor changes. 2012-06-01 15:11:42 -07:00
Nicolas Gramlich 827ee160b5 Added support for initializing a CCLabelBMFont without a fntfile and a string. (See: ffbdb60a5908f5baef227bb0365a0b2653a3a59a, a6749b38f8085ba81921063328bc50cb7a989613, e6e3917c0c3f2e95e13c3be29584cb9e3781d3a7). 2012-05-30 15:31:08 -07:00
Nicolas Gramlich 15ef23bac8 Removed assert which prevented CCSpriteBatchNode from being used as a root node. (Discussed this with Ricardo Quesada) 2012-05-21 17:38:24 -07:00
James Chen edfb8c1f9c issue #1190: used std::string as key of CCDictionary. Updated CCString.pkg, CCArray.pkg, CCDictionary.pkg. 2012-04-26 11:39:49 +08:00
James Chen 0f36a89c7e issue #1188: Refactor directory. Compile successfully on android and win32(vs2008 debug). 2012-04-25 16:18:04 +08:00
minggo f3d97bd9b6 fixed #1180: synchronize CCConfiguration 2012-04-20 11:39:12 +08:00
James Chen 230b8a386b issue #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' 
with four spaces. Also,
1. Used macro NS_CC_BEGIN instead of namespace cocos2d {, NS_CC_END instead
of }.
2. Removed some unused files.
3. Renamed the name of some folders, for example,
"test.android"-->"proj.android" .
 2012-04-19 14:35:52 +08:00
James Chen 7d7baf81a2 refactor updated... 2012-04-18 18:43:45 +08:00
James Chen a71e5be0d8 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20_optimize_data 
Conflicts:
	cocos2dx/shaders/CCGLProgram.cpp
 2012-04-16 12:45:47 +08:00
James Chen 88951bfeec fixed #1165: Close retinaDisplay for HelloWorld by default. Removed ENABLE_ALL_SHADER macro. Fixed some issues in CCSprite.cpp. 2012-04-16 12:00:35 +08:00
Phenix Yu e623cd6357 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 
Conflicts:
	cocos2dx/include/CCTexture2D.h
	cocos2dx/include/ccMacros.h
	cocos2dx/textures/CCTexture2D.cpp
	lua/cocos2dx_support/LuaCocos2d.cpp
 2012-04-15 15:46:01 +08:00
James Chen d01f1277af optimize data struct. 2012-04-14 19:11:57 +08:00
Phenix Yu 247bf08d98 fixed content size issue for retina 2012-04-11 19:27:34 +08:00
James Chen df58a09255 Update: 
1. init CCSprite::m_pobBatchNode at the beginning of CCSprite::initWithTexture.
2. Add CCAssert in ccArrayRemoveObjectAtIndex.
3. Use new method to allocate CCDirector.
 2012-04-05 18:53:53 +08:00
James Chen d7aed75942 issue #1056: Removed CCNode::arrayMakeObjectsPerformSelector, instead, we defined two macros (arrayMakeObjectsPerformSelector and arrayMakeObjectsPerformSelectorWithObject) to fit for any classes that inherit from CCNode. 2012-03-29 14:30:13 +08:00
James Chen 56d5c496e9 issue #1056: Refactored two macros -- ccArrayMakeObjectsPerformSelector , ccArrayMakeObjectsPerformSelectorWithObject. 2012-03-29 11:25:08 +08:00
James Chen 7d04254855 issue #1056: Updated some files. 2012-03-26 22:37:09 +08:00
James Chen 0f5efaffd2 issue #1056: Check bugs of SpriteTest. 2012-03-26 18:44:28 +08:00
James Chen 9c9230a43f #issue #1056: Updated SpriteTest. 2012-03-23 17:31:28 +08:00