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

2371 Commits

Author SHA1 Message Date
Nicolas Gramlich 8e67d3e2d6 Enhanced CCString with two 'constructors' and a compare function. 2012-06-13 23:56:21 -07:00
minggo e3a84c70e9 Merge pull request #1020 from minggo/iss1257_CCGrabber 
fixed #1257: make CCGrabber the same logic with iphone version
 2012-06-13 23:42:37 -07:00
minggo f742de1de3 fixed #1257: make CCGrabber the same logic with iphone version 2012-06-14 14:41:02 +08:00
minggo b3fb5e6d4c fixed #1293:rename getFrames to getTotalFrames and return correct value 2012-06-14 10:49:53 +08:00
Nicolas Gramlich 0c4a6be8ff Added missiong cpp files in Android.mk. Android build now successful. 2012-06-13 16:05:31 -07:00
Nicolas Gramlich d4a19f4296 CCNodeLoader.h: Added parameter names. 2012-06-13 15:57:59 -07:00
Nicolas Gramlich 67ab3a1bcc CCSpriteLoader: Fixed a bug calling the wrong superclass method. 2012-06-13 15:57:33 -07:00
Nicolas Gramlich 5550d9f2b0 Merge with gles20. 2012-06-13 15:56:52 -07:00
Nicolas Gramlich 3e61e1f014 Updated Android build files to new CCBReader. Fixed a bunch of compiler errors/warnings when building for Android. 2012-06-13 15:25:59 -07:00
Nicolas Gramlich de95e2c1ed Applied changes/fixes brough up by minggo. 2012-06-13 14:33:39 -07:00
Nicolas Gramlich e2a1a246a0 Converted removed all Carriage Returns (dos line-endings, ^M.) in cocos2dx, except in the windows project/platform files. 2012-06-13 14:26:28 -07:00
Nicolas Gramlich 29b22adccc Batch converted manual 'using namespace cocos2d(::extension);' to USING_NS_CC(_EXT);. CocosBuilderExample: Made HelloCococsBuilderLayer selectors work. Made ButtonTestLayer work. 2012-06-13 14:19:13 -07:00
minggo 9321a8d025 fixed #1322: vertical alignment works ok on android 2012-06-13 18:33:44 +08:00
minggo 15ad463fbe issue #1322: vertical alignment ok on iOS 2012-06-13 16:20:58 +08:00
minggo 2460a9f41e Merge pull request #1016 from minggo/gles20 
issue #1310: modify some format
 2012-06-12 20:24:34 -07:00
minggo ec4a21eaf4 issue #1310: modify some format 2012-06-13 11:23:43 +08:00
minggo 2f17e131e6 Merge pull request #979 from icewind/gles20 
Override setOpacity to affect a background sprites
 2012-06-12 19:49:40 -07:00
Nicolas Gramlich 895604f42e Unified Header Guards. Added CCNodeLoaderListener, simulating the didLoadFromCCB selector. 2012-06-12 11:59:49 -07:00
Nicolas Gramlich 26d470f411 CCLabelTTFLoader: Now applying vertical alignment. 2012-06-12 11:30:36 -07:00
James Chen 08fc714a7f issue #1310: Reverted floatr to CCTimer. 2012-06-12 17:07:54 +08:00
James Chen 94a389ad06 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-06-12 14:34:17 +08: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
minggo 916b276607 issue #1310: synchronize CCTexturePVR 2012-06-12 12:02:15 +08:00
minggo 36455a90e1 Merge pull request #998 from minggo/gles20 
set font size when changed
 2012-06-11 18:44:20 -07:00
