samuele3hu
e4ec801363
issue #2103 add webSocket lua test sample
2013-06-06 22:29:02 +08:00
yinkaile
10ed7ebdf4
merge newest version
2013-06-06 16:22:58 +08:00
Rene Klacan
8b16178f9f
Merge pull request from cocos2d/develop
2013-06-06 09:42:18 +02:00
James Chen
a539f69d63
[Spine] Using getContentSize to make spine-runtime supports the strategy of loading resources in cocos2d-x.
2013-06-06 15:02:57 +08:00
James Chen
9a26376b1f
Adding libwebsockets license in WebSocket.h/.cpp.
2013-06-06 15:02:57 +08:00
James Chen
ed4b9b2bb3
Marmalade projects fix.
2013-06-06 14:26:35 +08:00
James Chen
93597a5858
[Spine] Using getContentSize to make spine-runtime supports the strategy of loading resources in cocos2d-x.
2013-06-06 14:22:51 +08:00
James Chen
f056757a9f
Adding libwebsockets license in WebSocket.h/.cpp.
2013-06-06 14:16:57 +08:00
yinkaile
3cfba7bc9a
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
...
Conflicts:
extensions/Android.mk
extensions/proj.win32/libExtensions.vcxproj.filters
samples/Cpp/TestCpp/Android.mk
samples/Cpp/TestCpp/Classes/ExtensionsTest/ExtensionsTest.cpp
2013-06-06 12:35:18 +08:00
yinkaile
245b0395b1
1.upload CCArmature
2013-06-06 12:02:54 +08:00
minggo
3713ff5b71
Merge pull request #2770 from samuele3hu/test_bind_cocosbuilder
...
add cocosbuilder lua test sample
2013-06-05 01:38:57 -07:00
minggo
a9788a7f9d
Merge pull request #2767 from chengstory/master_Components#2
...
1. change “bool isEnabled()” to "bool isEnabled() const".
2013-06-05 00:52:32 -07:00
samuele3hu
75b26d9cdf
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into test_bind_cocosbuilder
2013-06-05 15:19:01 +08:00
samuele3hu
6dd077b8bd
issue #2103 add cocosbuilder lua test sample
2013-06-05 15:17:00 +08:00
chengstory
ca3dc682ea
1. change “bool isEnabled()” to "bool isEnabled() const".
...
2. dolete license.
2013-06-05 15:05:49 +08:00
James Chen
47c8205e39
issue #2143 : Adding CCEditBox::getDelegate.
2013-06-05 14:55:13 +08:00
James Chen
57fee8dc98
issue #2143 : Adding CCEditBox::getDelegate.
2013-06-05 14:30:14 +08:00
chengstory
cfb424a6c9
1. add Component struct.
2013-06-04 17:38:43 +08:00
sunxiaoyu
d41a78453a
Update CCEditBoxImplIOS.mm
...
02c6647306
2013-06-04 17:16:45 +08:00
James Chen
7b98808aa7
Merge pull request #2640 from sunxiaoyu/patch-1
...
fixed #2253 : Adding UITextField only when keyboard was opened, removing it when keyboard was closed.
2013-06-04 02:08:42 -07:00
James Chen
1e04c4e743
fixed #2252 : Fixing a bug that stdio.h is in c++ namespace.
2013-06-04 15:09:20 +08:00
James Chen
37df435089
fixed #2252 : Fixing a bug that stdio.h is in c++ namespace.
2013-06-04 15:05:27 +08:00
flaming0
1d3516da44
Update for spine runtime.
2013-06-04 14:47:19 +08:00
flamingo
a81f2b1303
Update Android.mk
2013-06-04 14:47:10 +08:00
flamingo
66943ee667
Update Makefile
...
For nacl (spine runtime)
2013-06-04 14:47:02 +08:00
flamingo
b806376671
Update Android.mk
2013-06-04 14:46:55 +08:00
flaming0
39ce9b4813
Update spine runtime
2013-06-04 14:46:46 +08:00
flaming0
3daf21996c
Update for spine runtime
...
Conflicts:
extensions/proj.win32/libExtensions.vcxproj
extensions/proj.win32/libExtensions.vcxproj.filters
2013-06-04 14:46:31 +08:00
James Chen
5d89a0cd0c
Merge branch 'develop' into update-spine-runtime-develop
...
Conflicts:
extensions/proj.win32/libExtensions.vcxproj.filters
2013-06-04 13:46:05 +08:00
flaming0
92b1da1fce
Merge remote-tracking branch 'refs/remotes/origin/patch-spine' into patch-spine
2013-06-03 20:53:17 +04:00
flaming0
a6c2ad0666
Update for spine runtime.
2013-06-03 20:52:32 +04:00
James Chen
0ca86db0ff
fixed #1647 : Renaming enumerations to Cocos2d-x style. ERROR and ERROR_TIMEOUT is defined as macros on Windows, fuck it.
2013-06-03 10:12:55 +08:00
James Chen
f2f0f031c7
fixed #1647 : Renaming enumerations to Cocos2d-x style. ERROR and ERROR_TIMEOUT is defined as macros on Windows, fuck it.
2013-06-03 09:55:43 +08:00
flamingo
6f0f53cf84
Update Android.mk
2013-06-02 20:42:48 +04:00
flamingo
6d7e4f5229
Update Makefile
...
For nacl (spine runtime)
2013-06-02 20:19:12 +04:00
flamingo
f6495a64fb
Update Android.mk
2013-06-02 20:18:27 +04:00
flaming0
b87a89eaa4
Update spine runtime
2013-06-02 19:59:13 +04:00
flaming0
5f1a4a4be7
Update for spine runtime
2013-06-02 18:26:46 +04:00
James Chen
4b8f76c903
WS_ERROR -> ERROR, WS_STATE -> STATE.
2013-06-02 18:56:49 +08:00
James Chen
cedb427a6e
fixed #1647 : Adding WebSocket support for Cpp and JSB.
...
Conflicts:
extensions/proj.win32/libExtensions.vcxproj
extensions/proj.win32/libExtensions.vcxproj.filters
2013-06-02 18:55:57 +08:00
Sergey Shambir
984ed75b9a
Linux: added project part for QtCreator.
...
Allows easily setup cocos2d on Linux in QtCreator IDE.
2013-06-02 10:15:14 +04:00
James Chen
8e15cdf5fd
WS_ERROR -> ERROR, WS_STATE -> STATE.
2013-06-01 19:51:10 +08:00
James Chen
05a88c89dc
fixed #1647 : Adding WebSocket support for Cpp and JSB.
2013-05-31 23:13:03 +08:00
minggo
1ff88de561
Merge pull request #2666 from jotel/ccdata-in-userdefault
...
Ability to save/retrieve CCData into/from CCUserDefault
2013-05-29 19:40:23 -07:00
Jaroslaw Lewandowski
3f7c506638
Ability to save/retrieve CCData into/from CCUserDefault
2013-05-29 01:06:41 +01:00
Lee, Jae-Hong
c20e4f3700
Keep a previous text on Tizen CCEditBox.
2013-05-28 20:43:47 +09:00
Lee, Jae-Hong
47fac0ed98
Implement CCEditBox for Tizen. (develop branch)
2013-05-26 20:40:13 +09:00
sunxiaoyu
cc7e858fe1
Update CCEditBoxImplIOS.mm
...
02c6647306
2013-05-24 18:10:04 +08:00
samuele3hu
8b5450ef4a
issue #2103 modify some build script
2013-05-24 13:55:05 +08:00
samuele3hu
0a1c12a2d3
issue #2103 add some overlapping file and delete some comment line
2013-05-24 13:45:06 +08:00
samuele3hu
338c7c8d67
issue #2103 add more test lua
2013-05-24 11:42:27 +08:00
Lee, Jae-Hong
220ac4982a
Update projects to Tizen 2.1 SDK.
2013-05-22 16:55:18 +09:00
James Chen
acef98a350
Merge pull request #2572 from pyrasis/tizen
...
fixed #2185 : Cocos2d-x Tizen support.
2013-05-20 20:08:28 -07:00
Lee, Jae-Hong
f4340475a1
Insert spine directory.
2013-05-21 10:33:08 +09:00
Lee, Jae-Hong
73590e57f6
Set relative include path.
2013-05-21 09:55:33 +09:00
James Chen
9e9b9ca831
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into issue2092-XMLHttpRequest
2013-05-20 20:55:29 +08:00
James Chen
ad340f0a32
fixed #2092 : Make some function static.
2013-05-20 18:11:55 +08:00
James Chen
af655ce965
fixed #2092 : #define httpresponse_selector(_SELECTOR) (SEL_HttpResponse)(&_SELECTOR) --> #define httpresponse_selector(_SELECTOR) (cocos2d::extension::SEL_HttpResponse)(&_SELECTOR).
2013-05-20 17:48:21 +08:00
minggo
59a6635c7b
issue #1859:fix compiling error of AssetsManager.cpp
2013-05-17 09:47:31 +08:00
Lee, Jae-Hong
b6d52a133f
Update extensions project.
2013-05-16 20:24:54 +09:00
Lee, Jae-Hong
55808e22c0
Remove include path in libcurl.
...
Replace \ to / in include path.
2013-05-16 20:15:36 +09:00
Lee, Jae-Hong
09a0eec90a
Enable chipmunk.
2013-05-16 20:14:03 +09:00
Lee, Jae-Hong
1419df3d14
Enable Box2D.
2013-05-16 20:13:27 +09:00
Lee, Jae-Hong
67c898d308
Set output filename.
2013-05-16 20:12:53 +09:00
Lee, Jae-Hong
38ce48be0b
Adding placeholder.txt for extensions/proj.tizen/src
2013-05-16 20:12:07 +09:00
Lee, Jae-Hong
8ed243463e
Adding CCEditBoxImplTizen.h and cpp.
2013-05-16 20:05:46 +09:00
Lee, Jae-Hong
579fd4dd2b
Adding extensions project for tizen.
2013-05-16 20:03:31 +09:00
Carsten Sandtner
2b2d7cb665
Merge branch 'master' into XMLHttpRequest_Demo
...
# By carlo morgantini (28) and others
# Via minggo (6) and zhangbin (3)
* master: (40 commits)
Update AUTHORS
Update AUTHORS
fixed #2155 : Resolve the bug of callback methods in plugin.
Update AUTHORS
fix a warning caused by member variables initialization order in constructor
it now shares code between createTextBitmap and createTextBitmapShadowStroke (no more duplication)
initWithStringShadowStroke() renamed to initWithString()
comment fixed
fix alignent problem when rendering text with shadow
fix a problem with float stroke size
Fix problem with CCLabelTTF + shadow and text alignment; also fontDefinition property names now are lowercase
CCLabelTTF C++ test fixed
new "manual" conversion for ccFontDefinition in JS and also updated LabelTest.js using this new way of passing parameters to CCLabelTTF through ccFontDefinition
initWithStringAndTextDefinition() changed method's signature
no more bingins for ccTextDefinition
class renamed and moved to ccTypes.h
CCTextDefinition is passed now by pointers
bindings for CCTextDefinition
ccTextDefinition becomes CCTextDefinition
changed the label test (shadows + stroke) for using ccTextDefinition when creating CCLabelTTF
...
2013-05-16 10:12:19 +02:00
minggo
5f57ec2d1b
Merge pull request #2207 from csy1988525/master
...
fixed a bug when button's parent is hided, the button still can responce to clicked event
2013-05-15 23:44:25 -07: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
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
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
354a8408f6
Added getter and setter for raw header data
2013-05-13 16:57:07 +02:00
Alexander Markevich
b7f4eea207
Assert statement modifies 'mType'.
2013-05-13 14:26:56 +03: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
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
c0a6f0c74f
fixed #2149 : "const CCSize& CCScrollView::getContentSize()" --> "const CCSize& CCScrollView::getContentSize() const".
2013-05-13 15:07:47 +08:00
dpull
cec80e62ef
fix Null pointer access
2013-05-08 15:53:54 +08:00
James Chen
7a472f7f5d
Moving CC_DEPRECATED_ATTRIBUTE to the front of functions in HttpRequest.h
2013-05-08 11:32:09 +08:00
Rohan Kuruvilla
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
Rohan Kuruvilla
3d356d0a8f
Removing setting ignoreAnchorPoint for child CCB files. Was causing a bug with positioning
2013-05-07 14:53:41 -07:00
Michael Fox
d735835753
Fixing coloring in CCControlButtons by overriding the set/get color functions
2013-05-07 13:48:58 -07:00
Michael Fox
f51506eed2
Fixing CCScale9Sprites when loaded from CCB files to be able to change color and opacity
2013-05-07 12:02:32 -07:00
James Chen
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
minggo
d58f21dc76
Merge pull request #2521 from minggo/emscriptenate
...
fix conflict of #2050
2013-05-06 23:51:38 -07:00
James Chen
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
minggo
1166a02e13
resolve conflict for #2505
2013-05-07 14:31:00 +08:00
James Chen
eaad4f52af
Merge pull request #2495 from ptekchand/master
...
fixed #2116 : Support negative node scales of CCScrollView.
2013-05-06 23:06:54 -07:00
James Gregory
d529287cfa
Remove LOG prefixes from emscripten makefiles
2013-05-06 21:00:38 -07:00
James Gregory
19f6c7978b
More client side buffer fixes.
2013-05-06 20:59:48 -07:00
James Gregory
c45e5797cf
Add Makefiles for Emscripten + Emscripten external
2013-05-06 20:58:02 -07:00
minggo
6f1eefea31
Merge pull request #2483 from Weeds/fix-HttpClient
...
Fixed crash in HttpClient request on 64Bit
2013-05-05 23:44:34 -07:00
Pranav Tekchand
0a996804fa
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2013-04-30 21:06:18 +05:30
Pranav Tekchand
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
Sam Clegg
924d271410
Fix warnings.
2013-04-29 16:46:48 -07:00
minggo
bb632f874b
Merge pull request #2455 from FlowerpotGames/CCScrollView-TouchPriorityFix
...
CCScrollView TouchPriority Fix
2013-04-29 08:25:10 -07:00
minggo
489e684a0e
Merge pull request #2443 from rodrigogolive/spine-fix
...
Fixing broke linux build
2013-04-29 08:01:39 -07:00
Hojin Choi
a9ace2505e
Introduce HttpResponse callback selector type. to resolve #2365
2013-04-28 03:55:58 +09:00
Andre Rudlaff
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
minggo
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
Andre Rudlaff
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
James Chen
9739477881
A fix of include file.
2013-04-27 14:41:58 +08:00
James Chen
edc8444ca4
Updating blackberry project configurations.
2013-04-27 14:07:54 +08:00
James Chen
8c779ff98f
Fixing compilation errors for linux port.
2013-04-27 09:32:46 +08:00
Rodrigo Goncalves de Oliveira
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
Ed Bartley
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
minggo
93ed85903f
Merge pull request #2437 from dumganhar/iss2075-spine-support
...
fixed #2075 : Adding spine editor support.
2013-04-24 01:12:23 -07:00
James Chen
7b138c6be9
issue #2075 : Adding spinetest in TestCpp for win32.
2013-04-24 14:48:39 +08:00
James Chen
6b4420e7ec
issue #2075 : Updating extensions project for linux, native client and marmalade.
2013-04-24 14:37:22 +08:00
James Chen
7755b025ee
Adding spine/spine-cocos2dx.h to cocos-ext.h.
2013-04-24 14:36:11 +08:00
James Chen
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
James Chen
685fe16e10
fixed #2076 : Adding a method CCBReader::setResolutionScale for setting resolution scale manually
2013-04-23 10:39:59 +08:00
Sergey Shambir
8507f7a386
network: Added PUT and DELETE request types
2013-04-21 20:54:52 +04:00
Sergey Shambir
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
Andrew Goulding
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
minggo
18a345071a
Merge pull request #2375 from billy1380/master
...
fix for issue #2366
2013-04-17 01:48:34 -07:00
James Chen
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
James Chen
4a7bacf0b5
Updating Android.mk.
2013-04-16 18:19:46 +08:00
billy1380
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
Sam Clegg
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
Sam Clegg
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
James Chen
5b2196075a
fixed #1876 : CCScale9Sprite::setColor(...), setOpacity(...) are broken.
2013-04-15 16:37:35 +08:00
James Chen
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
James Chen
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
James Chen
a5d78830db
fixed #1860 : onNodeLoaded will be called twice if ccb was added as a CCBFile.
2013-04-15 10:39:44 +08:00
James Chen
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
James Chen
6c15c75c78
fixed #1862 : CCScrollView::setContainer may cause dangling pointer when NULL is passed into.
2013-04-15 09:52:46 +08:00
James Chen
17599174ad
Fixing an issue of out of bound in CCTableView.cpp.
2013-04-14 11:05:03 +08:00
James Chen
fb0794bef6
fixed #2048 : Fixing compilation errors on linux.
2013-04-10 17:13:19 +08:00
James Chen
3f695d1934
Merge branch 'master' of https://github.com/SevInf/cocos2d-x into SevInf-master
2013-04-10 16:07:54 +08:00
James Chen
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
James Chen
9c563a883f
Fixing a typo.
2013-04-09 18:08:43 +08:00
harikrishnar
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
harikrishnar
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
James Chen
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
zhanghaojie
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
Sergej Tatarincev
1510354568
Support variable cell sizes in CCTableView
2013-04-04 17:57:43 +03:00
Sergej Tatarincev
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
Sergej Tatarincev
380ec78fcd
Allow to set EditBox font name and size separately
2013-04-02 16:31:30 +03:00
sjchao
4690a45f3e
change a method name
...
change method name from isScissorEnable() to isScissorEnabled() in
class CCEGLViewProtocal
2013-03-29 17:19:47 +08:00
tianTian
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
sjchao
f1f31deb98
Fix the display bug when a scrollView nested in another scrollView
2013-03-29 16:05:28 +08:00
tianTian
9144946176
Fix bug: CCControl's touch priority is not set correctly; m_nDefaultTouchPriority is never used;
2013-03-23 12:18:00 +08:00
James Chen
e2e9bc8ce0
Fixing memoryleaks.
2013-03-21 09:00:55 +08:00
James Chen
33fc16261b
Updating blackberry project settings.
2013-03-20 18:34:28 +08:00
Rohan Kuruvilla
19b66049b3
Fixing issues with rotationX, rotationY in CCBuilderReader
2013-03-19 23:43:00 -07:00
Rohan Kuruvilla
54bb643ad3
Adding support for RotationX and RotationY to CCBReader
2013-03-19 23:42:59 -07:00
James Chen
37acbbe4fb
Adding a space for target variable.
2013-03-20 10:44:21 +08:00