James Chen
d9c19ab26b
[WIN32]Fixing compilation errors for TestJavascript and WatermelonWithMe.
2013-03-17 10:43:56 +08:00
James Chen
b5d3de0104
Merge pull request #2177 from dumganhar/iss1836-jsb-scheduler
...
fixed #1836 : JS target of "cc.Scheduler().scheduleCallbackForTarget" should not depend on CCNode or its subclass.
2013-03-16 06:35:34 -07:00
James Chen
3aeb22292b
Reverting ccarray_to_jsval.
2013-03-16 21:23:33 +08:00
James Chen
09757428e7
fixed #1836 : JS target of "cc.Scheduler().scheduleCallbackForTarget" should not depend on CCNode or its subclass.
2013-03-16 21:14:39 +08:00
James Chen
2fbd09fe27
Merge pull request #2172 from dumganhar/master
...
Updating VS2012 solution, CystalCraze project depends on libJSBinding and libExtensions.
2013-03-15 07:25:17 -07:00
James Chen
529e65787a
Fix the crash CrystalCraze, we should check whether the arr parameter is valid for ccarray_to_jsval.
2013-03-15 22:22:44 +08:00
James Chen
ce26f2329d
Updating VS2012 solution, CystalCraze project depends on libJSBinding and libExtensions.
2013-03-15 22:17:38 +08:00
James Chen
be5791a0ec
Merge pull request #2170 from CocosRobot/updategeneratedsubmodule_1363319835
...
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-14 20:59:07 -07:00
CocosRobot
da16e7d2ff
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-15 11:57:26 +08:00
James Chen
e7379bf99f
Merge pull request #2169 from dumganhar/master
...
Updating the submodule of cxx-generator to the latest one.
2013-03-14 20:55:55 -07:00
James Chen
92d0e1c983
Uncommenting jsb_CCEditBox_prototype, updating the submodule of cxx-generator to the latest one.
2013-03-15 11:53:56 +08:00
James Chen
ba71432dea
Merge pull request #2168 from CocosRobot/updategeneratedsubmodule_1363318521
...
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-14 20:42:06 -07:00
CocosRobot
5ee810c535
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-15 11:35:51 +08:00
James Chen
d9ee848246
Update AUTHORS
2013-03-15 10:38:11 +08:00
James Chen
9a5116e406
Merge pull request #2167 from Weeds/feature-linux-fontdimensions
...
fixed #1834 : [Linux] fixed font rendering artifacts, added simple line break.
This patch fixed the size calculations for true type fonts (especially for
italic fonts)
Additinally a very simple greedy line break algorithm has been added for
true type labels.
2013-03-14 19:35:20 -07:00
James Chen
8924eaf34e
Update AUTHORS
2013-03-15 10:09:24 +08:00
James Chen
7326df875e
Merge pull request #2154 from jedy/fix_ccnode_doc
...
fix: can't generate CCNode.h's document with doxygen 1.8.3
2013-03-14 19:06:58 -07:00
Andre Rudlaff
e8ee3a9b83
[Linux] fixed font rendering artifacts, added simple line break
...
This patch fixed the size calculations for true type fonts (especially for
italic fonts)
Additinally a very simple greedy line break algorithm has been added for
true type labels.
2013-03-15 00:24:25 +01:00
James Chen
3a2d78a72b
Merge pull request #2166 from dumganhar/master
...
Temporarily comment `jsb_CCEditBox_prototype` to make jsb projects compiled ok, because the server of auto generating jsbinding has some issues now.
2013-03-14 08:25:25 -07:00
James Chen
ae2f2e2f0e
Temporarily comment `jsb_CCEditBox_prototype` to make jsb projects compiled ok, because the server of auto generating jsbinding has some issues now.
2013-03-14 23:23:52 +08:00
James Chen
8422a6ea17
Merge pull request #2165 from dumganhar/master
...
fixed #1830 : Casting `unsigned short*` to `jschar*` where invoking `cc_utf8_to_utf16`.
2013-03-14 05:41:49 -07:00
James Chen
911f607484
Tabs ~> 4 spaces
2013-03-14 20:38:52 +08:00
James Chen
293e17494d
fixed #1830 : Force casting `unsigned short*` to `jschar*` for `cc_utf8_to_utf16`.
2013-03-14 20:34:54 +08:00
minggo
3bef9cc749
Merge pull request #2159 from DarraghCoy/add_ccset_create
...
Add CCSet::create() function
2013-03-14 03:21:17 -07:00
minggo
2cfcff0b1a
Merge pull request #2157 from kevinxuewei/patch-1
...
Update make-all-linux-project.sh
2013-03-14 03:20:16 -07:00
James Chen
d783715c18
Merge pull request #2164 from dumganhar/iss1824-editbox-js
...
fixed #1824 : Exposed cc.EditBox to js and refactored ScriptingCore::executeFunctionWithOwner
2013-03-14 03:19:45 -07:00
minggo
f80318cc8d
Merge pull request #2163 from minggo/iss1803-spritetest-lua
...
add some lua test cases
2013-03-14 03:18:41 -07:00
minggo
ee846c3248
Merge https://github.com/cocos2d/cocos2d-x into iss1803-spritetest-lua
2013-03-14 18:14:57 +08:00
James Chen
3e33868a63
fixed #1824 : Exposed cc.EditBox to js.
2013-03-14 18:14:16 +08:00
minggo
7c8de5aebe
issue #1803:add SpriteOffsetAnchorFlip
2013-03-14 18:14:01 +08:00
minggo
5936f4db2c
issue #1803:add SpriteBatchNodeOffsetAnchorRotationalSkewScale
2013-03-14 17:45:21 +08:00
minggo
e47baa7984
issue #1803:add SpriteBatchNodeOffsetAnchorSkewScale
2013-03-14 15:49:20 +08:00
minggo
815733e0b7
issue #1803:add SpriteOffsetAnchorRotationalSkewScale
2013-03-14 15:11:55 +08:00
James Chen
384ec64a88
Update AUTHORS
2013-03-14 14:51:07 +08:00
James Chen
4d8fa8973e
Merge pull request #2161 from dumganhar/iss1825-ios-editbox
...
fixed #1825 : Using CCLabelTTF to show text for CCEditBox of iOS port.
2013-03-13 23:48:02 -07:00
James Chen
0a0796b572
fixed #1825 : Fixing compilation errors for CCEditBox of win32 port.
2013-03-14 14:39:59 +08:00
minggo
0fe38f073c
issue #1803:add SpriteOffsetAnchorSkewScale
2013-03-14 14:35:33 +08:00
James Chen
edc02b5777
fixed #1825 : The default color of text on CCEditBox is WHITE now. Fixed issues for CCEditBox of MAC port.
2013-03-14 14:29:22 +08:00
minggo
d18a664e08
issue #1803:handle onExit event to release resources
2013-03-14 11:53:34 +08:00
James Chen
cf999be928
Merge branch 'master' of https://github.com/neokim/cocos2d-x into ios-editbox
2013-03-14 11:30:41 +08:00
James Chen
cce4733f31
Merge pull request #2160 from CocosRobot/updategeneratedsubmodule_1363231211
...
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-13 20:22:40 -07:00
CocosRobot
0b828a67c7
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-14 11:20:23 +08:00
James Chen
a57cc21d7a
Merge pull request #2156 from dumganhar/iss1830-jsb-utf8
...
fixed #1830 : Using JS::CompileOptions::setUTF8(true) to compile script.
2013-03-13 19:59:25 -07:00
Darragh Coy
55dd6a6129
Add CCSet::create() to create, autorelease and return a new empty set.
2013-03-13 10:58:24 -07:00
kevinxuewei
94bbd169c8
Update make-all-linux-project.sh
...
fix bug for auto install 'MISSING' pkg
2013-03-13 22:38:35 +08:00
James Chen
29aa62d923
fixed #1830 : Using JS::CompileOptions::setUTF8(true) to compile script.
2013-03-13 18:10:54 +08:00
minggo
58117a6aaf
Merge pull request #2155 from minggo/iss1803-spritetest-lua
...
refactor lua test cases
2013-03-13 02:49:46 -07:00
minggo
6507a7fd7f
Merge https://github.com/cocos2d/cocos2d-x into iss1803-spritetest-lua
2013-03-13 17:47:04 +08:00
minggo
e82074eb4f
issue #1803:refactor lua codes
2013-03-13 17:45:09 +08:00
wu.hao
521fac290d
fix: can't generate CCNode.h's document with doxygen 1.8.3
2013-03-13 14:56:17 +08:00