minggo 9c58f13abb set font size when changed 2012-06-12 09:43:27 +08:00
Nicolas Gramlich e52d5ae223 CCSpriteFrameCache: Minor optimization. 2012-06-11 18:31:36 -07:00
Nicolas Gramlich 1f2652a8d7 Made CCBIReaderTest finally work completely. =) Also added support for having a root path when loading a ccb-file (i.e. when you have the two directories, one for the ccb files, one for the spritesheets. <- With a common ancestor.) 2012-06-11 18:31:11 -07:00
Nicolas Gramlich 58b53be708 Merge with gles20. 2012-06-11 11:50:32 -07:00
Nicolas Gramlich 9c52fce5d2 Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 2012-06-11 10:43:27 -07:00
Nicolas Gramlich 4378731418 Merge with gles20. 2012-06-11 10:43:07 -07:00
James Chen be362bef9b issue #1310: Some typo fixes. Updated CCTexture2D.h/.cpp. 2012-06-11 21:58:04 +08:00
James Chen 62f87c18a2 issue #1310: Exported CCCatmullRomTo class and ccCardinalSplineAt function. 2012-06-11 20:02:40 +08:00
minggo ccbfd24c21 issue #1310: synchronize ActionManagerTest ActionEaseTest ActionsProgressTest ActionsTest 2012-06-11 18:25:57 +08:00
James Chen b61ad6cdba Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-06-11 14:45:09 +08:00
James Chen 2ce7c86c50 fixed #1315: TileMapTest can't be shown correctly in retina mode. 2012-06-11 14:44:32 +08:00
minggo 55ee220245 Merge pull request #993 from minggo/gles20 
issue #1310: synchronize CCLabelTTF
 2012-06-10 23:37:31 -07:00
minggo b4899ae46d issue #1310: synchronize CCLabelTTF 2012-06-11 14:36:25 +08:00
James Chen bd535c3c1c issue #1310: Fixed a bug that 3d effect can't be displayed correctly in retina mode. 2012-06-11 11:53:17 +08:00
James Chen 33ea7905a5 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 
Conflicts:
	cocos2dx/platform/ios/CCFileUtils.mm
 2012-06-11 11:01:36 +08:00
James Chen c95cbb1774 issue #1310: Used CCLabelAtlas instead of CCLabelBMFont to display FPS,SPF status. 
Updated CCFileUtils, added some method, such as sharedFileUtils/purgeFileUtils/purgeCachedEntries.
Fixed a bug in CCDirector, made retina mode work correctly.
 2012-06-11 10:59:57 +08:00
minggo 94235d3602 issue #1310: make tests and HelloWorld work ok 2012-06-11 10:41:52 +08:00
minggo c8c696a2df Merge pull request #989 from NatWeiss/gles20 
Fixed a few release-mode Xcode warnings about unused parameters.
 2012-06-09 03:13:22 -07:00
Nat Weiss 70fa2ec3cb Fixed a few release-mode Xcode warnings about unused parameters. 2012-06-08 13:52:40 -07:00
Nicolas Gramlich 1e9656854b Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 2012-06-08 10:22:25 -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 371b3f9938 issue #1310: Tests project updated!. 2012-06-08 17:34:15 +08:00
James Chen a40dfa427a Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-06-08 17:15:32 +08:00
James Chen 9ff7dcd96d issue #1310: Removed some functions. 2012-06-08 17:15:00 +08:00
minggo 913707f259 Merge pull request #983 from NatWeiss/gles20 
Allows Cocos2D-X to be built for iOS including all cpp files
 2012-06-08 01:55:19 -07:00
James Chen 12a9d13443 issue #1310: Synchronize to RC2, HelloWorld works ok on win32. 2012-06-08 16:54:38 +08:00
James Chen 76a560a474 issue #1310: Made CCFileUtils as a singleton. 2012-06-08 16:22:57 +08:00
James Chen 35e9e44e39 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-06-08 15:31:23 +08:00
minggo 6b7a59f007 issue #1310:synchronize CCLableAtlas and CCLabelBMFont 2012-06-08 15:29:47 +08:00
James Chen 6cf608effd issue #1310: deleted some functions which can't be implemented in C++. Moved arrayMakeObjectsPerformSelector to CCArray.h. 2012-06-08 15:17:15 +08:00
James Chen 4a887ac598 issue #1310: Updated CCScene.h. 2012-06-08 15:03:18 +08:00
Nat Weiss 6ee3db827c Allows Cocos2D-X to be built for iOS including all cpp files. 2012-06-07 23:52:15 -07:00
James Chen fd2d9a8aa6 issue #1310: Finished 'menu_nodes' and 'layers_scenes_transitions_nodes'. 2012-06-08 14:50:41 +08:00
James Chen c8dfe7f92b issue #1310: Finished CCRenderTexture.h(.cpp). 2012-06-08 14:30:55 +08:00
minggo 9a600c6221 issue #1310: syncronize base_nodes 2012-06-08 14:17:39 +08:00
James Chen 26cf81e42e Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 
Conflicts:
	cocos2dx/CCScheduler.h
	cocos2dx/include/ccTypes.h
 2012-06-08 14:14:13 +08:00
