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

1503 Commits

Author SHA1 Message Date
Huabing.Xu 9496399cd0 remove kmMat4 interface in class Layer 2014-04-09 10:37:41 +08:00
Huabing.Xu be4901d078 remove kmMat4 interface in class Label 2014-04-09 10:06:30 +08:00
Huabing.Xu 3e16857c92 remove kmMat4 interface in class DrawNode 2014-04-09 09:59:56 +08:00
Huabing.Xu 409b696bab remove kmMat4 interface in class Node 2014-04-08 23:05:33 +08:00
Huabing.Xu fcff284fd5 getParentToNodeTransform return Matrix 2014-04-08 22:13:59 +08:00
Huabing.Xu 3837c23ebe draw() using Matrix instead of kmMat4 2014-04-08 22:07:35 +08:00
Huabing.Xu b9af100493 visit() using Matrix instead of kmMat4 2014-04-08 21:45:54 +08:00
Huabing.Xu e8596094a4 Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-08 16:58:51 +08:00
James Chen e1f2b71429 Merge pull request #6161 from DarraghCoy/check_node_not_running_when_destroyed 
Adding extra CCNode verification in Node's destructor
 2014-04-08 15:49:22 +08:00
James Chen 5df765ef0c Merge pull request #6169 from dumganhar/iss4710-eventdispatcher-crash 
closed #4710: [win32] Crash in EventDispatcher if game starts up with mouse moving frequently
 2014-04-08 15:31:52 +08:00
James Chen e04b820cfc closed #4711: [win32] Passing empty string to FileUtils::isFileExist may also return true 2014-04-08 15:24:47 +08:00
James Chen 8f451d48a1 issue #4710: Fixed wrong indention. 2014-04-08 15:11:04 +08:00
James Chen 49bba30409 closed #4710: [win32] Crash in EventDispatcher if game starts up with mouse moving frequently 2014-04-08 15:08:34 +08:00
James Chen 546db2de4a Unregistered listener when it's removed from _toAddedListeners. 2014-04-08 11:17:38 +08:00
Darragh Coy 9a6b93eae1 Add extra CCNode verification 
Add a check to the CCNode destructor to catch a common cocos2d-x programming mistake - forgetting to call base class onExit() in derived class onExit() implementations. We can check for this invalid API usage by checking if the node is still marked as running on destruction. If the node still thinks it's running then it's likely the cleanup logic performed by Node::onExit() was not done.
 2014-04-07 17:05:42 -07:00
Darragh Coy 79b5dff795 CCEventDispatcher crash fix 
Fix possible crashes which could be caused by the EventDispatcher having listeners associated with nodes are destroyed. Catch the case where a node registers a listener while we are dispatching events and gets destroyed while that event is still being dispatched. Check the list of nodes to be added into the event dispatcher fully when we are cleaning listeners for a target node.

This issue was found using the extra debug verification in this pull request:
https://github.com/cocos2d/cocos2d-x/pull/6011
 2014-04-07 16:19:26 -07:00
dbaack 6262c9c910 Fixed a bug where an event listener removed from the event dispatcher while it is still in the _toAddedListeners vector would never have _isRegistered set to false on removal. This causes it to fail an assert if it is attempted to be added to the event dispatcher again later. 2014-04-06 21:59:40 -07:00
Ricardo Quesada f1a2db9006 Merge pull request #6140 from dumganhar/render-clean 
Adds `Renderer::clean`, and fixes crash in `PerformanceTest/Node children Test`.
 2014-04-04 13:34:29 -07:00
Huabing.Xu 29c345bd02 Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-04 18:45:21 +08:00
Huabing.Xu 5d70170a4b getNodetoParentTransform getNodeToWorldTransform return Matrix instead of kmMat4 2014-04-04 18:41:29 +08:00
Huabing.Xu 6b4451482f remove matrixToKmMat4 function 2014-04-04 18:13:10 +08:00
Huabing.Xu 70561088df remove kmMat4ToMatrix function 2014-04-04 18:04:29 +08:00
minggo 439b30434e Merge pull request #6097 from newnon/android_crash_fix 
Android crash fix on new devices
 2014-04-04 18:01:59 +08:00
