samuele3
eb3f5eb629
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTableView
2013-11-22 11:52:32 +08:00
samuele3
192deb7952
issue #3228 : Reconstruct the Callfunc create method to support std::function and add callFuncND + auto remove lua test case
2013-11-22 11:51:07 +08:00
minggo
4582686860
Merge pull request #4347 from samuele3hu/developTableView
...
[ci skip]Add doxygen comments for the CocoStudio
2013-11-20 21:55:34 -08:00
Ricardo Quesada
6a8c4784a4
Adds some #pragma mark love
2013-11-20 11:26:33 -08:00
James Chen
bffc5bb4d5
Merge pull request #4348 from boyu0/iss2771_physical
...
issue #2771 : physical bug fix.
2013-11-20 00:24:07 -08:00
boyu0
1743826498
issue #2771 : fix a careless mistake
2013-11-20 16:08:48 +08:00
boyu0
bde6f5d9eb
issue #2771 : fix crash bug
2013-11-20 15:54:09 +08:00
samuele3
07ea8647c3
Add doxygen comments for the CocoStudio
2013-11-20 15:07:34 +08:00
samuele3
3ed7a79a84
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTableView
2013-11-20 13:01:07 +08:00
CocosRobot
54ef1d6c15
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-20 04:24:55 +00:00
samuele3
8a408f9951
Add doxygen comments for the CocoStudio
2013-11-20 12:04:47 +08:00
James Chen
59c2647bd6
Prevents warning of invoking ScrollView::setTouchEnabled. Layer::setTouchEnabled should not be a virtual function.
2013-11-20 11:35:04 +08:00
James Chen
da8c34d994
Fix of unsigned / signed mismatch in UIPageView.cpp.
2013-11-20 11:20:35 +08:00
James Chen
6b579ebe5e
Don't deprecate callback functions in Layer. Reason:
...
Callback function should not be deprecated, it will generate lots of warnings.
Since 'setTouchEnabled' was deprecated, it will make warnings if developer overrides onTouchXXX and invokes setTouchEnabled(true) instead of using EventDispatcher::addEventListenerWithXXX.
2013-11-20 11:19:51 +08:00
James Chen
93333ad252
Merge pull request #4340 from Dhilan007/jssubmodule
...
recover controller on layer.
2013-11-19 18:49:07 -08:00
James Chen
3c783d2e28
Merge pull request #4344 from dumganhar/develop
...
Fixing warning generated by VS2012.
2013-11-19 18:43:14 -08:00
Dhilan007
bd3789e0b5
add miss api
2013-11-20 10:40:43 +08:00
James Chen
424431690a
Fixing warning generated by VS2012.
2013-11-20 10:39:30 +08:00
Dhilan007
0646e59bf3
resolve conflict
2013-11-20 10:26:00 +08:00
boyu0
c945fbd42c
issue #2771 : add some warning log
2013-11-20 10:25:43 +08:00
James Chen
60ed1dcd3a
Merge pull request #4341 from Dhilan007/touchfix
...
fix touches not working in cocosbuilder
2013-11-19 18:20:42 -08:00
Dhilan007
02c69a5c6a
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bind_studio
2013-11-20 09:57:50 +08:00
Ricardo Quesada
0d750cdbaf
Adds virtual destructors on Interfaces
...
Classes with at least one virtual function needs a virtual destructor.
This patch adds virtual destructors to Interface classes
And also enables 'warn on missing virtual destructors'
2013-11-19 16:57:23 -08:00
Ricardo Quesada
582afe3b61
Fixes warnings in CCLabel
...
These warnings were introduced yesterday.
Since we are paying attention to the warnings, new code MUST NOT
generate new warnings.
2013-11-19 13:51:40 -08:00
Dhilan007
948410c7b5
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bind_studio
2013-11-19 19:33:26 +08:00
Dhilan007
23f36e0406
fix touches not working in cocosbuilder
2013-11-19 19:24:04 +08:00
boyu0
aec514e3a2
issue #2771 : fix collision bug cause by dynamic/static cast.
2013-11-19 18:30:12 +08:00
CocosRobot
d8ec58831a
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-19 09:40:27 +00:00
Dhilan007
dc42645afe
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bind_studio
2013-11-19 16:49:28 +08:00
Dhilan007
3929e6070d
fix error form overrides a 'final' function
2013-11-19 16:27:09 +08:00
Dhilan007
c307d83b35
add miss Deprecated api
2013-11-19 16:06:27 +08:00
Dhilan007
1a65af9d1a
fix warn
2013-11-19 15:54:54 +08:00
Dhilan007
f0ab3f9ca1
fix some error in layer controller code
2013-11-19 15:41:22 +08:00
Dhilan007
0586c4d275
recover controller on layer.
2013-11-19 13:56:30 +08:00
minggo
594450e3f7
Merge pull request #4330 from CocosRobot/updategeneratedsubmodule_1384833055
...
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-18 19:52:09 -08:00
CocosRobot
0855ff0841
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-19 03:50:57 +00:00
minggo
2848e0dc3e
Merge pull request #4328 from 2youyouo2/develop
...
[ci skip]update armature
2013-11-18 19:46:29 -08:00
2youyou2
d5478f1ca2
fix if last frame has tween effect, armature may display wrong
2013-11-19 11:44:17 +08:00
minggo
bd00e6fabb
Merge pull request #4326 from dabingnn/develop_hotFix
...
[ci skip]Develop hot fix
2013-11-18 19:33:07 -08:00
Huabing.Xu
1fc928df41
HotFix: use static cast for format conversion
2013-11-19 11:32:12 +08:00
yinkaile
f308f2f95a
fix CCArmature display wrong on mac version
2013-11-19 11:22:40 +08:00
Huabing.Xu
49f34c5339
HotFix: fix CCB particle alpha blend-> setBlendAddictive after set texture
2013-11-19 11:19:12 +08:00
Huabing.Xu
fff851a8aa
HotFix: change tab to space
2013-11-19 11:17:02 +08:00
Huabing.Xu
458b9b53da
HotFix: fix CCB particle alpha blend
2013-11-19 11:16:14 +08:00
minggo
1e8a3fc92f
Merge pull request #4322 from dabingnn/develop_hotFix
...
[ci skip]HotFix: fix bug spine alpha blend error
2013-11-18 18:54:16 -08:00
minggo
fb2c2ec7f2
Merge pull request #4323 from Dhilan007/jssubmodule
...
[ci skip]fix miss bind setGrid\getGrid for JS.
2013-11-18 18:53:51 -08:00
minggo
8e7cce8cea
Merge pull request #4324 from CocosRobot/updategeneratedsubmodule_1384828843
...
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-18 18:53:06 -08:00
Huabing.Xu
69b38f6e40
HotFix: change tab to space
2013-11-19 10:42:37 +08:00
CocosRobot
186b6fd98b
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-19 02:40:44 +00:00
minggo
78f2e0982e
Merge pull request #4319 from liamcindy/develop
...
[ci skip]fixed ui anmation crash when stop animation for develop branch
2013-11-18 18:34:16 -08:00