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
Alexander Markevich