James Chen
fdf8595353
tab -> 4 space.
2013-02-22 16:16:16 +08:00
James Chen
476e3801eb
tab -> 4 space.
2013-02-22 16:15:17 +08:00
James Chen
b54b924923
fixed #1743 : Adding an additional transform for CCNode.
2013-02-22 16:01:49 +08:00
jiang xiaohua
d875edbd74
Additional a transformation matrix, Used in is not parent-child relationship but we still need to maintain transformation parent-child
Example:
GameObject_Parent(CCNode; create from CCNode)
GameObject_sub1(CCNode; Create from the same CCSpriteBatchNode,the node's parent is CCLayer )
RenderComponents1( Create form the same CCSpriteBatchNode)
Components2
....
GameObject_sub2 (CCNode; Create from the CCNode,the node's parent is GameObject_Parent )
RenderComponents1( not used batchNode)
Now, GameObject_sub1 not GameObject_Parent node, but I want it to simulate the change of the son is GameObject_Parent;
I Need additional the father's matrix in child Node ;
2013-02-20 22:33:28 +08:00
James Chen
f2303b854a
Fixed a typo, and regenerated luabinding codes.
2013-01-23 15:59:13 +08:00
walzer
db59b047f0
remove "inline" keyword from set/getPositionX/Y() methods to make the compilation property without additional flags.
2013-01-21 20:57:06 +08:00
walzer
b1285ca7a7
CCNode: add [set|get]Position[X|Y](void) back.
2013-01-21 16:26:33 +08:00
walzer
996d2be2b6
CCNode: add [set|get]Position[X|Y](void) back.
2013-01-21 16:26:02 +08:00
walzer
8657da80a6
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2013-01-18 18:06:51 +08:00
minggo
6379b61400
fixed #1664:fixed a logical error in CCAtlasNode::setOpacityModifyRGB()
2013-01-18 16:40:42 +08:00
walzer
7b16494862
well documented CCNode
2013-01-17 11:20:25 +08:00
James Chen
6733f786a5
fixed #1649 : Reverted some invokings of function that returns const reference.
2013-01-14 16:06:18 +08:00
James Chen
6565fa92cc
fixed #1649 : Changed return type to const reference for member variable access.
2013-01-14 15:51:53 +08:00
dualface
c3f900d36c
[lua] remove current schedule before register new script schedule
2012-12-14 18:06:21 +08:00
James Chen
15251626b0
Merge pull request #1748 from guanqun/fix-doxygen
...
fix the doxygen output of CCAtlasNode
2012-12-10 01:01:21 -08:00
dualface
268aa45d2c
rename CCNode:scheduleUpdateScriptHandlerWithPriority() to CCNode::scheduleUpdateWhitPriorityLua()
...
remove unused functions
2012-12-10 16:09:23 +08:00
Lu Guanqun
64772d09b0
fix the doxygen output of CCAtlasNode
2012-12-10 15:31:26 +08:00
dualface
d854f68c63
[scripting] add CCNode::scheduleUpdateScriptHandlerWithPriority()
2012-12-10 13:51:37 +08:00
dualface
c8753f72ef
[scripting] add CCNode::scheduleUpdateScriptHandlerWithPriority()
2012-12-10 13:48:27 +08:00
minggo
a75f8b7e7a
fixed #1593:remove all deprecated methods expect CCBAnimationManager
2012-12-06 18:51:33 +08:00
James Chen
be914811fb
fixed #1576 : CCNode::setUserObject needs to be retained.
2012-11-26 22:11:04 +08:00
James Chen
ebd522e3fa
issue #1564 : Return a new object instead of 'const reference' for some get methods.
2012-11-20 16:34:55 +08:00
minggo
fb5b7ed7bb
fixed #1560:fix a logical error in CCNode::schedule()
2012-11-19 11:24:03 +08:00
minggo
a701eaecce
issue #1555:update to v2.1 beta3
2012-11-14 18:05:15 +08:00
minggo
d2a5723973
issue #1555:add CCDrawNode
2012-11-09 12:08:18 +08:00
James Chen
270676b74d
issue #1549 : Added some functions for CCNode.
...
virtual void removeFromParent();
virtual void removeChild(CCNode* child);
virtual void removeChildByTag(int tag);
virtual void removeAllChildren();
2012-11-05 18:41:52 +08:00
James Chen
9f6d263c15
fixed #1531 : The CCSprite::updateTransform() function needs to inherited from a base function on the CCNode.
2012-10-30 10:24:28 +08:00
Rohan Kuruvilla
16d5659b17
Adding ScriptingEngine callback for onCleanup event
2012-10-29 15:00:52 +08:00
walzer
06f639edab
update copyright to 2012, update cocos2d version to 2.0.3
...
1. update all copyright from 2010-2011 to 2010-2012 cocos2d-x.org
2. update COCOS2D_VERSION to 0x00020003
3. update const char* cocos2dVersion() to "cocos2d-2.0-x-2.0.3"
2012-09-24 21:22:20 +08:00
dualface
e36c4abb65
[Lua] remove Lua script handler on CCNode destroy
2012-09-21 00:21:24 +08:00
Donald Alan Morrison
4cbd993091
Minor English Spelling Corrections. A few grammar corrections.
2012-09-17 00:02:24 -07:00
Donald Alan Morrison
b8412f3b7e
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-09-14 15:27:55 -07:00
Donald Alan Morrison
7c750dc9c5
Minor changes to comments. One integer literal changed to float literal.
2012-09-14 15:26:38 -07:00
James Chen
7d8b261ced
fixed #1477 : Abstracts Lua and JS binding protocol, some bugs fixes in lua-binding, adding custom menu on win32 and mac for switching resolutions.
2012-09-11 14:02:33 +08:00
YuLei
58ea948cc8
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-09-07 19:21:15 +08:00
ivzave
cf67922ee0
remove delete this from init methods
2012-09-05 22:30:44 +04:00
YuLei
da79992275
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-09-02 00:38:57 +08:00
James Chen
9ba5a1bfef
issue #1454 : Removed COCOS2D_JAVASCRIPT macro.
2012-08-31 21:23:23 +08:00
minggo
860d3eff4b
issue #1454 : make js binding work together with lua binding and native codes
2012-08-31 17:55:45 +08:00
James Chen
e584b94728
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into js
...
Conflicts:
scripting/javascript/bindings/cocos2d_generated.cpp
2012-08-30 20:16:54 +08:00
James Chen
55423ed5b9
Moved '#include <stdint.h>' to 'platform/ios(android,linux,blackberry)/CCStdC.h' since win32 don't have a stdint.h.
2012-08-29 14:49:02 -07:00
Rohan Kuruvilla
c62462d997
Including callback support for onEnterTransitionDidFinish and onExitTransitionDidStart
2012-08-28 17:43:35 -07:00
YuLei
b411c00f38
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-08-28 14:23:31 +08:00
mustime
60a64d0eca
issue #1425 : remove the scheduleScriptHandler interface from CCNode
2012-08-28 12:49:43 +08:00
YuLei
02e77faf51
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-08-28 12:22:57 +08:00
Rohan Kuruvilla
c47d9d4e7c
Adding Touch callbacks and capability to pass this around
2012-08-27 08:43:38 -07:00
Rolando Abarca
a114502929
removes OBJECT_TYPE thing
2012-08-27 08:43:38 -07:00
Rohan Kuruvilla
0e9ba1173a
Callbacks
2012-08-27 08:43:37 -07:00
Rolando Abarca
4e640ecb35
uses new ADD_OBJECT_TYPE macro
2012-08-27 08:43:37 -07:00
Rolando Abarca
701f5e9dfc
roots & unroots jsobject
2012-08-27 08:43:37 -07:00
Rolando Abarca
e757d55a29
updates cocos2d-x API to support getObjectType()
2012-08-27 05:45:11 -07:00
mustime
be116f5352
issue #1425 : update TestLua project
2012-08-27 11:43:47 +08:00
YuLei
a38b8d4a00
[Lua] CCNode:onEnter() and CCNode:onExit() pass {name = "enter"/"exit"} to Lua function
...
[Lua] fix CCMenuItem:registerScriptTapHandler() and CCMenuItem:unregisterScriptTapHandler()
[Lua] update luabinding
2012-08-25 17:08:33 +08:00
YuLei
8b54355aa1
[Lua] update luabinding
...
[Lua] add LuaValue, LuaDict, LuaArray
2012-08-25 15:05:59 +08:00
Walzer
cc3d850892
fixed #1416 , add object orientated APIs for CCGeometry, replace "CCFloat" with "float"
2012-08-01 15:30:12 +08:00
Walzer
0431cb455b
fixed #1413 , add CCTouch::getLocation(), getDelta() method
...
return OpenGL coordinates directly, to make the usage more convenient.
2012-07-31 17:41:53 +08:00
mustime
1a55b7c5ba
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into bug1381
2012-07-27 18:29:57 +08:00
mustime
5bc130dee7
issue #1381 : change the setContentSize interface in CCScrollView
2012-07-27 18:20:11 +08:00
mustime
9949a34669
issue 1381: change setContentSize(CCSize size) to setContentSize(const
...
CCsize & size) in CCNode
2012-07-27 16:57:56 +08:00
Walzer
685b70e6fb
fixed #1402 , résolve conflicting "create" functions
...
1. Following https://docs.google.com/document/d/1eqvYjVah0R9nkjzJ_ga1-_cyjHnizVQ5dyESYNpYM0s/edit?pli=1
2. use CCSequence/CCSpawn::initWithTwoActions, createWithTwoActions instead of initOneTwo, create(one, two).
3. haven't re-generate lua-binding to resolve the conflicts yet.
2012-07-23 22:49:11 +08:00
mustime
e289ce628c
fixed #1379 : Fixed typing error in CCNode.cpp line74
2012-07-09 14:45:04 +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
minggo
90448ec7d0
issue #1269:fix some compiling error because of including error header files
2012-06-19 16:20:46 +08:00
minggo
2666df9472
issue #1269:mrege latest code and fix conflict
2012-06-19 13:57:33 +08:00
minggo
9ec29d715a
issue #1269:make tests HelloWorld HelloLua and testjs refer subproject cocos2dx
2012-06-19 13:50:11 +08:00
James Chen
b66be55156
issue #1333 : Use CC_PROPERTY instead of CC_PROPERTY_PASS_BY_REF for m_tContenSize
2012-06-18 18:31:29 +08:00
James Chen
595a402c83
fixed #1292:make some function names more readable.
2012-06-15 16:47:30 +08:00
minggo
d0f905992a
issue #1292:make some function names more readable
2012-06-15 15:10:40 +08:00
James Chen
7fe3f7357e
issue #1324 : Reverted old interfaces.
2012-06-14 17:18:05 +08:00
James Chen
23574172ff
issue #1324 : Added create() for static member functions that new an autorelease object, updated cocoa folder.
2012-06-14 16:05:58 +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
2ce7c86c50
fixed #1315 : TileMapTest can't be shown correctly in retina mode.
2012-06-11 14:44:32 +08:00
James Chen
35e9e44e39
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-06-08 15:31:23 +08:00
James Chen
6cf608effd
issue #1310 : deleted some functions which can't be implemented in C++. Moved arrayMakeObjectsPerformSelector to CCArray.h.
2012-06-08 15:17:15 +08:00
minggo
9a600c6221
issue #1310 : syncronize base_nodes
2012-06-08 14:17:39 +08:00
minggo
cc16320445
issue #1310 : syncronize actions
2012-06-08 13:55:28 +08:00
James Chen
a998062c57
issue #1194 : Updated project configuration for android. Null pointer checking in CCNode::removeFromParentAndCleanup.
2012-05-02 12:04:27 +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
James Chen
230b8a386b
issue #1176 : Changed linebreak symbol to UNIX format ('\n'),replaced 'tab'
...
with four spaces. Also,
1. Used macro NS_CC_BEGIN instead of namespace cocos2d {, NS_CC_END instead
of }.
2. Removed some unused files.
3. Renamed the name of some folders, for example,
"test.android"-->"proj.android" .
2012-04-19 14:35:52 +08:00
James Chen
7d7baf81a2
refactor updated...
2012-04-18 18:43:45 +08:00
James Chen
d01f1277af
optimize data struct.
2012-04-14 19:11:57 +08:00
James Chen
931c42a621
Updated some files.
2012-04-04 21:58:04 +08:00
James Chen
d7aed75942
issue #1056 : Removed CCNode::arrayMakeObjectsPerformSelector, instead, we defined two macros (arrayMakeObjectsPerformSelector and arrayMakeObjectsPerformSelectorWithObject) to fit for any classes that inherit from CCNode.
2012-03-29 14:30:13 +08:00
James Chen
0ef65d1ed5
issue #1056 : Renamed CC_COCOSNODE_RENDER_SUBPIXEL to CC_NODE_RENDER_SUBPIXEL in CCNode.cpp
2012-03-23 10:26:36 +08:00
James Chen
7c0af610ff
issue #1056 : Added CCArray::copyWithZone implementation. CCDictElement bound check.
2012-03-20 23:30:18 +08:00
James Chen
e021ae9821
#1056 : issue #1056 : synchronise cocos2d-iphone-2.0-rc0a, update some files.
2012-03-16 17:56:19 +08:00
James Chen
275891dfb0
issue #1056 : synchronise cocos2d-iphone-2.0-rc0a
2012-03-16 13:42:53 +08:00
James Chen
9e89171557
issue #1056 : Rename ccGLState to ccGLStateCache, add some ccShader_***_.h, update CCGLProgram class.
2012-03-15 10:42:22 +08:00
James Chen
8aa3f7f9ae
issue #1056 : TestCases works ok except Box2dTest and ChipmunkTest.
2012-03-14 18:11:25 +08:00
James Chen
aefdb852a2
issue #1056 : synchronise cocos2d-iphone gles2.0 branch, HelloWorld on win32 works ok.
2012-03-14 14:55:17 +08:00
minggo
645d561276
fixed #737 : remove view id
2012-03-08 12:40:27 +08:00
minggo
ed68855e19
fixed #1009 : fix a typo error
2012-03-06 09:35:36 +08:00
YuLei Liao
6ebdf9cb4b
* add CCScriptSupport
2012-02-09 14:07:11 +08:00
YuLei Liao
7a96d13fb6
rename all FuncID to Handler
2012-02-07 11:43:29 +08:00
YuLei Liao
9164e90515
* fix some issues
2012-02-02 15:58:10 +08:00
YuLei Liao
003fa1f1a0
* add some methods for fast read/write position
...
* add CCNode::getChildrenCount() for Lua
2012-02-02 10:39:19 +08:00
dumganhar
d61f87ba92
modify construct and destruct function of some class, for example CCNode() --> CCNode.cpp(void)
2012-01-09 23:21:31 +08:00
minggo
3bf11dba7e
issue #892 : modify pkg for lua
2011-12-07 15:24:03 +08:00
minggo
f0d22ae504
issue #879 : replase assert with CCAssert
2011-11-28 17:28:43 +08:00
Leon
70a4942ea6
fix some warning
2011-10-19 15:24:19 +08:00
moadib
a8d87a9976
Non-trivial arguments passed by reference now.
...
Removed unnecessary cocos2d:: prefix inside namespace.
2011-08-17 17:26:26 +04:00
minggo
09dc164fff
issue #645 : update to v1.0.1
2011-08-02 15:45:27 +08:00
Eli Yukelzon
9c5fa51e6b
usuful macros for defining scene() and node() methods with params
2011-07-30 11:55:38 +03:00
minggo
d48c3fdfb1
upgrade to 1.0.0-final 07-11
2011-07-12 11:20:41 +08:00
minggo
3dc1967f6c
fixed #579 : change zorder to int
2011-07-06 20:48:56 +08:00
natural-law
0378a6a36d
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
...
Conflicts:
cocos2dx/include/CCNode.h
2011-07-01 16:24:23 +08:00
natural-law
7d7f3a9241
fixed #562 , Upgrade folder sprite_nodes to rc3.
2011-07-01 16:11:31 +08:00
minggo
16f79cb0be
fixed #554 : upgrade base_nodes to 1.0.0-rc3
2011-07-01 15:48:05 +08:00
minggo
022e2b9998
issue #528 : refactor ok on win32
2011-06-20 17:31:38 +08:00
minggo
8003de7468
update to latest code and merge
2011-06-14 11:01:38 +08:00
liswei
1591c7edc8
fixed #512 fix warnings in /Wall flag
2011-06-10 17:51:37 +08:00
minggo
a8b6b850de
use precompile macro to cantrol if enable lua support
2011-06-01 17:51:08 +08:00
minggo
697368cf20
support lua
2011-05-31 14:04:14 +08:00
yangws
de977bc6c2
use 0 replace NULL
2011-05-30 16:49:08 +08:00
yangws
7e2d1d5c48
fixed #490 Text input on android use a different way, TextInputTest OK now.
2011-05-30 16:36:12 +08:00
Walzer
c790fba340
avoid a bug in clang, see this post http://www.cocos2d-x.org/boards/7/topics/1638 Thanks to Cem Aslan's contribution!
2011-05-27 16:26:59 +08:00
natural-law
15ef0b9105
issue #428 , fix the bug created by issue 428. Have some loop in wrong arrays.
2011-04-28 10:16:58 +08:00
natural-law
5d2ac1fc0c
fixed #428 , Use CCArray instead of CCMutableArray as the parameter type of CCNode::m_pChildren.
2011-04-21 14:46:15 +08:00
minggo
37bb33d9e5
fixed #452 : refactor CCDirector CCNode CCGrid
2011-04-11 15:10:09 +08:00
minggo
7d52161804
fixed #441 : Initialize pointer in contruction & detect pointer value in destruction
2011-04-01 16:06:53 +08:00
yangws
be966dbddb
fixed #430 Solved bug by replacing glColor4ub with glColor4f.
2011-03-25 13:50:57 +08:00
walzer
abd2725ed4
issue #148 , add copyright
2011-03-19 10:34:26 +08:00
minggo
b5a99f90df
issue #375 : rename file names and object names
2011-03-07 17:11:57 +08:00
natural-law
3dfd530b38
Merge branch 'iss295' into upto-0.99.5
2010-12-31 09:48:48 +08:00
minggo
d6fb209861
merged from minggo-upto-0.995 to upto-0.99.5
2010-12-24 15:21:57 +08:00
minggo
994a3b05ea
fixed #273
2010-12-23 11:19:56 +08:00
minggo
9aa7e1bc84
fixed #245
2010-12-18 16:12:59 +08:00
Walzer
820c2f0714
issue #211 cocos2d-x back to cocos2dx
2010-11-18 15:01:42 +00:00
Walzer
b4328354af
issue #211 cocos2dx -> cocos2d-x
2010-11-18 14:07:17 +00:00
Walzer
fb25984f12
rename getShared methods to shared
2010-11-16 07:12:09 +00:00
Walzer
94806c9194
merge with tag/0.99.4-uphone-0.9.0
2010-11-11 03:18:58 +00:00
Walzer
a279e5dc9b
issue 169, we should retain the new variable first, and then release the old one. assignment at last.
2010-09-27 10:19:10 +00:00
Ming
12d6df9717
issue #154
2010-09-24 10:10:32 +00:00
Ming
7131389535
issue #61 :
2010-09-06 05:52:57 +00:00
Walzer
4226dcede9
issue #61 , add retain for member variable
2010-09-04 10:06:26 +00:00
Walzer
5fd1bf85b6
issue #121 , return bool in function init****
2010-09-04 04:02:52 +00:00
Ming
857595d644
issue #116
2010-09-02 08:46:25 +00:00
Ming
39c6ebf503
issue #85:remove the using of dynamic_cast()
2010-08-31 03:20:37 +00:00
Ming
b9587a7062
2010-08-30 07:45:39 +00:00
natural-law
6e7fede2bb
fixed #103
...
add ActionManager Test code
2010-08-30 07:04:46 +00:00
Ming
710e29b086
issue #80
2010-08-25 02:19:20 +00:00
Ming
1cb377bca8
fixed #79
2010-08-24 01:56:09 +00:00
Ming
17e866f5ac
issue #61
2010-08-20 01:31:35 +00:00
Walzer
ccca95746e
issue #18 , debug
2010-08-19 07:29:38 +00:00
Walzer
1dc617174a
issue #18 , debug
2010-08-19 06:25:52 +00:00
Walzer
29d9a489b8
issue #18 , debug
2010-08-19 06:11:35 +00:00
Ming
c8ea0e7eb6
fixed #54
2010-08-17 06:25:41 +00:00
Ming
0ef3574562
move include/CCGrid.h to effects/CCGrid.h
2010-08-16 08:53:14 +00:00