James Chen
117f248a3b
Fix for FileUtils::getData
2014-04-09 20:07:00 -07:00
Dhilan007
8ab372fdd9
Label:Add compatible API of the create functions.
2014-04-10 10:58:49 +08:00
Huabing.Xu
07ac817a7c
Merge branch 'develop' into develop_migrate_math_lib_merge
2014-04-10 10:52:15 +08:00
James Chen
782d3cd3be
issue #4729 : Linux fixes
2014-04-09 19:51:05 -07:00
Dhilan007
390685ae93
Label:Change setter of system font name.
2014-04-10 10:23:00 +08:00
James Chen
7db741cf42
Fix for CC_CALLBACK_3 macro
2014-04-10 10:07:01 +08:00
James Chen
890dd64d38
issue #4729 : some warning fixes and compilation error fixes on win32.
2014-04-10 01:29:13 +08:00
James Chen
5dc6dd87e9
issue #4729 : include "ccTypes.h" in ccCArray.cpp for CC_INVALID_INDEX
2014-04-10 00:36:43 +08:00
James Chen
5615717617
issue #4729 : NULL -> nullptr in constructor or setXXX(NULL)
2014-04-10 00:36:43 +08:00
James Chen
e59374de81
issue #4729 : Move CC_INVALID_INDEX from ccCArray.h to ccTypes.h,
...
probably there is a better place to define this variable, but let's just
choose ccTypes.h now.
2014-04-10 00:36:42 +08:00
James Chen
9d8d256bee
issue #4729 : Android build works ok.
2014-04-10 00:36:42 +08:00
James Chen
a240c7b240
issue #4729 : Moved CCNotificationCenter.h/.cpp to deprecated folder.
2014-04-10 00:36:42 +08:00
James Chen
0bb8f3da78
issue #4729 : Updates win32/winrt xxx_headers.props
2014-04-10 00:36:42 +08:00
James Chen
43d6e1176a
issue #4729 : Compilation error fixes for linux
2014-04-10 00:36:42 +08:00
James Chen
2fc6c0150c
issue #4729 : iOS/Mac works fine
2014-04-10 00:36:41 +08:00
James Chen
5b296a62e9
issue #4729 : Moved deprecated classes to 'cocos/deprecated' folder
2014-04-10 00:36:41 +08:00
minggo
2beed5d398
Merge pull request #6166 from dabingnn/develop_fix_rendererBug
...
Develop fix renderer bug
2014-04-10 00:27:33 +08:00
Nick Barrios
64fc13cae2
CCGLView.h: Remove createWithFullscreen declaration.
2014-04-09 12:15:24 -04:00
Dhilan007
05b8123803
Label:Makes the create functions of Label just do one thing.
2014-04-09 23:31:05 +08:00
Dhilan007
67652357e1
1.Makes the create functions of Label clear.
2014-04-09 21:35:08 +08:00
James Chen
61134426a8
Some fixes detected by xcode analyze
2014-04-09 20:41:09 +08:00
Sergey
fdb863ae00
merge error fix
2014-04-09 13:59:22 +04:00
Anton Sokolchenko
87015ae888
2026:72: Result of 'malloc' is incompatible with type 'unsigned char *'
...
2026:72: Result of 'malloc' is converted to a pointer of type 'unsigned char', which is incompatible with sizeof operand type 'unsigned char *'
2014-04-09 11:37:56 +03:00
James Chen
d71483632f
Merge pull request #6187 from Dhilan007/develop_activity
...
closed #4659:Remove the usage of OpenSL
2014-04-09 15:39:06 +08:00
Sergey
a6dc241986
On activity result listener added
...
it is strongly need fro most extensions like Game Center and In app billing
2014-04-09 11:27:53 +04:00
Dhilan007
d310d8d099
closed #4659:Remove the usage of OpenSL
2014-04-09 14:57:07 +08:00
Huabing.Xu
504fa2aa60
remove kmMat4 interface in AffineTransform
2014-04-09 14:21:41 +08:00
James Chen
c344a1e349
Merge pull request #6182 from Dhilan007/develop_activity
...
closed #4714:Fixed Cocos2dxHelper.runOnGLThread() can not work
2014-04-09 14:08:06 +08:00
Huabing.Xu
8d01d4e07d
remove kmMat4 interface in cocos/2d folder
2014-04-09 11:53:01 +08:00
Huabing.Xu
491c97bfeb
remove kmMat4 interface in class RenderTexture and TextureFieldTTF file
2014-04-09 11:41:20 +08:00
Huabing.Xu
092d8d9ae9
remove kmMat4 interface in class Sprite
2014-04-09 11:28:34 +08:00
Huabing.Xu
e3a9972c4c
remove kmMat4 interface in class MotionStreak and ProgressTimer
2014-04-09 11:21:05 +08:00
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
Nick Barrios
9c2a148256
CCGLView: Remove createWithFullScreen(const std::string& viewName, Size size) overload. Use more specific createWithFullScreen(const std::string& viewName, const GLFWvidmode &videoMode, GLFWmonitor *monitor) instead.
2014-04-08 14:02:36 -04:00
Nick Barrios
6b8d5dd090
CCGLView: Add support for specifying video mode and monitor for fullscreen window creation.
2014-04-08 13:33:24 -04:00
Darragh Coy
117f22d895
Tweak formatting and change spaces to tabs so indentation appears consistent on github.
2014-04-08 08:47:26 -07:00
Darragh Coy
0082900d10
Small dangling pointer tweak/fix to CCEventDispatcher
...
If cleaning a target node that has a listener in the 'to be added' listeners list then ensure that listener does not have a stale reference to the node. This is a minor tweak in addition to pull request 6160 (https://github.com/cocos2d/cocos2d-x/pull/6160 ).
2014-04-08 08:46:09 -07: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
Dhilan007
c378b42191
closed #4714:Fixed Cocos2dxHelper.runOnGLThread() can not work
2014-04-08 21:08:20 +08:00
minggo
3703c6f73a
update version
2014-04-08 18:14:46 +08:00
minggo
e2252cafe3
Merge pull request #6174 from minggo/change-to-private
...
change QuadCommand::generateMaterialID() to private
2014-04-08 17:54:36 +08:00
minggo
ccbd77309d
change QuadCommand::generateMaterialID() to private
2014-04-08 17:49:18 +08:00
minggo
0c2b654410
Merge pull request #6171 from minggo/iss4683-assert_not_thread_safe
...
use assert because CCASSERT is not thread safe
2014-04-08 17:16:28 +08:00
Huabing.Xu
e8596094a4
Merge branch 'develop' into develop_migrate_math_lib_merge
2014-04-08 16:58:51 +08:00
Huabing.Xu
7f1fb13113
closed #4629 : remove unused _renderStack
2014-04-08 16:54:00 +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
minggo
e28093ee1a
closed #4683 : use assert because CCASSERT is not thread safe
2014-04-08 14:53:57 +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
Huabing.Xu
1a7f46598f
closed #4629 : fix bug for group command
2014-04-07 22:51:32 +08: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
Nick Barrios
eae1ccb279
CCGLView: Remove frameZoomFactor param from createWithFullScreen overload.
2014-04-04 06:26:00 -04: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
Nick Barrios
58224d9b23
CCGLView: Add createWithFullscreen overloaded method that allows passing in Size, to set video mode.
2014-04-04 06:02:29 -04: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
James Chen
1178d67dd6
issue #4639 : Reverts the definition of FileUtils::isFileExist, remove
...
the second parameter(outFullPath).
2014-04-02 16:33:05 +08:00
James Chen
236695fd08
Merge pull request #6104 from dumganhar/iss4635-constrolswitch
...
closed #4635 : ControlSwitch's marksprite is shown at a wrong place
2014-04-02 15:39:33 +08:00
James Chen
5fa839b16b
closed #4639 : FileUtils::isFileExist doesn't consider SearchPaths and ResolutionOrders
2014-04-02 15:35:09 +08:00
Huabing.Xu
2e315fb215
migrate Vertex2f to Vector2
2014-04-02 15:25:37 +08:00
Huabing.Xu
49de7511f5
migrate Vertex3f to Vector3
2014-04-02 15:06:16 +08:00
Dhilan007
5aafec462f
Label:Fine tune the declaration order of API.
2014-04-02 14:57:00 +08:00
boyu0
31be60fea7
closed #3509 : Skip one frame when _deltaTime equal to zero.
2014-04-02 14:05:07 +08:00
pandamicro
7019b6e1ab
Fixed #4637 : Add predefined value indication in cpp
2014-04-02 12:03:42 +08:00
pandamicro
9376c7817f
Reverse CONSTRUCTOR_ACCESS to protected
2014-04-02 11:57:23 +08:00
pandamicro
05899d5f6a
Fixed #4637 : Add loop parameter to Animation::initWithSpriteFrames function
2014-04-02 11:48:49 +08:00
James Chen
48839b9d4d
closed #4635 : ControlSwitch's marksprite is shown at a wrong place
2014-04-02 11:26:39 +08:00
Huabing.Xu
8561569885
iOS can compile now
2014-04-02 11:21:48 +08:00
Ricardo Quesada
b36ab33281
performance fixes in QuadCommand
2014-04-01 16:13:41 -07:00
Sergey
b153131097
Android crash fix on new devices
2014-04-01 15:14:25 +04:00
James Chen
1a5de6cfa7
Merge pull request #6091 from Dhilan007/develop_label
...
Label:fixed possible appear OpenGL error 0x500.
2014-04-01 15:15:01 +08:00
Dhilan007
c63baa388b
remove unused local variable.
2014-04-01 15:10:24 +08:00
James Chen
70dd83512c
Renames s_isIOS7 to s_isIOS7OrHigher
2014-04-01 15:08:08 +08:00
Dhilan007
540c67f701
Label:fixed possible appear OpenGL error 0x500.
2014-04-01 15:03:17 +08:00
James Chen
47320e7c7c
closed #4383 : Fixed missing letters if using old LabelTTF and running on
...
iphone 64bit simulator(device).
2014-04-01 14:47:52 +08:00
minggo
c3334cb4ac
Merge pull request #6089 from Dhilan007/develop_label
...
Fixed logical error in Label::enableShadow
2014-04-01 14:18:48 +08:00
Dhilan007
eadbca8ee7
1.fixed logical error in Label::enableShadow.
...
2.Add test case for shadow and outline take effect at the same time.
2014-04-01 14:15:35 +08:00
minggo
566fa7110d
Merge pull request #6087 from Dhilan007/develop_label
...
fixed shadow and outline can't take effect at the same time
2014-04-01 14:03:42 +08:00
Dhilan007
3a556c24aa
fixed shadow and outline can't take effect at the same time
2014-04-01 11:37:36 +08:00
minggo
7fb5e1f13a
Merge pull request #6066 from minggo/quadcommand-optimize
...
use xxhash to generate material id
2014-04-01 11:27:51 +08:00
James Chen
d7ca1999ab
Merge pull request #5998 from bmanGH/feature/fix_STRING_TEXTURE_label_sortAllChildren_crash
...
closed #4626 : Crash if label's type is STRING_TEXTURE and label->sortAllChildren is called.
2014-04-01 10:02:35 +08:00
koowolf
36aeb88a9d
Merge branch 'quadcommand-optimize' of https://github.com/minggo/cocos2d-x into quadcommand-optimize
...
Conflicts:
cocos/2d/cocos2d_wp8.vcxproj
cocos/2d/cocos2d_wp8.vcxproj.filters
2014-04-01 09:39:03 +08:00
koowolf
ad653c6cf9
use xxhash in win32 and wp8
2014-03-31 18:38:39 +08:00
Dhilan007
f485d3b6d5
Label:fixed possible blink if label contains shadow.
2014-03-31 18:16:08 +08:00
koowolf
75ec817ac5
use xxhash in win32 and wp8
2014-03-31 17:15:04 +08:00
Dhilan007
d39a419eeb
fixed logical error in Label::create.
2014-03-31 16:06:20 +08:00
Dhilan007
89eba4424f
fixed logical error.
2014-03-31 15:45:06 +08:00
Dhilan007
774debd142
fixed logical error in Label::updateFont.
2014-03-31 15:29:24 +08:00
minggo
504eea0269
use xxhash to generate material id
2014-03-31 13:47:07 +08:00
Dhilan007
cffdb129c9
change type of Label::_shadowNode
2014-03-31 11:47:28 +08:00
Dhilan007
08beaa3532
TextFieldTTF:fixed display incorrect color.
2014-03-31 11:16:12 +08:00
bmanGH
c86ab37685
Label ignore sort children.
2014-03-30 21:08:43 +08:00
bmanGH
503fed5313
fix crash when sort children while label type is STRING_TEXTURE. since the only one child sprite is not add with batch mode
2014-03-30 21:08:43 +08:00
minggo
f80bdfff76
Merge pull request #6055 from MSOpenTech/wp8-3.0
...
Cocos2d-x 3.0 Windows Phone 8 support
2014-03-29 23:21:34 +08:00
Dale Stammen
958c7fdf9d
added winrt and wp8 project files and property sheets
2014-03-28 16:02:23 -07:00
Dale Stammen
afe561cccc
added wp8 and winrt support files and projects
2014-03-28 12:52:16 -07:00
Dale Stammen
77efd401a7
intialize _hasMipmaps to false in constructor
2014-03-28 11:25:57 -07:00
Dale Stammen
6ad8ec00ed
added missing variadicCreate for wp8
2014-03-28 11:25:39 -07:00
Maks Naumov
9644d68259
fix cmake win32 project generation
2014-03-28 19:06:13 +02:00
pandamicro
610524a6e9
Reverse CONSTRUCTOR_ACCESS to public
2014-03-28 18:05:17 +08:00
James Chen
15e584a83c
Merge pull request #6048 from pandamicro/ConstructorAccess2
...
Issue #3897 : Add missed constructors
2014-03-28 18:03:35 +08:00
pandamicro
74a4aa793d
Issue #3897 : Move OrbitCamera constructor into cpp
2014-03-28 18:00:25 +08:00
pandamicro
26f5107381
Reverse CONSTRUCTOR_ACCESS to protected
2014-03-28 17:45:35 +08:00
pandamicro
5fc8050d9e
Issue #3897 : Add missed constructors
2014-03-28 17:45:06 +08:00
Dhilan007
cb50741f5d
Fixed possible crash if invoking FontAtlasCache::purgeCachedData.
2014-03-28 16:52:48 +08:00
Dhilan007
8ab057550f
fixed got wrong Rect by LabelTTF::getBoundingBox / LabelBMFont::getBoundingBox.
2014-03-28 15:58:28 +08:00
James Chen
ecad5ea3ce
Fixed `ExtensionTest/CocoStudioComponentsTest` crash after applying PR #6011 .
2014-03-28 14:55:15 +08:00
James Chen
fd9ab5c4d1
Merge pull request #6039 from Dhilan007/develop_label
...
LabelTTF and LabelBMFont tagged as deprecated
2014-03-28 14:31:11 +08:00
Dhilan007
dd73be16e0
fixed indention.
2014-03-28 14:22:51 +08:00
Dhilan007
898e2136b1
LabelTTF and LabelBMFont tagged as deprecated
2014-03-28 14:18:01 +08:00
James Chen
e87f6991cf
User object has to be released before others, since userObject may have a weak reference of this node.
...
It may invoke `node->stopAllAction();` while `_actionManager` is null if the next line is after `CC_SAFE_RELEASE_NULL(_actionManager)`.
2014-03-28 14:09:51 +08:00
James Chen
c266647447
ParticleSystem should also override `onExit` to unschedule update since in `onEnter`, it will be scheduled again. Otherwise, it'll trigger an assert.
2014-03-28 14:05:38 +08:00
pandamicro
65f4c23004
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2014-03-28 13:56:09 +08:00
James Chen
5c77b4d4b1
Merge pull request #6011 from DarraghCoy/event_listener_crash_fixes
...
closed #4586 : Fix crashes in event dispatch other related safety checks/fixes
2014-03-28 11:28:41 +08:00
minggo
688ac51546
Merge pull request #6036 from Dhilan007/develop_label
...
fixed got wrong Rect by Label::getBoundingBox.
2014-03-28 11:18:50 +08:00
Darragh Coy
0f729126f0
Find another instance where we should null out the node pointer for the current listener after it has been disassociated with the node.
2014-03-27 20:11:37 -07:00
Dhilan007
3da695b184
fixed got wrong Rect by Label::getBoundingBox.
2014-03-28 11:03:39 +08:00
minggo
2c1eb04124
[ci skip]
2014-03-28 10:45:45 +08:00
minggo
de9c5b34c1
Merge pull request #6032 from boyu0/4573_Particle_setVisible_crash
...
closed #4573 : Set particle visible to false then set to true cause crashes.
2014-03-28 10:08:39 +08:00
Dhilan007
2bf256db0a
using 'struct' for reduce looks up in the map.
2014-03-28 09:44:16 +08:00
Darragh Coy
83495e6e9b
Macro wrap some of the other debug checks related to event listeners.
2014-03-27 15:39:52 -07:00
Darragh Coy
c6cd927ea5
When an event listener is removed from the scene and has a node associated with it, NULL out the node pointer so as not to leave any dangling pointers.
2014-03-27 15:37:16 -07:00
Darragh Coy
a778d07ecc
Undo most of the rest of the event dispatcher related changes in this fix. Will update with a much more elegant solution that does not disturb the existing code so much and which ensures no dangling pointers.
2014-03-27 15:22:11 -07:00
Darragh Coy
824efceb3f
Revert "Review feedback: fix memory leak discovered."
...
This reverts commit 07646f1c82
.
2014-03-27 15:14:37 -07:00
Darragh Coy
8ee90389b4
Review feedback: Wrap the debug verification in additional macros which are disabled by default.
...
Require the user to enable 'CC_NODE_DEBUG_VERIFY_EVENT_LISTENERS' in ccConfig.h in order to enable the debug checks in debug builds.
2014-03-27 12:29:28 -07:00
Darragh Coy
6e19da12c3
Review feedback: Remove unnecessary check of EventListener::getSceneGraphPriority() for fixed event listeners.
...
Fixed priority event listeners never have an associated node.
2014-03-27 11:59:07 -07:00
Darragh Coy
07646f1c82
Review feedback: fix memory leak discovered.
...
Always safe release the listener we retain - shift where release happens to the end of the block. Reproduced the leak using the Xcode Leaks instrument in the RemoveListenerAfterAddingTest and verified fixed after apply this change.
2014-03-27 11:28:27 -07:00
Dhilan007
f2cc3a3ce2
Update variable name.
2014-03-27 17:48:16 +08:00
Dhilan007
5a572c1797
closed #4561:Fixed read file more than once for label created by different font size.
2014-03-27 17:04:05 +08:00
boyu0
cb1c3ccd1a
closed #4573 : Set particle visible to false then set to true cause crashes.
...
Because of the update order, _particleIdx may equal to zero.
2014-03-27 16:47:21 +08:00
Dhilan007
408107ff24
closed #4494::Easy to sets texture parameters of label's cache textures.
2014-03-27 15:35:51 +08:00
Dhilan007
cac4e0bbbc
closed #4569:Texture2D support for update partial texture
2014-03-27 15:11:04 +08:00
James Chen
c62144c350
Merge pull request #6022 from Dhilan007/develop_label4565
...
closed #4565:fixed logical error in Label::setFontAtlas.
2014-03-27 14:39:30 +08:00
Dhilan007
8a8fa743eb
closed #4565:fixed logical error in Label::setFontAtlas.
2014-03-27 14:28:32 +08:00
minggo
e52fc981cc
Merge pull request #5977 from dabingnn/develop_fixID_Android_bug
...
Develop fix id android bug
2014-03-27 13:49:53 +08:00
pandamicro
f0bb69bc5f
Revert "Reverse CONSTRUCTOR_ACCESS"
...
This reverts commit 44d446ef1d
.
2014-03-27 10:59:47 +08:00
pandamicro
87384d8ffa
Fixed #4566 : Move LayerGradient's init functions into CC_CONSTRUCTOR_ACCESS section
2014-03-27 10:55:41 +08:00
pandamicro
7f2255e485
Fixed #4566 : Fix coding style problems
2014-03-27 10:01:46 +08:00
Darragh Coy
0ee1095e37
Fix crashes in event dispatch other related safety checks/fixes
...
1: Add a fix to prevent events from being sent to scene nodes which are destroyed. Previously when a node was being destroyed it would try to unregister any event listeners it would have. This process would fail however in the case where event dispatching was already underway because we can't modify the listeners list while we are iterating through it. This is a pretty common occurrence since we often tear down & switch scenes in response to button clicks etc. Fix the problem by nulling out the slot for the listener we are removing in this case, so that it's node no longer receives any events after it is destroyed. The event dispatching code will cleanup this unused/nulled slot once the event processing loop has terminated.
2: When removing an event listener in cocos2d::EventDispatcher, ensure immediately it gets removed from the node priority map and dirty nodes set in order to ensure we don't inadvertently access any dangling pointers to nodes.
3: Add debug checks to ensure nodes have no associated event listeners after they are destroyed. This check will catch the problem fixed by (1) if it is still present.
4: Add some extra debug sanity checks in the event dispatcher to ensure nodes are not added to the lists twice and that they are being properly removed from the lists under certain conditions.
5: In cocos2d::Node's destructor NULL out members after releasing them in case they somehow happen to be accessed during the destructor. Move the release of the event dispatcher to the very end, since we need to check against it in debug.
2014-03-26 13:12:44 -07:00
pandamicro
44d446ef1d
Reverse CONSTRUCTOR_ACCESS
2014-03-26 18:48:01 +08:00
pandamicro
c08bf69370
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into LayerGradientCtor
2014-03-26 18:46:00 +08:00
pandamicro
63772f7d72
Fixed #4566 : Constructor added for LayerGradient
2014-03-26 18:45:08 +08:00
James Chen
849d7b9109
Merge pull request #5996 from chengstory/AddNewCreateNodeWay
...
Adding support of using CCComRender as parent for attached component
2014-03-26 18:20:34 +08:00
zhangcheng
1e6b9f7d9f
remove isRenderer.
2014-03-26 17:02:37 +08:00
zhangcheng
58a61d94fb
add use CCComRender as parent for attaching component
2014-03-26 16:39:32 +08:00
James Chen
22fdbbb198
Merge pull request #5980 from Dhilan007/develop_label2
...
Refactor implementation of label's shadow and fixed stroke was not 'outside stroke' for Label generated by 'Font name'
2014-03-26 16:32:04 +08:00
James Chen
1003847cd1
Mac build fix after merging https://github.com/cocos2d/cocos2d-x/pull/5989
2014-03-26 15:44:38 +08:00
James Chen
21ba509a35
Merge pull request #5989 from dumganhar/iss4559-ios-64bit
...
closed #4559 : Wrong behavior of multi-touch on iphone5s/ipadAir (arm64 arch)
2014-03-26 15:27:57 +08:00
James Chen
691442d80d
closed #4559 : Wrong behavior of multi-touch on iphone5s/ipadAir (arm64 arch)
2014-03-26 15:04:11 +08:00
andyque
57d8f155df
issue #4401 . resolve conflicts
2014-03-26 14:54:50 +08:00
Dhilan007
fa91bf1167
remove unused code and fixed warning.
2014-03-26 14:11:40 +08:00
minggo
a374241f65
Merge pull request #5924 from MSOpenTech/wp8-3.0-cocos2d-changes
...
Windows Phone 8,0 cocos2d-x 3.0 changes
2014-03-26 13:58:46 +08:00
James Chen
7a8db8271f
Merge pull request #5930 from andyque/Branch_issue4429
...
closed #4429 : Boolean value could not be written to specified plist file
2014-03-26 11:46:56 +08:00
Dhilan007
1247760d95
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_label_fixs
...
Conflicts:
cocos/2d/CCLabel.cpp
2014-03-26 11:15:48 +08:00
Dhilan007
41ffa372e8
label: Refactor implementation of shadow.
2014-03-26 11:09:16 +08:00
Huabing.Xu
bc15ac1415
closed #4552 : change assert log message
2014-03-26 10:07:50 +08:00
James Chen
f6c6d428ad
Merge pull request #5926 from andyque/fix_tests_warnings
...
issue #4401 , remove warnings under win32
2014-03-25 18:17:42 +08:00
Huabing.Xu
9aa8327d9c
closed #4552 : separate material ID and openGL ProgramID
2014-03-25 16:54:29 +08:00
James Chen
b6589b0b5a
Merge pull request #5931 from Dhilan007/develop_label
...
label: Support to clip transparent area of Label, content size will be updated with only non-transparent area.
2014-03-25 16:47:12 +08:00
LinWenhai
4b454fe7bb
Update getter of ClipMarginEnabled.
2014-03-25 16:37:34 +08:00