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

8846 Commits

Author SHA1 Message Date
carlo morgantini 2430d79642 changed the label test (shadows + stroke) for using ccTextDefinition when creating CCLabelTTF 2013-05-15 16:29:33 -07:00
carlo morgantini bc9a74218c added a new utility for comparing 2 ccColor3b 2013-05-15 16:29:33 -07:00
carlo morgantini d9a53b3eb1 CCLabelTTF new interface for ccBuilder 2013-05-15 16:29:33 -07:00
carlo morgantini 9ba489bba4 new assert() added on unsupported platforms for CCLabelTTF and CCTexture2D 2013-05-15 16:29:33 -07:00
carlo morgantini 74441203cb stroke and shadow are implemented and supported only on iOS and Android for now 2013-05-15 16:29:33 -07:00
carlo morgantini fcea506fef fixed some text formatting issues 2013-05-15 16:29:33 -07:00
carlo morgantini 54347bf767 setFontTintColor renamed to setFontFillColor 2013-05-15 16:29:33 -07:00
carlo morgantini 7bc3ceb8c8 uses const ccColor & in the interface instead of ccColor& 2013-05-15 16:29:33 -07:00
carlo morgantini c727fa33c0 CCLabelTTF have now a tint, plus bug fixing and code clean up 2013-05-15 16:29:33 -07:00
carlo morgantini 221884f6d4 better CCTexture2D API for init texture with shadow and stroke 2013-05-15 16:29:32 -07:00
carlo morgantini fc846bb9ac label TTF stroke and shadow for Android 2013-05-15 16:29:32 -07:00
carlo morgantini 690d5968ca New stroke and shadows for Android 2013-05-15 16:12:43 -07:00
carlo morgantini dd9b4a8932 new shadow and stroke for CCLabelTTF 2013-05-15 16:12:43 -07:00
minggo 392c33cb7a Update AUTHORS 2013-05-15 09:53:53 +08:00
minggo e95ba43d1f Merge pull request #2563 from DarraghCoy/android_audio_crash_fix 
Fix a potential crash SimpleAudioEngineOpenSL::playEffect
 2013-05-14 18:52:14 -07:00
Darragh Coy 7b67794826 Fix a potential crash SimpleAudioEngineOpenSL::playEffect 
Fix a crash in SimpleAudioEngineOpenSL::playEffect which would occur when OpenSLEngine::preloadEffect returned FILE_NOT_FOUND. In the case where the sound fails to preload, we should not attempt to call OpenSLEngine::setEffectLooping on that sound.
 2013-05-14 17:48:50 +01:00
James Chen 7f7ff26750 Update AUTHORS [ci skip] 2013-05-14 11:23:14 +08:00
James Chen 99664b5998 Merge pull request #2391 from sbc100/log_asserts 
fixed #2152: Logging assert messages to the console and renaming CCScriptSupport::executeAssert to CCScriptSupport::handleAssert.
 2013-05-13 19:56:28 -07:00
James Chen bd8132d062 Update AUTHORS [ci skip] 2013-05-13 22:15:31 +08:00
James Chen f80bce9b6d Merge pull request #2557 from dumganhar/iss2151-customttf 
fixed #2151: Custom font can't be loaded correctly if using full path of filename.
 2013-05-13 07:14:08 -07:00
James Chen cdb3985f0d fixed #2151: Commenting a log in CCFileUtils::fullPathForFilename. 2013-05-13 21:48:25 +08:00
James Chen d8c4e4fb27 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss2151-customttf 2013-05-13 21:44:45 +08:00
James Chen 9842b1ae53 Update AUTHORS [ci skip]. 2013-05-13 21:32:04 +08:00
James Chen ffd8dad276 Merge pull request #2558 from Xander84/master 
Assert statement modifies 'mType'. [ci skip]
 2013-05-13 06:29:31 -07:00
James Chen 32cbb28ba9 Merge pull request #2559 from dumganhar/master 
fixed #2105: Refactoring travis build script for android.
 2013-05-13 05:45:15 -07:00
