Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
12,335 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

226 Commits

Author SHA1 Message Date
samuele3hu c0e89a4ee9 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into execDev 2013-07-05 09:49:01 +08:00
minggo 7bcafb46a4 Merge pull request #3051 from samuele3hu/execDev 
issue #2244:make some execute funs into one fun in ScriptEngineProtocol
 2013-07-04 03:33:12 -07:00
samuele3hu b0e4757c24 issue #2244:Modify CallFunc event bug and modify a function name to createCCBreader 2013-07-04 17:54:02 +08:00
samuele3hu 570f2663f4 issue #2244:Modify ScriptData struct and functions related with sendEvent 2013-07-04 15:44:42 +08:00
Ricardo Quesada adaa72fbb4 Adds const to getters 
Many getters in cocos2d are not declared as const.
This patch adds const to many cocos2d properties, specially in CCNode and
subclasses
 2013-07-03 17:22:15 -07:00
samuele3hu 5a64c9e1b3 issue #2244:Add some constructor 2013-07-03 14:19:00 +08:00
samuele3hu 9b08cee01f issue #22434:make some execute funs into one funs in ScriptEngineProtocol 2013-07-02 15:23:51 +08:00
boyu0 9d227f6f1f Fixed Bug#2327:CCNode::isScheduled() is not implemented 
Add CCScheduler::isScheduledForTarget() method
 2013-06-27 12:05:47 +08:00
James Chen 8b9090eb55 fixed #2315: [JSB] Iterating through cc.Node children causes crash. 2013-06-20 22:51:54 +08:00
James Chen 93b6328303 issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
James Chen c0d44cb2e4 fixed #2129: Rename m_iVar to _var, remove CC prefixes. 2013-06-15 14:03:30 +08:00
minggo cd5bcb87af issue #2284: merge master and fixed some conflicts 2013-06-13 17:54:05 +08:00
Ricardo Quesada 479062fdb7 on dealloc, log "this" with %p, not %x. 
Also adds %p where it was missing.
And make a few fixes on the iOS project
 2013-06-05 18:21:05 -07:00
chengstory cfb424a6c9 1. add Component struct. 2013-06-04 17:38:43 +08:00
Lucian Varlan a70569ff03 OnEnterTransitionDidFinish was called twice when a node is added in onEnter 
Fix ported from cocos2d-iphone:
99b7bef880
 2013-05-27 16:07:09 +03:00
Xavier Arias 71df5706bd Added const to CCNode::getChildrenCount() 2013-05-12 20:45:41 +02:00
Xavier Arias 1c6c13b3e5 Added const to CCNode's getTag & getContentSize 2013-05-09 00:20:08 +02:00
James Chen 70472d558d Merge pull request #2430 from imbahom/master 
Fix a typo in CCNode.cpp.
 2013-05-07 01:48:31 -07:00
Sergey Shambir 44a6be80d2 More verbose logging in removeChildByTag and getActionByTag 
Tags are often hardcoded, so tag value will be useful to detect problem.
 2013-04-27 23:15:00 +04:00
imbahom 72ad9fd701 Update CCNode.cpp 
注释错误
 2013-04-23 21:44:24 +08:00
tianTian edf1e53d2d fix syntax error; 2013-04-13 15:18:54 +08:00
James Chen f57a751a48 fixed #1837: Refactoring schedule binding codes. 
* 1) We need bind cc.Node.scheduleUpdate and cc.Scheduler.scheduleUpdate manually since `schedules` need to be associated with _schedFunc_target_ht and _schedObj_target_ht
* 2) Bind cc.Scheduler.unscheduleCallbackForTarget.
 2013-03-18 15:29:53 +08:00
Sam Clegg 38878b084b Fix all compiler warnings produced by gcc. 
This allows the linux and NaCl builds (and perhaps others)
to be compiles with -Wall and -Werror, and it makes the build
output much less noisy.
 2013-03-05 17:01:00 -08:00
minggo 0dfab6744a issue #1686:use correct values to initialize CCNodeRGBA member variables 2013-03-01 16:14:10 +08:00
minggo 63e4091bfa fixed #1686:finish updating 2013-02-28 11:55:36 +08:00
minggo cd4f18c48f issue #1686:synchronize CCLayer.cpp 2013-02-27 18:21:35 +08:00
minggo 94076a5b9c issue #1686:synchronize CCSprite.cpp 2013-02-27 15:30:49 +08:00
minggo f571d66ed7 issue #1686:synchronize CCNode.cpp 2013-02-27 14:48:19 +08:00
James Chen 7dc64fc9a6 issue #1686: sync to CCLayer 2013-02-27 09:38:30 +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
walzer 996d2be2b6 CCNode: add [set|get]Position[X|Y](void) back. 2013-01-21 16:26:02 +08:00
walzer 7b16494862 well documented CCNode 2013-01-17 11:20:25 +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
dualface 268aa45d2c rename CCNode:scheduleUpdateScriptHandlerWithPriority() to CCNode::scheduleUpdateWhitPriorityLua() 
remove unused functions
 2012-12-10 16:09:23 +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
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 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
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
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
minggo 90448ec7d0 issue #1269:fix some compiling error because of including error header files 2012-06-19 16:20:46 +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
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
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 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 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 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