Ricardo Quesada
|
d35cc3b0fa
|
Merge branch 'develop' into clone_reverse_fixes
Conflicts:
cocos2dx/actions/CCAction.cpp
cocos2dx/actions/CCActionEase.cpp
cocos2dx/actions/CCActionGrid.cpp
cocos2dx/actions/CCActionInstant.cpp
cocos2dx/actions/CCActionInterval.cpp
scripting/javascript/bindings/generated
|
2013-06-18 09:59:34 -07:00 |
Ricardo Quesada
|
e40adb7ae7
|
EaseActions and more
Added more reverse() const
|
2013-06-15 12:38:32 -07:00 |
James Chen
|
c0d44cb2e4
|
fixed #2129: Rename m_iVar to _var, remove CC prefixes.
|
2013-06-15 14:03:30 +08:00 |
billy1380
|
a1753113b5
|
CCLens3d can be concave
added boolean operator to enable the lens to be concave as well as
convex
|
2013-02-16 03:12:12 +00:00 |
James Chen
|
bb486af6a7
|
Added stackable action support. Exchanged the order of action.
|
2012-12-26 18:59:31 +08:00 |
minggo
|
a75f8b7e7a
|
fixed #1593:remove all deprecated methods expect CCBAnimationManager
|
2012-12-06 18:51:33 +08:00 |
Walzer
|
9eab0c19f8
|
add groups to all classes for doxygen
|
2012-06-20 18:09:11 +08:00 |
James Chen
|
24e3ec7499
|
fixed #1336: Updated comment information for deprecated apis.
|
2012-06-20 14:31:36 +08:00 |
James Chen
|
b818c0afa6
|
fixed #1336: Used CC_DEPRECATED_ATTRIBUTE macro to mark deprecated interfaces.
|
2012-06-20 11:48:31 +08:00 |
James Chen
|
7fe3f7357e
|
issue #1324: Reverted old interfaces.
|
2012-06-14 17:18:05 +08:00 |
James Chen
|
3f7b44fc23
|
issue #1324: Added create() for static member functions that new an autorelease object
|
2012-06-14 15:13:16 +08:00 |
James Chen
|
bd535c3c1c
|
issue #1310: Fixed a bug that 3d effect can't be displayed correctly in retina mode.
|
2012-06-11 11:53:17 +08:00 |
minggo
|
cc16320445
|
issue #1310: syncronize actions
|
2012-06-08 13:55:28 +08:00 |
James Chen
|
0f36a89c7e
|
issue #1188: Refactor directory. Compile successfully on android and win32(vs2008 debug).
|
2012-04-25 16:18:04 +08:00 |