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
James Gregory
ab2d94c040
First pass at using SDL to render fonts instead of FreeType.
2013-05-14 21:38:56 -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
James Gregory
420f2cba68
Ignore ctags file.
2013-05-14 15:39:11 -07:00
James Gregory
0daa3adfd6
Emscripten changed ABI for .a files. Rebuild all deps, updating to current version. Switch Emscripten to incoming branch as it's not working on master right now. Added simple script for rebuilding deps in case it becomes necessary again. Switch builds to always use -g flag, per Emscripten's warnings. Undefine native client defines so that it builds (Emscripten switched to NaCl alignment, macro got defined as a side-effect).
2013-05-14 15:26:48 -07:00
James Gregory
de1a6340da
Add my hacky script to rebuild dependencies, in case this is needed again in the future.
2013-05-14 15:14:54 -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
Carsten Sandtner
915265dd34
Merge branch 'master' into XMLHttpRequest_cchttpclient
...
# By Sam Clegg (2) and James Chen (1)
# Via James Chen
* master:
Update AUTHORS [ci skip]
Rename CCScriptSupport::executeAssert -> CCScriptSupport::handleAssert
Log assert messages
2013-05-14 11:19:46 +02:00
zhangbin
e167862406
Remove the unused code in weibo.
2013-05-14 17:00:36 +08:00
zhangbin
60c7e84985
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2013-05-14 13:50:42 +08:00
zhangbin
19b05bb9e0
Add plugin weibo & demo code in HelloSocial.
2013-05-14 13:49:19 +08: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
Carsten Sandtner
b74f1fb161
Merge branch 'master' into XMLHttpRequest_cchttpclient
...
# By James Chen (23) and others
# Via James Chen (19) and others
* master: (57 commits)
Update AUTHORS [ci skip]
fixed #2151 : Commenting a log in CCFileUtils::fullPathForFilename.
Update AUTHORS [ci skip].
fixed #2105 : Refactoring travis build script.
Assert statement modifies 'mType'.
fixed #2151 : Custom font can't be loaded correctly if using full path of filename.
fixed #2150 : Updating AUTHORS.
fixed #2150 : Adding tests for this issue and fix compilation error of CCScale9Sprite.
fixed #2150 : Updating ccb and ccbi files.
Update AUTHORS
fixed #2105 : Updating the URL of 'Building Status' for travis.
fixed #2105 : Adding Travis build support. Moving script to 'tools/travis-script'.
fixed #2149 : "const CCSize& CCScrollView::getContentSize()" --> "const CCSize& CCScrollView::getContentSize() const".
Update AUTHORS
Update AUTHORS
Update AUTHORS
issue #2103 Add more lua test case(Replace encoding error)
Added const to CCNode::getChildrenCount()
Fix for wrong alignment using texture format sizes other than 4 bytes. For example RGBA4444 is 2 bytes per pixel. A texture with width of 1 passes the previous power of 2 test, but the alignment value needs to be 2, not 4.
issue #2103 Add more lua test case(Add PerformanceSpriteTest of PerformanceTest)
...
2013-05-13 17:02:17 +02:00
Carsten Sandtner
d61ee643a9
changed xmlhttprequest to use cchttpclient instead of raw curl. XHR is now async.
2013-05-13 16:57:55 +02:00
Carsten Sandtner
354a8408f6
Added getter and setter for raw header data
2013-05-13 16:57:07 +02: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