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
7bccb8b62a
issue #1859:remove unneeded code
2013-05-15 17:14:51 +08:00
d8a0b0c130
issue #1859:download resources in a new thread
2013-05-15 17:09:28 +08:00
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
354a8408f6
Added getter and setter for raw header data
2013-05-13 16:57:07 +02:00
b7f4eea207
Assert statement modifies 'mType'.
2013-05-13 14:26:56 +03:00
dea45e8e79
fixed #2150 : Adding tests for this issue and fix compilation error of CCScale9Sprite.
2013-05-13 17:57:30 +08:00
a8c95bc6f3
Merge branch 'fix_ccscale9sprite' of git://github.com/Clarinexus/cocos2d-x into Clarinexus-fix_cccontrolbutton
2013-05-13 16:24:59 +08:00
68aa5318de
Merge branch 'fix_cccontrolbutton' of git://github.com/Clarinexus/cocos2d-x into Clarinexus-fix_cccontrolbutton
2013-05-13 16:24:41 +08:00
c0a6f0c74f
fixed #2149 : "const CCSize& CCScrollView::getContentSize()" --> "const CCSize& CCScrollView::getContentSize() const".
2013-05-13 15:07:47 +08:00
cec80e62ef
fix Null pointer access
2013-05-08 15:53:54 +08:00
7a472f7f5d
Moving CC_DEPRECATED_ATTRIBUTE to the front of functions in HttpRequest.h
2013-05-08 11:32:09 +08:00
b7aa71dcfc
Fixing crash while trying to load sprite frame when the file is missing. Reports error instead
2013-05-07 14:53:41 -07:00
3d356d0a8f
Removing setting ignoreAnchorPoint for child CCB files. Was causing a bug with positioning
2013-05-07 14:53:41 -07:00
d735835753
Fixing coloring in CCControlButtons by overriding the set/get color functions
2013-05-07 13:48:58 -07:00
f51506eed2
Fixing CCScale9Sprites when loaded from CCB files to be able to change color and opacity
2013-05-07 12:02:32 -07:00
912905054e
fixed #2123 : Refactoring network extension, fixing unlikely memory leaks, adding PUT/DELETE methods.
...
Merge branch 'curl_raii' of https://github.com/sergey-shambir/cocos2d-x into sergey-shambir-curl_raii
Conflicts:
extensions/network/HttpClient.cpp
samples/Cpp/TestCpp/Classes/ExtensionsTest/NetworkTest/HttpClientTest.cpp
2013-05-07 15:37:25 +08:00
d58f21dc76
Merge pull request #2521 from minggo/emscriptenate
...
fix conflict of #2050
2013-05-06 23:51:38 -07:00
a9aafdafac
Merge pull request #2490 from coolengineer/pull-request-httpclient
...
fixed #2119 : Introduce HttpResponse callback selector type to resolve #2365 , fixed version ;-)
2013-05-06 23:44:20 -07:00
1166a02e13
resolve conflict for #2505
2013-05-07 14:31:00 +08:00
eaad4f52af
Merge pull request #2495 from ptekchand/master
...
fixed #2116 : Support negative node scales of CCScrollView.
2013-05-06 23:06:54 -07:00
d529287cfa
Remove LOG prefixes from emscripten makefiles
2013-05-06 21:00:38 -07:00
19f6c7978b
More client side buffer fixes.
2013-05-06 20:59:48 -07:00
c45e5797cf
Add Makefiles for Emscripten + Emscripten external
2013-05-06 20:58:02 -07:00
6f1eefea31
Merge pull request #2483 from Weeds/fix-HttpClient
...
Fixed crash in HttpClient request on 64Bit
2013-05-05 23:44:34 -07:00
0a996804fa
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2013-04-30 21:06:18 +05:30
4360c3bff8
Support negative scaling of CCScrollView.
...
Not checking for it in CCScrollView::getViewRect causes intersectsRect calls (eg: to check if the touch was within the bounds) to return false.
2013-04-30 20:47:38 +05:30
924d271410
Fix warnings.
2013-04-29 16:46:48 -07:00
bb632f874b
Merge pull request #2455 from FlowerpotGames/CCScrollView-TouchPriorityFix
...
CCScrollView TouchPriority Fix
2013-04-29 08:25:10 -07:00
489e684a0e
Merge pull request #2443 from rodrigogolive/spine-fix
...
Fixing broke linux build
2013-04-29 08:01:39 -07:00
a9ace2505e
Introduce HttpResponse callback selector type. to resolve #2365
2013-04-28 03:55:58 +09:00
3bd67a47fa
Fixed crash in HttpClient request on 64Bit
...
According to the cURL documentation the pointer that should be passed
to curl_easy_getinfo with CURLINFO_RESPONSE_CODE must be a long
pointer,
On platforms where long is 64Bit this will cause a stack corruption
destroying the pointer to the original resonse as the current response
code variable was a 32 Bit int value.
See: http://curl.haxx.se/libcurl/c/curl_easy_getinfo.html
2013-04-27 17:55:07 +02:00
cb8f069ae6
Merge pull request #2466 from Weeds/fix-loadAsyncImage
...
don't use named semaphore for syncing image loading thread
2013-04-27 08:47:48 -07:00
43615fe0a7
don't use named semaphore in HttpClient
...
this patch removes using named semaphores for Http requests.
This also destroys the mutexes from CCTextureCache when the thread is
destroyed
2013-04-27 17:44:33 +02:00
9739477881
A fix of include file.
2013-04-27 14:41:58 +08:00
edc8444ca4
Updating blackberry project configurations.
2013-04-27 14:07:54 +08:00
8c779ff98f
Fixing compilation errors for linux port.
2013-04-27 09:32:46 +08:00
6f994b16cf
Fixing broke linux build
...
The spine code building on Linux stops when checking that some variables
can be used when not initialized. This commit fixes it.
Signed-off-by: Rodrigo Goncalves de Oliveira <rodrigo.goncalves@openbossa.org>
2013-04-25 09:36:23 -04:00
c7222c2b14
CCScrollView should set the TouchPriority from the CCLayer, thus allowing the developer to set a custom TouchPriority with a call to setTouchPriority(…);
2013-04-25 09:30:24 -04:00
93ed85903f
Merge pull request #2437 from dumganhar/iss2075-spine-support
...
fixed #2075 : Adding spine editor support.
2013-04-24 01:12:23 -07:00
7b138c6be9
issue #2075 : Adding spinetest in TestCpp for win32.
2013-04-24 14:48:39 +08:00
6b4420e7ec
issue #2075 : Updating extensions project for linux, native client and marmalade.
2013-04-24 14:37:22 +08:00
7755b025ee
Adding spine/spine-cocos2dx.h to cocos-ext.h.
2013-04-24 14:36:11 +08:00
2d1172814d
issue #2075 : Adding spine editor support. Adding a new test 'SpineTest' in TestCpp, adding the parse code in "extensions/spine". It works only on iOS now.
2013-04-24 13:57:34 +08:00
685fe16e10
fixed #2076 : Adding a method CCBReader::setResolutionScale for setting resolution scale manually
2013-04-23 10:39:59 +08:00
8507f7a386
network: Added PUT and DELETE request types
2013-04-21 20:54:52 +04:00
270eeb4d9a
Refactored and fixed almost impossible memory leak.
...
Previously curl_slist_free_all(cHeaders) called in loop after
many break statements, so there was no garantue that it will be called
in all cases.
This change also simplifies code to make implementing PUT/DELETE methods
easier.
2013-04-21 18:58:35 +04:00
98a7b9636d
Added CCB_MEMBERVARIABLEASSIGNER_GLUE_WEAK
...
We've found it useful to use CCB_MEMBERVARIABLEASSIGNER_GLUE_WEAK in
situations where we don't want CCObject derived pointers retained. It's
also useful if you want to assign a pointer dynamically cast to an
abstract base class such as CCLabelProtocol.
2013-04-19 08:06:25 +10:00
18a345071a
Merge pull request #2375 from billy1380/master
...
fix for issue #2366
2013-04-17 01:48:34 -07:00
1eb79530c6
fixed #1847 : -DCC_ENABLE_BOX2D_INTEGRATION ~> -DCC_ENABLE_BOX2D_INTEGRATION=1,
...
-DCC_ENABLE_CHIPMUNK_INTEGRATION ~> -DCC_ENABLE_CHIPMUNK_INTEGRATION=1.
2013-04-17 12:49:25 +08:00
4a7bacf0b5
Updating Android.mk.
2013-04-16 18:19:46 +08:00
16b9506690
fixed a bug that was causing http client to fail on mac os x with
...
semaphore error
2013-04-15 22:49:29 +01:00
ffb7360e46
Enable easy swithing between Box2D and chipmunk in linux and nacl
...
The ENABLE_BOX2D/ENABLE_CHIPMUNK defines were previously
hardcoded in the Makefiles. Now you get chipmunk by default
on both platforms and can enble Box2D by setting USE_BOX2D in
your environment.
Also remove erroneous -D__CC_PLATFORM_FILEUTILS_CPP__ and
-D__CC_PLATFORM_IMAGE_CPP__ from linux Makefiles. These should
never be defined globally like this.
2013-04-15 07:35:50 -07:00
87f57d6ca6
Fix CCPhysicsSprite getPosition variants
...
CCPhysicsSprite was overriding only some of the getPosition
methods on a node resulting in, for example, getPositionX
and getPositionY not working for physics nodes.
This change also makes this overloads shared between box2d
and chipmunk implementations.
2013-04-15 07:35:49 -07:00
5b2196075a
fixed #1876 : CCScale9Sprite::setColor(...), setOpacity(...) are broken.
2013-04-15 16:37:35 +08:00
b7e16e9895
Fixed #2054 : AnchorPoint property of CCScale9Sprite doesn't work in CCBReader.
...
Invoking init method in CCScale9Sprite::create().
2013-04-15 11:51:26 +08:00
b228a13218
Merge branch 'patch-1' of https://github.com/zhanghaojie/cocos2d-x into iss2054-s9sp-anchorpoint-ccb
2013-04-15 11:45:59 +08:00
a5d78830db
fixed #1860 : onNodeLoaded will be called twice if ccb was added as a CCBFile.
2013-04-15 10:39:44 +08:00
a1568d1f74
fixed #2040 : Getting scale property from sub-ccb node may trigger an assert of 'CCAssert( m_fScaleX == m_fScaleY, "CCNode#scale. ScaleX != ScaleY. Don't know which one to return");'.
2013-04-15 10:18:35 +08:00
6c15c75c78
fixed #1862 : CCScrollView::setContainer may cause dangling pointer when NULL is passed into.
2013-04-15 09:52:46 +08:00
17599174ad
Fixing an issue of out of bound in CCTableView.cpp.
2013-04-14 11:05:03 +08:00
fb0794bef6
fixed #2048 : Fixing compilation errors on linux.
2013-04-10 17:13:19 +08:00
3f695d1934
Merge branch 'master' of https://github.com/SevInf/cocos2d-x into SevInf-master
2013-04-10 16:07:54 +08:00
32406efec2
Merge branch 'newlines_in_cclog' of https://github.com/sbc100/cocos2d-x into sbc100-newlines_in_cclog
...
Conflicts:
cocos2dx/proj.linux/cocos2dx.mk
2013-04-10 14:17:23 +08:00
9c563a883f
Fixing a typo.
2013-04-09 18:08:43 +08:00
24c9668a1b
Added a getter to get the size of the data
...
Added a getter to get the size of the data
2013-04-09 00:28:50 +05:30
cd37569729
CCControlButton responds even if its parent is invisible
...
The Buttons should not respond if its invisble or if its made invisible
by any of its parent in the hierarchi
2013-04-09 00:27:53 +05:30
d3eed7fd1f
Merge pull request #2279 from sjchao/master
...
fixed #2030 : Fixing a display bug when a scrollView nested in another scrollView. The parent's scissor rect need to be considered, when setting the scissor rect in the subScrollView.
2013-04-07 23:55:55 -07:00
4c67fd979e
fix property anchorPoint of CCScale9Sprite
...
fix property anchorPoint of CCScale9Sprite doesn't work in ccb. Because initSpriteFrame method reset anchor point
2013-04-05 23:58:23 +08:00
1510354568
Support variable cell sizes in CCTableView
2013-04-04 17:57:43 +03:00
17caacbeb5
Resize CCEditBox subviews when contentSize changes
...
1. Place placeholder and text labels correctly;
2. Resize native view when parent content size changes.
2013-04-02 16:34:33 +03:00
380ec78fcd
Allow to set EditBox font name and size separately
2013-04-02 16:31:30 +03:00
4690a45f3e
change a method name
...
change method name from isScissorEnable() to isScissorEnabled() in
class CCEGLViewProtocal
2013-03-29 17:19:47 +08:00
053efa0537
m_nDefaultTouchPriority is never used anymore; Instead, we setTouchPriority(1) directly for all CCControl by default.
2013-03-29 16:19:34 +08:00
f1f31deb98
Fix the display bug when a scrollView nested in another scrollView
2013-03-29 16:05:28 +08:00
9144946176
Fix bug: CCControl's touch priority is not set correctly; m_nDefaultTouchPriority is never used;
2013-03-23 12:18:00 +08:00
e2e9bc8ce0
Fixing memoryleaks.
2013-03-21 09:00:55 +08:00
33fc16261b
Updating blackberry project settings.
2013-03-20 18:34:28 +08:00
19b66049b3
Fixing issues with rotationX, rotationY in CCBuilderReader
2013-03-19 23:43:00 -07:00
54bb643ad3
Adding support for RotationX and RotationY to CCBReader
2013-03-19 23:42:59 -07:00
37acbbe4fb
Adding a space for target variable.
2013-03-20 10:44:21 +08:00
e5ef579cb3
Fixing compilation errors for linux.
2013-03-20 10:41:20 +08:00
6cb3f6bcc0
IOS, Added CCEditBoxImplIOS kEditBoxInputFlagSensitive settings.
...
Added case to hide IOS autocorrection in kEditBoxInputFlagSensitive
mode.
2013-03-19 20:00:35 +01:00
6b92c16bb0
Update CCControlButton.cpp
...
fixed a bug when button's parent is hided, the button still can responce to clicked event
2013-03-19 20:56:38 +08:00
a09d94fb6b
Merge branch 'master' of https://github.com/dumganhar/cocos2d-x
2013-03-19 17:47:09 +08:00
aa5f7ffb6a
Updating project setting of testcpp for Marmalade.
2013-03-19 17:46:49 +08:00
4a9b07e0c4
Updating libExtensions.vcxproj.
2013-03-19 17:27:39 +08:00
8b466f12a2
fixed #1838 : Adding test for the new feature(Timeline callback & playing effect) of CocosBuilder.
2013-03-19 16:33:23 +08:00
80a268baf6
Fixing couple of bugs in reader that was checked into different branch
2013-03-18 23:20:14 -07:00
deb739f13b
Merge pull request #2194 from rohankuruvilla/ccbreader
...
fixed #1838 : Latest CCBReader changes.
2013-03-18 21:56:13 -07:00
d9f47d2066
Merge pull request #2128 from biteforest/Branch_fix_CCScale9Sprite_bug
...
fix cc scale9 sprite bug
2013-03-18 18:37:17 -07:00
c86e8376dc
Adding dependency on CocosDenshion for CocosBuilderReader in Android makefile
2013-03-18 16:06:47 -07:00
8680d4dbfc
Adding animation callback support for native classes
2013-03-18 16:06:47 -07:00
035c0d7eee
Modifyign CCBSequence to do proper copy of objects
2013-03-18 16:06:47 -07:00
9acaaa289a
Making the changes to support Sound, Callbacks and skew property in CCBReader
2013-03-18 16:06:46 -07:00
1cbc796805
Fixing wrong display of CCEditbox on retina iOS device.
2013-03-18 23:14:20 +08:00
3b6c46b478
fix crash in CCBReader::readFloat()
2013-03-16 23:47:58 +01:00
04c1a863a0
Remove tailing newlines from CCLog messaages.
...
Some CCLog message contained trailing newlines which
made the logs hard to read on many platforms. The solution
here is to stip trailing newlines on those platforms, and also
to remove the newlines from the existing log messages.
2013-03-16 09:01:21 -07:00
3e33868a63
fixed #1824 : Exposed cc.EditBox to js.
2013-03-14 18:14:16 +08:00
0a0796b572
fixed #1825 : Fixing compilation errors for CCEditBox of win32 port.
2013-03-14 14:39:59 +08:00
minggo