James Chen
581ef454eb
Merge pull request #6047 from samuele3hu/develop_test
...
Replace `LabelTTF` and `LabelBMFont` with `Label` for cocosbuild proxy and fix the error that ControlSwitch:create raised.
2014-03-28 18:04:12 +08:00
James Chen
15e584a83c
Merge pull request #6048 from pandamicro/ConstructorAccess2
...
Issue #3897 : Add missed constructors
2014-03-28 18:03:35 +08:00
pandamicro
74a4aa793d
Issue #3897 : Move OrbitCamera constructor into cpp
2014-03-28 18:00:25 +08:00
shujunqiao
9ffb26fdc9
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into cocos-console-test
2014-03-28 17:50:29 +08:00
shujunqiao
27f1ded3cd
add android part in cocos-console-test.
2014-03-28 17:50:07 +08:00
minggo
3e0e2da6b4
Merge pull request #6049 from natural-law/develop
...
Solve the error effect of clipping in cpp-tests & lua-tests.
2014-03-28 17:49:27 +08:00
zhangbin
62183923e8
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2014-03-28 17:46:56 +08:00
pandamicro
26f5107381
Reverse CONSTRUCTOR_ACCESS to protected
2014-03-28 17:45:35 +08:00
zhangbin
338fd43beb
Solve the error effect of clipping in cpp-tests & lua-tests.
2014-03-28 17:45:28 +08:00
pandamicro
5fc8050d9e
Issue #3897 : Add missed constructors
2014-03-28 17:45:06 +08:00
James Chen
5d2c0eef78
Update CHANGELOG [ci skip]
2014-03-28 17:24:15 +08:00
James Chen
9836f11543
Merge pull request #6046 from Dhilan007/develop_label
...
Fixed possible crash if invoking FontAtlasCache::purgeCachedData.
2014-03-28 17:23:24 +08:00
James Chen
8cdd946662
Merge pull request #6045 from CocosRobot/update_lua_bindings_1395994765
...
[AUTO]: updating luabinding automatically
2014-03-28 17:21:03 +08:00
samuele3hu
7ca207f993
Replace `LabelTTF` and `LabelBMFont` with `Label` for cocosbuild proxy and fix the error that ControlSwitch:create raised.
2014-03-28 17:18:41 +08:00
Dhilan007
cb50741f5d
Fixed possible crash if invoking FontAtlasCache::purgeCachedData.
2014-03-28 16:52:48 +08:00
andyque
5a9af407dc
closed #4590 , remove -> property access
2014-03-28 16:41:33 +08:00
cw
2649c5b971
add socket
2014-03-28 16:26:56 +08:00
CocosRobot
07d1a54a92
[AUTO]: updating luabinding automatically
2014-03-28 08:20:29 +00:00
James Chen
5b4d9a4f5a
Update CHANGELOG [ci skip]
2014-03-28 16:17:10 +08:00
James Chen
79d1bc5e88
Merge pull request #6044 from Dhilan007/develop_label
...
fixed getting wrong Rect by LabelTTF(LabelBMFont)::getBoundingBox.
2014-03-28 16:16:03 +08:00
chuanweizhang2013
0d65057116
update runtime
2014-03-28 16:07:29 +08:00
andyque
97883acfb1
closed #4590 , fixed rewind problems
2014-03-28 15:59:04 +08:00
Dhilan007
8ab057550f
fixed got wrong Rect by LabelTTF::getBoundingBox / LabelBMFont::getBoundingBox.
2014-03-28 15:58:28 +08:00
chuanweizhang2013
c016f80f58
fixed no json file bug
2014-03-28 15:45:10 +08:00
chuanweizhang2013
4b691cf7e9
add fileinfo support
2014-03-28 15:06:49 +08:00
James Chen
736362cc22
Merge pull request #6042 from dumganhar/develop
...
Fixed `ExtensionTest/CocoStudioComponentsTest` crash after applying PR #6011 .
2014-03-28 14:56:55 +08:00
James Chen
ecad5ea3ce
Fixed `ExtensionTest/CocoStudioComponentsTest` crash after applying PR #6011 .
2014-03-28 14:55:15 +08:00
James Chen
fd9ab5c4d1
Merge pull request #6039 from Dhilan007/develop_label
...
LabelTTF and LabelBMFont tagged as deprecated
2014-03-28 14:31:11 +08:00
Dhilan007
dd73be16e0
fixed indention.
2014-03-28 14:22:51 +08:00
Dhilan007
898e2136b1
LabelTTF and LabelBMFont tagged as deprecated
2014-03-28 14:18:01 +08:00
James Chen
2fcc141bc3
Merge pull request #6041 from CocosRobot/update_lua_bindings_1395987370
...
[AUTO]: updating luabinding automatically
2014-03-28 14:17:42 +08:00
CocosRobot
bb1b6f96fb
[AUTO]: updating luabinding automatically
2014-03-28 06:17:06 +00:00
James Chen
9090e2015c
Merge pull request #6040 from dumganhar/develop
...
Two fixes: 1) ParticleSystem should also override onExit to unschedule update since in onEnter, it will be scheduled again. Otherwise, it'll trigger an assert.
2) User object has to be released before others, since userObject may have a weak reference of this node. It may invoke node->stopAllAction(); while _actionManager is null if the next line is after CC_SAFE_RELEASE_NULL(_actionManager).
2014-03-28 14:13:02 +08:00
James Chen
e87f6991cf
User object has to be released before others, since userObject may have a weak reference of this node.
...
It may invoke `node->stopAllAction();` while `_actionManager` is null if the next line is after `CC_SAFE_RELEASE_NULL(_actionManager)`.
2014-03-28 14:09:51 +08:00
James Chen
c266647447
ParticleSystem should also override `onExit` to unschedule update since in `onEnter`, it will be scheduled again. Otherwise, it'll trigger an assert.
2014-03-28 14:05:38 +08:00
pandamicro
65f4c23004
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2014-03-28 13:56:09 +08:00
shujunqiao
411bb95025
add [director end] command's explain in CCConsole.cpp.
2014-03-28 13:50:06 +08:00
shujunqiao
ff4b83813c
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into cocos-console-test
2014-03-28 13:41:18 +08:00
shujunqiao
fb780f82da
add [director end] command in CCConsole.cpp.
2014-03-28 13:40:24 +08:00
James Chen
58bb5116ee
Merge pull request #6038 from CocosRobot/update_lua_bindings_1395977547
...
[AUTO]: updating luabinding automatically
2014-03-28 11:51:28 +08:00
chuanweizhang2013
5aa3a5d956
update socket rules
2014-03-28 11:37:17 +08:00
CocosRobot
ceda1b9a9a
[AUTO]: updating luabinding automatically
2014-03-28 03:33:44 +00:00
James Chen
095ec8af80
Update CHANGELOG [ci skip]
2014-03-28 11:32:35 +08:00
James Chen
b26a5837cb
Update AUTHORS [ci skip]
2014-03-28 11:31:13 +08:00
James Chen
5c77b4d4b1
Merge pull request #6011 from DarraghCoy/event_listener_crash_fixes
...
closed #4586 : Fix crashes in event dispatch other related safety checks/fixes
2014-03-28 11:28:41 +08:00
minggo
688ac51546
Merge pull request #6036 from Dhilan007/develop_label
...
fixed got wrong Rect by Label::getBoundingBox.
2014-03-28 11:18:50 +08:00
Darragh Coy
0f729126f0
Find another instance where we should null out the node pointer for the current listener after it has been disassociated with the node.
2014-03-27 20:11:37 -07:00
Dhilan007
3da695b184
fixed got wrong Rect by Label::getBoundingBox.
2014-03-28 11:03:39 +08:00
minggo
2c1eb04124
[ci skip]
2014-03-28 10:45:45 +08:00
minggo
b607172e57
Merge pull request #6035 from Dhilan007/develop_label
...
Remove the old implementation of LabelBMFont.
2014-03-28 10:32:04 +08:00