James Chen 1aad7e927d fixed #2105: Refactoring travis build script. 2013-05-13 20:43:28 +08:00
Alexander Markevich b7f4eea207 Assert statement modifies 'mType'. 2013-05-13 14:26:56 +03:00
James Chen 8fa593a8fe fixed #2151: Custom font can't be loaded correctly if using full path of filename. 2013-05-13 19:12:37 +08:00
James Chen 4e3ff65707 Merge branch 'android_custom_font_fix' of git://github.com/DarraghCoy/cocos2d-x into iss2151-customttf 2013-05-13 18:40:14 +08:00
James Chen 8ab1c84f7a Merge pull request #2556 from dumganhar/iss2150-color 
fixed #2150: setColor and setOpacity of CCControlButton and CCScale9Sprite are broken.
 2013-05-13 03:00:49 -07:00
James Chen 21226da0f7 fixed #2150: Updating AUTHORS. 2013-05-13 17:58:51 +08:00
James Chen dea45e8e79 fixed #2150: Adding tests for this issue and fix compilation error of CCScale9Sprite. 2013-05-13 17:57:30 +08:00
James Chen 45ce8995d3 fixed #2150: Updating ccb and ccbi files. 2013-05-13 17:56:32 +08:00
James Chen a8c95bc6f3 Merge branch 'fix_ccscale9sprite' of git://github.com/Clarinexus/cocos2d-x into Clarinexus-fix_cccontrolbutton 2013-05-13 16:24:59 +08:00
James Chen 68aa5318de Merge branch 'fix_cccontrolbutton' of git://github.com/Clarinexus/cocos2d-x into Clarinexus-fix_cccontrolbutton 2013-05-13 16:24:41 +08:00
James Chen 5c069a6ecf Merge pull request #2555 from dumganhar/iss2105-travis 
fixed #2105: Updating the URL of 'Building Status' for travis.
 2013-05-13 01:08:02 -07:00
James Chen efaa625613 Update AUTHORS 2013-05-13 16:06:30 +08:00
James Chen f7e4dc04a7 Merge pull request #2554 from dumganhar/iss2149-const 
fixed #2149: Adding const qualification to some CCNode's getters
 2013-05-13 01:05:06 -07:00
James Chen 558dea5d83 fixed #2105: Updating the URL of 'Building Status' for travis. 2013-05-13 16:04:08 +08:00
James Chen a0c634aee5 Merge pull request #2553 from dumganhar/iss2105-travis 
fixed #2105: Adding Travis build support. Moving script to 'tools/travis-script'.
 2013-05-13 00:24:08 -07:00
James Chen f35e96a9f8 fixed #2105: Adding Travis build support. Moving script to 'tools/travis-script'. 2013-05-13 15:18:18 +08:00
James Chen c0a6f0c74f fixed #2149: "const CCSize& CCScrollView::getContentSize()" --> "const CCSize& CCScrollView::getContentSize() const". 2013-05-13 15:07:47 +08:00
James Chen fa8daa2ebb Merge branch 'master' of https://github.com/metalgit92/cocos2d-x into metalgit92-master 2013-05-13 14:03:29 +08:00
James Chen 2ca0334765 Update AUTHORS 2013-05-13 11:48:02 +08:00
James Chen 28154b1e66 Merge pull request #2533 from beingstudio/cec80e62ef4344aee1a34a0e6f35fd22f9147459 
fixed #2147: fix Null pointer access in CCBAnimationManager::getRunningSequenceName.
 2013-05-12 20:45:56 -07:00
minggo 6de50e2420 Update AUTHORS 2013-05-13 11:40:30 +08:00
minggo aa5e5661ce Merge pull request #2551 from silverscania/master 
Fix for corrupted texture issue: https://github.com/cocos2d/cocos2d-x/issues/2550
 2013-05-12 20:36:41 -07:00
minggo b10e896423 Update AUTHORS 2013-05-13 10:55:12 +08:00
minggo 3ebb61a09c Merge pull request #2543 from FlagellumDei/patch-1 
centerWindow() fix
 2013-05-12 19:44:15 -07:00
minggo f34c977520 Merge pull request #2552 from samuele3hu/FirstBranch 
First branch
 2013-05-12 19:15:49 -07:00