James Chen
ec6e49e2ea
Merge pull request #3162 from dumganhar/develop
...
issue #2404 : [JSB] Mark cc.Action.copy and cc.Animation.copy as deprecated methods.
2013-07-15 23:45:35 -07:00
James Chen
c813ff4b02
issue #2404 : Mark cc.Action.copy and cc.Animation.copy as deprecated methods.
2013-07-16 14:43:20 +08:00
James Chen
a9b1ac829f
Update AUTHORS [ci skip]
2013-07-16 14:01:02 +08:00
James Chen
2ed5a40a36
Merge pull request #3146 from tks2shimizu/develop
...
closed 2408: Add componentsSeparatedByString function for String class.
2013-07-15 23:00:12 -07:00
James Chen
196aa59f37
Update AUTHORS [ci skip]
2013-07-16 13:44:05 +08:00
James Chen
570240a75f
Merge pull request #3145 from jdmunro/jsb-distancesq
...
Added JSB support for ccpDistanceSQ
2013-07-15 22:42:37 -07:00
James Chen
388fb08e28
Update AUTHORS [ci skip]
2013-07-16 13:37:53 +08:00
James Chen
92d6fbddd3
Merge pull request #3156 from colesbury/js_log
...
Ignore formatting specifiers in JavaScript log messages.
2013-07-15 22:36:13 -07:00
samuele3hu
e593956c38
issue #2377:Modify solution config
2013-07-16 13:26:37 +08:00
James Chen
18ba3e27d3
Merge pull request #3161 from CocosRobot/updategeneratedsubmodule_1373951450
...
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-15 22:13:36 -07:00
CocosRobot
c956385841
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-16 05:10:52 +00:00
James Chen
13e939b55e
Merge pull request #3157 from ricardoquesada/override_love
...
closed 2407: Adds more readability to the class internals.
2013-07-15 22:05:33 -07:00
samuele3hu
1761669832
issue #2377:Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandlerMgr
2013-07-16 12:47:40 +08:00
James Chen
72d1a074df
Updating travis-script/before-install.sh, install gcc4.7 when build linux port.
2013-07-16 11:58:08 +08:00
James Chen
81d8b08e9e
Merge pull request #3160 from CocosRobot/updategeneratedsubmodule_1373942764
...
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-15 20:13:19 -07:00
CocosRobot
5ce0e0df50
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-16 02:46:07 +00:00
James Chen
14976a92d6
Update AUTHORS [ci skip]
2013-07-16 10:42:38 +08:00
James Chen
b11000908e
Merge pull request #3155 from pktangyue/patch
...
issue #2406 : Override updateDisplayedColor and updateDisplayedOpacity method in Scale9Sprite class.
Resolved issue: Color and Opacity of Scale9Sprite will not be changed when it's added to NodeRGBA and run with FadeIn/Out actions.
2013-07-15 19:40:29 -07:00
James Chen
e52ae63268
Merge pull request #3159 from CocosRobot/updategeneratedsubmodule_1373942008
...
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-15 19:34:48 -07:00
CocosRobot
c2fc2219f5
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-16 02:33:31 +00:00
James Chen
dd5a745626
Merge pull request #3158 from dumganhar/deprecated-func
...
closed 2405: Updating bindings-generator, bindings-generator should not bind deprecated methods.
2013-07-15 19:27:22 -07:00
James Chen
62b12cbe82
Updating jsb_deprecated.js.
2013-07-16 10:14:52 +08:00
James Chen
de4b231264
closed #2405 : Updating bindings-generator, Bindings-generator should not bind deprecated methods.
2013-07-16 10:04:03 +08:00
James Chen
ebf382b02f
issue #2405 : Removing deprecated methods in 'skip' section in cocos2dx.ini since bindings-generator will not bind deprecated methods now.
2013-07-16 10:03:25 +08:00
James Chen
a36a4bf19b
issue2405: Adding jsb_deprecated.js for the compatibility of deprecated variables and methods.
2013-07-16 10:02:02 +08:00
samuele3hu
c955a559bf
issue #2377:Del register/unregister function in .cpp and .h files
2013-07-16 09:55:06 +08:00
Ricardo Quesada
f9268c8054
small API changes
...
::create()
and const chars
2013-07-15 14:35:25 -07:00
Ricardo Quesada
9958e0d7f9
Adds more readability to the class internals.
...
Changes:
- creator (static) methods, and singleton methods (static) are always at the top of the class
- Constructors, destructros, and init methods comes next
- Then the instance methods for the class
- Then the overriden methods
- and finally the ivars
Also, overriden methos have the "override" context keyword
2013-07-15 12:43:22 -07:00
Sam Gross
903b63abaf
Ignore formatting specifiers in JavaScript log messages.
2013-07-15 15:10:02 -04:00
pktangyue
652f679d50
override updateDisplayedColor and updateDisplayedOpacity method in Scale9Sprite class
2013-07-15 20:13:30 +08:00
pktangyue
6bb2d64f19
add S9CascadeOpacityAndColor test
2013-07-15 20:13:30 +08:00
minggo
93e75bad9f
Merge pull request #3154 from minggo/add-deprecated-header
...
Add deprecated header
2013-07-15 03:20:32 -07:00
minggo
bee3b60b5a
Merge branch 'add-deprecated-header' of https://github.com/minggo/cocos2d-x into add-deprecated-header
2013-07-15 17:52:20 +08:00
minggo
cb271e21d8
issue #2404:fixed some compiling warnings
2013-07-15 17:51:36 +08:00
minggo
dc2daf31ea
issue #2404:fixed some compiling errors
2013-07-15 17:29:35 +08:00
minggo
07ae0c6da2
issue #2404:remove unneeded files
2013-07-15 17:18:30 +08:00
James Chen
a86696ac0d
Merge pull request #3152 from CocosRobot/updategeneratedsubmodule_1373879025
...
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-15 02:06:25 -07:00
CocosRobot
00052e8f4f
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-15 09:03:47 +00:00
James Chen
17a6b58f11
Merge pull request #3151 from dumganhar/iss2397-getInstance
...
issue #2397 : Application::sharedApplication --> Application::getInstance and mark Application::sharedApplication as deprecated function.
2013-07-15 01:58:37 -07:00
minggo
b97ea0815f
issue #2404:re-add some global functions and variables and mark them as deprecated
2013-07-15 16:42:31 +08:00
James Chen
3bdf6b9c69
issue #2397 : Mark Application::sharedApplication as deprecated function.
2013-07-15 16:37:38 +08:00
James Chen
a83cc0ff69
issue #2397 : Updating LUA bindings.
2013-07-15 16:25:46 +08:00
James Chen
759831c1d8
issue #2397 : Application::sharedApplication --> Application::getInstance.
2013-07-15 16:24:42 +08:00
minggo
eada29ee40
issue #2404:created CCDprecated.h and move all global functions and variables into it
2013-07-15 16:14:26 +08:00
James Chen
52160e1c40
Merge pull request #3149 from dumganhar/iss2403-progresstimer
...
closed 2403: Reverting commit 239323c to fix the bug that Tint and Fade action can't work for ProgressTimer.
2013-07-15 01:11:43 -07:00
James Chen
39fc98d7fb
issue #2403 : Removing unused implemented methods like setOpacityModifyRGB, isOpacityModifyRGB since they're defined in their super class.
2013-07-15 16:08:42 +08:00
James Chen
b6f78b257f
closed #2403 : Reverting commit 239323c to fix the bug that Tint and Fade action can't work for ProgressTimer.
2013-07-15 16:06:59 +08:00
James Chen
c937824051
Update AUTHORS [ci skip]
2013-07-15 11:54:43 +08:00
James Chen
a6a237c017
Merge pull request #3144 from jllust/Fix#2354
...
closed 2401: CCLabelBMFont crashes in glDrawElements of CCTextureAtlas::drawNumberOfQuads sometimes
2013-07-14 20:53:15 -07:00
James Chen
0b6f09f08f
Update AUTHORS [ci skip]
2013-07-15 11:42:07 +08:00