Huabing.Xu 184f10ae0f add conversion from kmMat4 to Matrix 2014-04-04 17:58:37 +08:00
Huabing.Xu f1b1678900 Director::getMatrix returns Matrix instead of kmMat4 2014-04-04 17:31:21 +08:00
Huabing.Xu ea6d8e4e42 replace kmMat4 in director 2014-04-04 17:16:57 +08:00
James Chen 7b4a1308ea Adds `Renderer::clean`, and fixes crash in `PerformanceTest/Node 
children Test`.
 2014-04-04 12:48:16 +08:00
Huabing.Xu f9405e0ea9 Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-03 17:47:16 +08:00
Huabing.Xu 1b8e45fe19 remove kmGLFreeAll call 2014-04-03 17:40:14 +08:00
Huabing.Xu 14f004b12a remove reference to kmGL in director 2014-04-03 17:32:40 +08:00
Huabing.Xu 67e62ce73d readied director::getMatrix again. remove kmGLgetMatrix 2014-04-03 17:26:06 +08:00
James Chen a2081ea210 issue #4557: Updates comments for EventListener::setPaused. 2014-04-03 17:20:16 +08:00
James Chen a3214b7505 issue #4557: Updates comments for EventListener::setEnabled/setPaused. 
Also does whitespace cleanup and untabify codes. Thanks emacs. :)
 2014-04-03 17:02:17 +08:00
James Chen 7a5dba9eb9 issue #4557: Adds const for `EventListener::isEnabeld`. 2014-04-03 16:46:16 +08:00
James Chen 89048dd6bd closed #4557: Comment fixes in CCEventListener.h. 2014-04-03 15:35:18 +08:00
James Chen f6859a3ca9 closed #4557: Adds `EventListener::setEnabled/isEnabled`. 2014-04-03 15:32:16 +08:00
Huabing.Xu 67971e9f0b migrate sprite spriteBatchNode to director matrix stack 2014-04-03 14:55:36 +08:00
Huabing.Xu 46b4f1b5d8 migrate Grid, Label, RenderTexture to director matrix stack 2014-04-03 14:32:49 +08:00
Huabing.Xu 79f62f4351 comment out director::getMatrix temporarily 2014-04-03 10:33:59 +08:00
Huabing.Xu dd4d45ea90 migrate particleBatchNode to director matrix stack 2014-04-02 22:52:41 +08:00
Huabing.Xu c593938ed2 migrate nodeGrid 2014-04-02 22:50:39 +08:00
Huabing.Xu 02d1816dde migrating ClippingNode 2014-04-02 22:48:22 +08:00
Huabing.Xu 4ea56522e3 call director matrix stack will also call kmGLXXX functions 2014-04-02 22:46:37 +08:00
James Chen 16e51a8489 Merge pull request #6110 from dumganhar/iss4639-isfileexist 
closed #4639: FileUtils::isFileExist doesn't consider SearchPaths and ResolutionOrders
 2014-04-02 18:12:29 +08:00
James Chen c8e6f8d3ff Merge pull request #6106 from pandamicro/AnimLoopFix 
Fixed #4637: Add loop parameter to Animation::initWithSpriteFrames
 2014-04-02 18:08:03 +08:00
pandamicro e5bf6c438f Fixed #4638: Add loop parameter to Animation::createWithSpriteFrames 2014-04-02 18:06:17 +08:00
James Chen 4edf923cf8 Merge pull request #6108 from Dhilan007/develop_label 
Label: Better API order for Label class
 2014-04-02 17:47:44 +08:00
James Chen 7f702b3fe4 Merge pull request #6107 from boyu0/iss3509_physicsbody_moves_randomly_when_switch_foreground_background 
closed #3509: Skip one frame when _deltaTime equal to zero.
 2014-04-02 16:52:43 +08:00
Huabing.Xu 78eea4a735 add loadIdentityMatrix in Director 2014-04-02 16:47:23 +08:00
Huabing.Xu 106a0da87b add matrix stack in director(will replace kmGLfunctions) 2014-04-02 16:36:11 +08:00