Martin Taylor
62e36e8006
fix typos and syntax error. A thorough check by tool VSSpellChecker.
2015-09-22 16:08:23 +08:00
江龙
badd80bf3a
support custom action, and rewrite update function
...
support custom action in js, and developer can rewrite the update function in custom action class.
useage:
// custom action sample code
var customMoveBy = cc.MoveBy.extend({
ctor:function (duration, deltaPos, deltaY) {
this._super(duration, deltaPos, deltaY);
},
update:function (dt) {
this._super(dt);
if (this.getTarget()) { // rand color
this.getTarget().setColor(cc.color(cc.rand()%255, cc.rand()%255, cc.rand()%255));
}
}
});
2015-09-09 10:08:07 +08:00
andyque
91dfb07a8c
add more descriptive message to ASSET macro.
2015-07-14 15:28:36 +08:00
WenhaiLin
dee13756ec
Add Animate:getCurrentFrameIndex
2015-07-13 10:40:43 +08:00
Vincent Yang
1abeb8bf1e
Fixbug: CCTargetedAction executes callback twice.
2015-07-03 15:42:49 +08:00
pandamicro
0866180918
Merge pull request #12162 from namezero111111/patch-4
...
JumpTo::clone() results in incorrect end position
2015-06-16 13:37:04 +08:00
子龙山人
0b5c7d74b7
Merge pull request #12160 from namezero111111/patch-3
...
Blink::stop() access violation
2015-06-16 10:27:38 +08:00
Namezero
19f95c5542
TintBy::clone() incorrect cast
...
TintBy::clone() incorrectly casts the GLshort members to GLubyte, resulting in an object that isn't a clone and an incorrect tint.
2015-06-04 10:13:34 +02:00
Namezero
c09e280b58
JumpTo::clone() results in incorrect end position
...
JumpTo::clone() passes incorrect value to (_delta) to create() rather than _endPosition
2015-06-03 13:14:11 +02:00
Namezero
89915a084c
Blink::stop() access violation
...
Blink::stop() is calles twice when inside a Repeat action. This results in an access violation
2015-06-03 12:39:16 +02:00
Dale Stammen
351a898a70
removed CC_PLATFORM_WP8
2015-05-08 09:19:13 -07:00
minggo
fb112995d8
Merge pull request #11491 from milos1290/tween
...
Adding FloatAction to animate any property over time.
2015-05-07 09:34:44 +08:00
Milos Jakovljevic
0343fd4061
Changing the name of the Action, adding more comments
2015-04-28 11:48:19 +02:00
Vladimir Perminov
4c33050536
Optimize Vec2
...
small function Vec2 move to Vec2.inl
Added:
setZero();
Change all code:
_vec2 = Vec2(x, y); -> _vec2.set(x, y);
Vec2 vec2 = Vec2(x, y); -> Vec2 vec2(x, y);
_vec2 += Vec2(x, y); -> _vec2.add(x, y);
_vec2 = Vec2::ZERO; -> _vec2.setZero();
Vec2 vec2(Vec2::ZERO); -> Vec2 vec2;
2015-04-19 20:40:52 +03:00
Milos Jakovljevic
a13c519882
Adding FloatAction to animate any property over time.
2015-04-18 14:35:14 +02:00
Jacky
605ce58293
disable MoveTo::reverse()
2015-03-11 09:55:32 +08:00
Mircea Rila
2a235f5b8d
add Color3B type parameter to TintTo::create
2015-01-14 11:04:23 +02:00
Jun Hiroe
e4d560b658
Replace tabs with spaces in cocos/2d dir
2015-01-08 20:17:45 +09:00
Wenhai Lin
8524a5fb97
Improve performance of physics
2015-01-07 17:08:04 +08:00
ton
a445148a5e
fix problem : JumpTo position is changed each repeat.
...
example:
sprite->runAction(
RepeatForever::create(
Sequence::create(
JumpTo::create(1, Vec2(300, 200), 100, 2),
MoveTo::create(1, Vec2(100, 200)),
nullptr
)
)
);
2015-01-03 01:13:57 +09:00
minggo
feacf75f12
Merge pull request #9575 from minggo/MoveTo-MoveBy-support-v3
...
#9555 MoveTo and MoveBy support Vec3
2014-12-22 15:57:12 +08:00
minggo
1268f73a7c
MoveTo and MoveBy support Vec3
2014-12-22 14:34:35 +08:00
joewanchen
7d6686eb7b
fix.
2014-12-21 00:42:55 +08:00
joewanchen
fc69dabca2
fix serious performance problem.
2014-12-21 00:22:23 +08:00
Ricardo Quesada
9082ca18c3
Platform fixed
2014-09-09 16:50:02 -07:00
Ricardo Quesada
c149bfca00
Adds MARK: TODO: FIXME: in code
...
Replaces XXX with FIXME:
Xcode 6 beta 4 supports this new format
2014-08-29 12:54:24 -07:00
Ricardo Quesada
3dda35b4ef
Adds `std::nothrow` to `new`
...
Since cocos2d-x doesn't support exceptions, it is important to add
`std::nothrow` to all the `new` statements
2014-08-27 16:31:57 -07:00
minggo
b9c51e6994
remove unneeded codes
2014-08-26 18:19:28 +08:00
maltium
baba808391
RotateBy action now uses just Vec3() to keep track of the state
2014-07-31 23:28:33 +02:00
maltium
98354e9f8e
RotateTo action now uses Vec3() to keep track of the state
2014-07-31 23:05:58 +02:00
maltium
3d44439e2a
added 3D rotation support to the RotateTo action
2014-07-30 21:42:47 +02:00
boyu0
91126341bd
fix transform for physics.
2014-06-27 17:30:21 +08:00
boyu0
c40c461848
closed #5541 : add warning code and comment.
2014-06-23 13:55:52 +08:00
boyu0
2fc8889791
issue #5541 : change RotateTo/RotateBy for Physics.
2014-06-20 18:40:21 +08:00
yangxiao
927d29f334
bug on Repeat when diff bigger than duration
2014-06-16 18:21:47 +08:00
minggo
2e7865a4f6
coding style fix
2014-05-28 17:41:34 +08:00
Ishiguro Yusuke
90cea76008
Fix Repeat will run one more over in rare situations
2014-05-22 15:59:47 +09:00
Ricardo Quesada
dc711643cd
Squashed commit of the following:
...
commit a9572b8913f3a38b59adbd7b4017ab9848a6b2b5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed May 14 10:03:44 2014 -0700
math renames
`Vector2` -> `Vec2`
`Vector3` -> `Vec3`
`Vector4` -> `Vec4`
`Matrix` -> `Mat4`
commit 4e107f4bd854c26bfceb52b063d6bd9cea02d6a3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:24:28 2014 -0700
raw version of rename Vector3
commit 1d115573ebe96a5fc815fa44fbe6417ea7dba841
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:07:14 2014 -0700
rename Vector2 after merge
commit ab2ed58c129dbc30a4c0970ed94568c5d271657b
Merge: 1978d2d 86fb75a
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:05:30 2014 -0700
Merge branch 'v3' into v3_renameMathClassName
Conflicts:
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.cpp
commit 1978d2d174877172ccddc083020a1bbf43ad3b39
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 08:51:45 2014 -0700
rename vector2 in tests/cpp-empty-test folder
commit d4e0ff13dcce62724d2fece656543f26aa28e467
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:58:23 2014 -0700
rename vector2 in tests/cpp-tests cpp files
commit be50ca2ec75e0fd32a6fcdaa15fe1ebb4cafe79f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:52:57 2014 -0700
rename vector2 in tests/cpp-tests head files
commit 6daef564400d4e28c4ce20859a68e0f583fed125
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:49:48 2014 -0700
rename vector2 in extension folder
commit 8f3f0f65ceea92c9e7a0d87ab54e62220c5572e2
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:47:22 2014 -0700
rename vector2 in cocos/2d cpp files
commit e1f3105aae06d595661a3030f519f7cc13aefbed
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:44:39 2014 -0700
rename vector2 in cocos/2d head files
commit 6708d890bfe486109120c3cd4b9fe5c078b7108f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:40:59 2014 -0700
rename vector2 in cocos/base folder
commit d3978fa5447c31ea2f3ece5469b7e746dfba4248
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:40:43 2014 -0700
rename vector2 in cocos/deprecated folder
commit 4bff45139363d6b9706edbbcf9f322d48b4fd019
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:40:26 2014 -0700
rename vector2 in cocos/editor-support folder
commit 353d244c995f8b5d14f635c52aed8bc5e5fc1a6f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:36:48 2014 -0700
rename vector2 in cocos/ui folder
commit 758b8f4d513084b9922d7242e9b8f2c7f316de6c
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:32:39 2014 -0700
rename vector2 in cocos/renderer folder
commit 0bd2710dd8714cecb993880bc37affd9ecb05c27
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:32:15 2014 -0700
rename vector2 in cocos/physics folder
commit b7f0581c4587348bdbc1478d5374c2325735f21d
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:25:01 2014 -0700
rename vector2 in cocos/math folder
commit a8631a8e1a4e2740807ccd9be9d70de6ecaad7dd
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:16:55 2014 -0700
rename Vector2 to Vec2
deprecate typedef Vector2
2014-05-14 10:07:09 -07:00
James Chen
1ced31a2d3
issue #5160 : Don't use static variables, use member variables
2014-05-13 17:29:05 +08:00
James Chen
0cd2196b88
closed #5160 : Dispatch a custom event after an animation frame is displayed
2014-05-13 17:08:30 +08:00
Ricardo Quesada
9b118e5e96
Squashed commit of the following:
...
commit 519fcd7f68e3586c376fd5e8d4a0ee220a48d225
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 10:10:06 2014 -0700
Updates templates files
commit 2b07843ebe592f56b2abc544ccf66d441bb19fc5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 10:08:19 2014 -0700
compiles on Windows
commit b175522ef7205eaab3bd3f26c27c5d6514cbe2a4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:55:30 2014 -0700
adds cocos2d.h
commit 4c3d14f929bac017b93ca843b4f149d352264a30
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:54:24 2014 -0700
re-adds missing files
commit f729181728959260d14c4152555534f5beec8e05
Merge: 148da79 2adac67
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:51:12 2014 -0700
Merge branch 'includes_fixes' of github.com:ricardoquesada/cocos2d-x into includes_fixes
commit 148da79010c5dffeab885933624cffaf3d588852
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:49:12 2014 -0700
Adds SimpleAudioEngine
commit 2adac67019180ec82b7bd03f0b67c12f62e29e77
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:47:45 2014 -0700
Compiles for Android
commit 4a300d1b9225fa5708f25a69a50bb531f0ac1a32
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:13:35 2014 -0700
Fixes the includes
2014-04-26 10:11:22 -07:00
Huabing.Xu
feec24e3ef
Merge branch 'v3' into develop_migrate_math_lib_merge
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/2d/CCNode.cpp
cocos/2d/CCRenderTexture.cpp
cocos/2d/platform/wp8/CCGLView.h
cocos/physics/CCPhysicsBody.cpp
extensions/physics-nodes/CCPhysicsSprite.cpp
extensions/physics-nodes/CCPhysicsSprite.h
tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp
2014-04-25 16:20:24 +08:00
James Chen
7beb8b78fe
Merge pull request #6325 from MSOpenTech/wp8-3.0-update
...
Wp8 3.0 update:
Background texture is now correctly oriented in Transition Effects
Accelerometer now works for WP8. Refactor of InputEvents was required to support adding Accelerometer event to rendering queue.
Console support for WP8.
Fixed cpp template for WP8. Added missing projects. Fixed property sheets.
Updates precompiled shaders
2014-04-25 10:41:58 +08:00
Huabing.Xu
f65973d9f0
Merge branch 'develop' into develop_migrate_math_lib_merge
...
Conflicts:
cocos/2d/CCActionInterval.cpp
cocos/2d/CCLabelAtlas.cpp
cocos/2d/CCLabelBMFont.cpp
tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.cpp
2014-04-23 14:46:14 +08:00
James Chen
b8e77d8968
Fixed compilation errors when disabling CC_ENABLE_STACKABLE_ACTION
2014-04-21 22:38:15 -07:00
Dale Stammen
4baa7ebacf
added CC_PLATFORM_WINRT
2014-04-19 09:25:54 -07:00
Huabing.Xu
63b52dd287
replace Point with Vector2 in cocos folder cpp file
2014-04-15 18:13:57 +08:00
Huabing.Xu
49de7511f5
migrate Vertex3f to Vector3
2014-04-02 15:06:16 +08:00
Dale Stammen
04b529d328
fixed use of nullptr in variable args for wp8
2014-03-24 15:09:24 -07:00
Huabing.Xu
dc9baa7c72
closed #4382 : added missed scaleZ feature for scaleZ
2014-03-19 16:23:14 +08:00