Commit Graph

8944 Commits

Author SHA1 Message Date
zhangbin bf483df2c0 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2013-05-16 11:47:40 +08:00
zhangbin 79bd3c990e fixed #2155 : Resolve the bug of callback methods in plugin. 2013-05-16 11:45:46 +08:00
minggo 1a947ce1cd Merge pull request #2567 from minggo/AssetsManager-asynchronization
Make AssetsManager download resources in a new thread
2013-05-15 20:24:05 -07:00
minggo 1a577b13aa Update AUTHORS 2013-05-16 11:10:26 +08:00
minggo b2fc4d150e Merge pull request #2546 from carlomorgantinizynga/TTFLabelNewProps
CCLabelTTF supports for shadow and stroke
2013-05-15 20:05:05 -07:00
carlo morgantini a3f5238407 fix a warning caused by member variables initialization order in constructor 2013-05-15 16:37:08 -07:00
carlo morgantini fb2a73048d it now shares code between createTextBitmap and createTextBitmapShadowStroke (no more duplication) 2013-05-15 16:37:08 -07:00
carlo morgantini 4d3ed48905 initWithStringShadowStroke() renamed to initWithString() 2013-05-15 16:37:08 -07:00
carlo morgantini c9e875869e comment fixed 2013-05-15 16:37:08 -07:00
carlo morgantini 3c28048c14 fix alignent problem when rendering text with shadow 2013-05-15 16:37:08 -07:00
carlo morgantini 0ff33fd4f5 fix a problem with float stroke size 2013-05-15 16:37:08 -07:00
carlo morgantini 3b50ffe5ba Fix problem with CCLabelTTF + shadow and text alignment; also fontDefinition property names now are lowercase 2013-05-15 16:37:08 -07:00
carlo morgantini 36b88039a1 CCLabelTTF C++ test fixed 2013-05-15 16:37:08 -07:00
carlo morgantini 315999edad new "manual" conversion for ccFontDefinition in JS and also updated LabelTest.js using this new way of passing parameters to CCLabelTTF through ccFontDefinition 2013-05-15 16:37:08 -07:00
carlo morgantini d77604b958 initWithStringAndTextDefinition() changed method's signature 2013-05-15 16:37:08 -07:00
carlo morgantini ef1a123b42 no more bingins for ccTextDefinition 2013-05-15 16:37:08 -07:00
carlo morgantini 04c890522d class renamed and moved to ccTypes.h 2013-05-15 16:35:25 -07:00
carlo morgantini cab90dd276 CCTextDefinition is passed now by pointers 2013-05-15 16:35:24 -07:00
carlo morgantini 934c8f5115 bindings for CCTextDefinition 2013-05-15 16:35:24 -07:00
carlo morgantini ed981aee7e ccTextDefinition becomes CCTextDefinition 2013-05-15 16:29:33 -07:00
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
Carsten Sandtner b71a88d0fc updated ios project for Tests. 2013-05-15 17:14:38 +02:00
Carsten Sandtner 370a540352 fixed possible memory holes. 2013-05-15 15:15:23 +02:00
Carsten Sandtner 4cb3001fc6 Fixed check for arguments at xhr.send() 2013-05-15 13:57:25 +02:00
Carsten Sandtner 89fc8168e5 Added a test to javascript testsuite. 2013-05-15 13:56:58 +02:00
Carsten Sandtner 7cece145af Merge branch 'master' into XMLHttpRequest_Demo
# By Darragh Coy (1) and minggo (1)
# Via minggo
* master:
  Update AUTHORS
  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-15 13:53:31 +02:00
minggo 7bccb8b62a issue #1859:remove unneeded code 2013-05-15 17:14:51 +08:00
minggo d8a0b0c130 issue #1859:download resources in a new thread 2013-05-15 17:09:28 +08: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
Carsten Sandtner 919c347c6d changed method to strip newlines as Android complained. 2013-05-14 17:21:27 +02:00
Carsten Sandtner a7e0a83a2e remove initialization of withCredentialsValue = flase as iso c++ complains it. 2013-05-14 15:50:56 +02:00
Carsten Sandtner 6449d79d60 Fixed some typo 2013-05-14 14:16:22 +02:00
Carsten Sandtner 32d2ee8104 Deactivated Debugging flag. 2013-05-14 13:19:32 +02:00
zhangbin 5a9db1a8da Request developer input the app key of weibo account in demo code. 2013-05-14 18:33:05 +08:00
Carsten Sandtner 1b80208329 Tidied up comments 2013-05-14 12:03:58 +02:00
Carsten Sandtner 2e68188321 Some code cleaning 2013-05-14 11:36:48 +02:00