Lee, Jae-Hong
d66abaa12c
Implementing Termination.
2013-05-16 19:57:47 +09:00
Lee, Jae-Hong
3856c94416
Modify header define.
2013-05-16 19:57:17 +09:00
Lee, Jae-Hong
ab8ede5ff8
Adding Osp Application, Osp Form Layer and implementing CCEGLView.
2013-05-16 19:55:26 +09:00
Lee, Jae-Hong
112ff3c820
Adding manifest.xml.
2013-05-16 19:55:00 +09:00
Lee, Jae-Hong
e286759965
Adding placeholder.txt
2013-05-16 19:54:38 +09:00
Lee, Jae-Hong
86bf779812
Adding third party headers and x86 libraries for Tizen.
2013-05-16 19:54:01 +09:00
Lee, Jae-Hong
58b181736d
Adding platform code for Tizen.
2013-05-16 19:53:37 +09:00
Lee, Jae-Hong
690e383950
Adding HelloCpp sample for Tizen.
2013-05-16 19:52:59 +09:00
Lee, Jae-Hong
27428dc5f4
Adding defines and enums for Tizen.
2013-05-16 19:49:16 +09:00
James Chen
3b40dce1c2
Merge pull request #2569 from flaming0/patch-2
...
Update CCTexture2D.cpp [ci skip]
2013-05-16 03:11:01 -07:00
flamingo
3686107313
Update CCTexture2D.cpp
...
Fixed compilation error on MSVC compiler
2013-05-16 12:58:35 +04: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
Carsten Sandtner
6e43618004
MinXMLHttpRequest extends from CCObject
...
Added MinXMLHttpRequest to Android.mk for Bindings
Added newline at header as compiler threw a warning.
2013-05-16 10:11:00 +02:00
minggo
245cf4b3d9
Update AUTHORS
...
[ci ignore]
2013-05-16 14:50:27 +08: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
e45e08547b
Update AUTHORS
...
[ci ignore]
2013-05-16 14:37:40 +08:00
minggo
1412eeefd1
Merge pull request #1893 from martell/mingw
...
Added Mingw-crt Support without breaking VS SDK
2013-05-15 23:30:43 -07:00
minggo
52fdd8ab08
Merge pull request #2568 from natural-law/master
...
New plugin weibo & resolve bug in plugin
2013-05-15 23:04:56 -07:00
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
James Gregory
d1922b6086
Add experimental (and currently disabled) code for using SDL to load texture data. If I can iron out the kinks, it should be a lot faster.
2013-05-15 20:22:43 -07:00
James Gregory
bdbab7f5cf
TTF rendering via SDL now seems to basically work. Not perfect yet, but seems to be about 3X faster on Chrome.
2013-05-15 20:21:30 -07:00
James Gregory
82f1a8e8ff
Re-enable mouse-handling.
2013-05-15 20:21:02 -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