James Chen c5cf23c859 issue #1310: First commit since sync to rc2. 2012-06-08 14:11:48 +08:00
minggo cc16320445 issue #1310: syncronize actions 2012-06-08 13:55:28 +08:00
Nat Weiss ed43e6a90b Allows Cocos2D-X to be built for iOS including all cpp files. 2012-06-07 21:16:24 -07:00
icewind b87e932b9f Override setOpacity to affect a background sprites 
Calling button->setOpacity was affecting only to label. Now opacity
value applies also to a background sprites
 2012-06-07 13:20:30 +04:00
minggo 2b55a76970 Merge pull request #978 from minggo/iss1202_remove_CCFileData 
fixed #1202:remove CCFileData
 2012-06-06 23:15:05 -07:00
minggo 49d8ac72f6 fixed #1202:remove CCFileData 2012-06-07 14:13:44 +08:00
James Chen f466b081c9 fixed #1308: Used std::sort to sort the touchHandler array. 2012-06-07 11:38:59 +08:00
Nicolas Gramlich 45d9fc9686 Making use of the new SEL_CCControlHandler in the CCControlExtension. 2012-06-06 14:32:15 -07:00
Nicolas Gramlich df571e9cbb CCControlExtension: Added support for SEL_CCControlHandler (as opposed to SEL_MenuHandler), which also passes the CCControlEvent parameter. 2012-06-06 14:31:14 -07:00
Nicolas Gramlich aefc1e1370 CCBMemberVariableAssigner and CCBSelectorResolver: now using const char * instead of std::string. 2012-06-06 11:43:33 -07:00
Nicolas Gramlich 671a0ef5b4 Removed zombie file: CCBMemberVariableAssigner.cpp. 2012-06-06 11:06:28 -07:00
James Chen c64c4a74bf fixed #1308: Strange TouchDispatcher behavior. 2012-06-06 22:49:28 +08:00
James Chen 4b7f9f582f fixed #1297: fixed a bug in CCRenderTexture::begin. The parameters of glViewPort should not multiply CC_CONTENT_SCALE_FACTOR(). 2012-06-06 15:56:55 +08:00
James Chen 734ea54aba fixed #1302: The parameter of CCMenu::setHandlerPriority should be signed int. 2012-06-06 15:16:02 +08:00
James Chen 2238db301b fixed #1301: CCEGLView::sharedOpenGLView().setScissorInPoints() should apply scissor in points. 2012-06-06 14:13:40 +08:00
James Chen 6bb2941ec9 fixed #1300: Typo: CC_ENABLE_CACHE_TEXTTURE_DATA -> CC_ENABLE_CACHE_TEXTURE_DATA 2012-06-06 10:06:51 +08:00
Nicolas Gramlich bcf53f1453 Added CCNodeLoaderLibrary (more of a factory pattern, compared to adding the CCNodeLoaders directly to the CCBReader. Fixed all TODOs regarding (potential) memory leaks (Thanks to Ricardo Quesada). CCNodeLoaders are now autorelease objects (having a static 'loader()' method to be used). 2012-06-05 17:15:28 -07:00
Nicolas Gramlich c9db868d93 CCLabelTTF: Now internally using std::string instead of std::string *. 2012-06-05 17:12:41 -07:00
Nicolas Gramlich 2d86a4089c CCLabelBMFont: Now using std::string to store internal data instead of just storing a 'foreign' const char *. 2012-06-05 17:11:50 -07:00
Nicolas Gramlich 0702becaf5 CCAutoreleasepool: Fixed typo. 2012-06-05 16:22:42 -07:00
James Chen 56817244ed fixed #1297: Retina mode can't work in 'Projection2D' mode. 2012-06-05 15:27:46 +08:00
minggo 7733607fe2 fixed #1296: fix logical error of CCTMXTileMap::tilesetForLayer() 2012-06-05 10:51:53 +08:00
Nicolas Gramlich 420a731138 Switched from std::string to const char *. 2012-06-04 17:45:25 -07:00
Nicolas Gramlich d3e0f8dc92 Added support for resolutionScale. 2012-06-04 16:16:42 -07:00
Nicolas Gramlich 28862c30cf CCNodeLoader: Fixed small memory leak. 2012-06-04 16:03:45 -07:00
Nicolas Gramlich 5c38dd7193 Added CCBMemberVariableAssigner and CCBSelectorResolver. 2012-06-04 15:52:49 -07:00
Nicolas Gramlich 6c5be5e56e CCScale9Sprite: Removed debug logging. 2012-06-04 15:30:03 -07:00
James Chen 1b4de48e86 Merge pull request #961 from icewind/gles20 
fixed #1289: CCControlButton update. Added zoomOnTouchDown property and setPreferredSize.
 2012-06-03 19:55:39 -07:00
minggo ae15525e32 Merge pull request #965 from NatWeiss/gles20 
fixed #1288:Enhances CCTransitionScene to work even if there is no running scene.
 2012-06-03 07:36:17 -07:00
Nicolas Gramlich bb49eaebe9 Added CCParticleSystemQuadLoader. 2012-06-01 16:45:30 -07:00
Nicolas Gramlich 8576837e5e CCParticleSystemQuad: Added CCParticleSystemQuad::node(). 2012-06-01 16:38:43 -07:00
Nicolas Gramlich 43682e6857 Added CControlLoader and CCControlButtonLoader. 2012-06-01 15:14:18 -07:00
Nicolas Gramlich 2340c93c17 Fixed CCNodeLoader::parsePropTypeSpriteFrame not trying to load 'null' sprites/spritesheets. Also minor renaming. 2012-06-01 15:13:16 -07:00
Nicolas Gramlich 9951ba8ad2 Minor changes. 2012-06-01 15:12:07 -07:00
Nicolas Gramlich 67d9b8ea25 Minor changes. 2012-06-01 15:11:42 -07:00
Nicolas Gramlich eee8ba7586 CCLabelTTF: Added getters for fontName and fontSize. 2012-06-01 15:11:16 -07:00
Nicolas Gramlich 9576db1e28 CCControlButton: Added LabelAnchorPoint property. (According to: https://github.com/YannickL/CCControlExtension/ : 623f10433a088140adbb1e1d7d6c97e1ae05adf9) 2012-06-01 15:10:20 -07:00
Nicolas Gramlich 18fba1664d CCControlButton: Added getters and setters for backgroundspriteframe, titlettf, titlettfsize, titleBMGont. Added ZoomOnTouchDown property. (According to: https://github.com/YannickL/CCControlExtension/ : 9dfb9d97a5fe729115b461d9a52ebc36aba51c72, b31256ad6b26e7f645719f203f0e72d717e68c75, 7a79cd702d4ccb958281bcec5d8a7658723f7c2a, c4bbcb9beb2febfb4b55323709e30082af902c90, d4a88349e1f60100225d49e43af587dc10def66f) 2012-06-01 12:29:48 -07:00
Nicolas Gramlich 8dbe897755 CCLabelBMFont: Made fntFile a property. (According to: ffbdb60a5908f5baef227bb0365a0b2653a3a59a) 2012-06-01 11:59:10 -07:00
icewind ac268896f1 CCControlButton update. Added zoomOnTouchDown property and setPreferredSize 
Ported some functions from original CCControlExtensions repository.
Added feature to set the preferred size of the background sprite and
toggle zooming on TouchDown event
 2012-06-01 14:07:45 +04:00