samuele3hu
249163c32d
Update config files for lua bindings-generator and `lua_cocos2dx_manual.cpp` file
2014-04-10 15:52:51 +08:00
James Chen
428cea061c
Merge pull request #6214 from dumganhar/iss4744-set-dirty-for-node
...
closed #4744 : EventDispatcher::setDirtyForNode doesn't consider node's children
2014-04-10 15:35:29 +08:00
James Chen
a258df38a9
closed #4744 : EventDispatcher::setDirtyForNode doesn't consider node's children
2014-04-10 15:31:22 +08:00
koowolf
aa51e5dd22
fix compiler error in wp8
2014-04-10 15:15:17 +08:00
samuele3hu
c4c4358708
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_fix
2014-04-10 15:05:41 +08:00
samuele3hu
2800133c99
Add deprecated support for `Label::create` and new lua binding for `Label:createWithTTF`
2014-04-10 14:54:14 +08:00
CocosRobot
3f1e8c83a4
[AUTO]: updating luabinding automatically
2014-04-10 06:19:59 +00:00
James Chen
7ec9d6907e
Moved the constructor and init function of SpriteBatchNode to protected access.
2014-04-10 14:11:40 +08:00
James Chen
6bdef136a7
Merge pull request #6145 from wefiends/set_fullscreen_videomode
...
CCGLView: Add createWithFullscreen overloaded method that sets video mode.
2014-04-10 12:45:57 +08:00
James Chen
599e14efaa
Merge pull request #6207 from CocosRobot/update_lua_bindings_1397100218
...
[AUTO]: updating luabinding automatically
2014-04-10 11:27:04 +08:00
CocosRobot
782bdd90f5
[AUTO]: updating luabinding automatically
2014-04-10 03:24:38 +00:00
James Chen
efb443dea0
Merge pull request #6200 from dumganhar/iss4729-deprecated-folder
...
issue #4729 : Move deprecated stuff to deprecated folder
2014-04-10 11:17:21 +08:00
James Chen
ba1f535201
Merge pull request #6199 from Dhilan007/develop_label
...
closed #4743 : Label:Makes the create functions of Label clearer.
2014-04-10 11:15:56 +08:00
Huabing.Xu
231cdcb906
adjust comment message
2014-04-10 11:14:46 +08:00
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
chuanweizhang2013
91e42a17f5
Merge pull request #21 from cocos2d/develop
...
update cocos2d-x
2014-04-10 10:28:12 +08:00
Dhilan007
390685ae93
Label:Change setter of system font name.
2014-04-10 10:23:00 +08:00
James Chen
9a25613eb2
Merge pull request #6203 from dumganhar/develop
...
Fix for CC_CALLBACK_3 macro
2014-04-10 10:08:34 +08:00
James Chen
7db741cf42
Fix for CC_CALLBACK_3 macro
2014-04-10 10:07:01 +08:00
Anton Sokolchenko
eb568998b2
Update SimpleAudioEngineOpenAL.cpp
2014-04-10 01:00:23 +03:00
Anton Sokolchenko
5fadd6f9ab
Fix memory leak
...
471: If this executed "if (!file.file) ", then
473: dynamically allocated variable "data" is leaked.
2014-04-09 23:25:54 +03: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
364fc4722a
issue #4729 : Updates CCInputDelegate.h
2014-04-10 00:52:41 +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
377086d67a
issue #4729 : don't use 'using namespace std;'
2014-04-10 00:36:42 +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
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
samuele3hu
b6579aa322
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_label
2014-04-09 16:25:44 +08: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
James Chen
39cca5012c
Merge pull request #6188 from Mazyod/develop-cocos2dx
...
[FIX]: HTTPClient should not report 2xx status codes as errors!
2014-04-09 15:27:52 +08:00
James Chen
671832acb7
Merge pull request #6184 from shujunqiao/lua-manual-console
...
[lua] add wait/send/addCommand function for manual-console in lua_cocos2dx_manual.cpp
2014-04-09 15:16:27 +08:00
Mazyad Alabduljaleel
1928a0cb07
= [FIX]: HTTPClient should not report 2xx status codes as errors!
2014-04-09 11:07:51 +04:00
Dhilan007
d310d8d099
closed #4659:Remove the usage of OpenSL
2014-04-09 14:57:07 +08:00
Huabing.Xu
a269ac2864
remove kmMat4 interface in cocostudio and UI
2014-04-09 14:44:54 +08:00
samuele3hu
1c124f52ad
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_label
2014-04-09 14:29:04 +08:00
samuele3hu
dbd01051d8
close #4721:clone for EventListeners of lua didn't clone the related property
2014-04-09 14:26:05 +08:00
Huabing.Xu
504fa2aa60
remove kmMat4 interface in AffineTransform
2014-04-09 14:21:41 +08:00
shujunqiao
2c2876698d
add wait/send/addCommand function for manual-console in lua_cocos2dx_manual.cpp.
2014-04-09 14:20:02 +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
James Chen
d93a7e6445
Merge pull request #6177 from DarraghCoy/small_dangling_ptr_fix
...
Small dangling ptr fix to EventDispatcher::removeEventListenersForTarget
2014-04-09 13:22:24 +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
chuanweizhang2013
c75466f555
Merge pull request #20 from cocos2d/develop
...
update cocos2d-x
2014-04-09 09:43:01 +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
shujunqiao
9391906738
modify const char* to std::string in CCConsole.
2014-04-08 18:20:06 +08:00
minggo
3703c6f73a
update version
2014-04-08 18:14:46 +08:00
minggo
6208943cb1
Merge pull request #6168 from heliclei/fix-console-upload
...
closed #4533:fix console upload hang issue
2014-04-08 17:55:15 +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
28ebec46dc
Merge pull request #6151 from mgcL/ScriptHandlerMgr-memory-free
...
add destroyInstance for ScriptHandlerMgr
2014-04-08 15:41:18 +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
heliclei
4e1284bd45
closed #4533:fix console upload hang issue
2014-04-08 14:52:53 +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
James Chen
1b85be2b9b
Merge pull request #6150 from mgcL/Value-memory-leak
...
A potential memory leak in value's default constructor.
2014-04-07 16:32:01 +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
mgcL
d9e0124ff8
delete _scriptHandlerMgr in destruct will cause stack overflow
2014-04-05 21:26:56 +08:00
mgcL
a5da6d71b4
add destroyInstance for ScriptHandlerMgr
2014-04-05 21:09:49 +08:00
mgcL
a3a3fa0907
fix Value's memory leak
2014-04-05 18:55:55 +08: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
CocosRobot
cd33967dc4
[AUTO]: updating luabinding automatically
2014-04-04 10:45:34 +00: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
James Chen
541d4dea0c
Merge pull request #6105 from andyque/feature3636
...
Added create functions with parameters for all ui controls
2014-04-04 18:34:59 +08:00
andyque
4b6aa2a22c
closed #4636 . remove Hungary style
2014-04-04 18:26:53 +08:00
Nick Barrios
eae1ccb279
CCGLView: Remove frameZoomFactor param from createWithFullScreen overload.
2014-04-04 06:26:00 -04:00
cw
c0fe791aae
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into luaruntime
...
Conflicts:
templates/lua-template-runtime/src/main.lua
2014-04-04 18:17:54 +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
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
andyque
e346ed3559
closed #4636 . done
2014-04-04 17:38:58 +08:00
andyque
e20b3d8eb8
issue #4636 . refactor SliderReader
2014-04-04 17:35:15 +08:00
Huabing.Xu
f1b1678900
Director::getMatrix returns Matrix instead of kmMat4
2014-04-04 17:31:21 +08:00
andyque
af5fe04480
issue #4636 . refactor LoadingBarReader
2014-04-04 17:25:20 +08:00
andyque
a4e0c1a6e2
issue #4636 . refactor LayoutReader
2014-04-04 17:21:23 +08:00
andyque
3482815e69
issue #4636 . refactor ImageViewReader
2014-04-04 17:18:24 +08:00
Huabing.Xu
ea6d8e4e42
replace kmMat4 in director
2014-04-04 17:16:57 +08:00
andyque
c252aa5a55
issue #4636 . refactor CheckBoxReader
2014-04-04 17:12:47 +08:00
andyque
77aee27f05
issue #4636 . refactor ButtonReader
2014-04-04 16:51:07 +08:00
andyque
51404500b7
issue #4636 . fixed WidgetReader error
2014-04-04 16:24:54 +08:00
andyque
ec83b3db04
issue #4636 . fix ButtonReader
2014-04-04 15:21:28 +08:00
James Chen
7b4a1308ea
Adds `Renderer::clean`, and fixes crash in `PerformanceTest/Node
...
children Test`.
2014-04-04 12:48:16 +08:00
CocosRobot
c72f256d01
[AUTO]: updating luabinding automatically
2014-04-03 10:12:05 +00:00
James Chen
1ec3f014e8
Merge pull request #6130 from dumganhar/iss4557-set-enabled-listener
...
closed #4557 : Adds `EventListener::setEnabled/isEnabled`.
2014-04-03 18:02:44 +08:00
Huabing.Xu
f9405e0ea9
Merge branch 'develop' into develop_migrate_math_lib_merge
2014-04-03 17:47:16 +08:00
CocosRobot
279b371031
[AUTO]: updating luabinding automatically
2014-04-03 09:46:03 +00: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
andyque
9bcfea2279
issue #4636 . fix some typo
2014-04-03 17:13:24 +08:00
samuele3hu
550f4dca29
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_label
2014-04-03 17:03:09 +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
samuele3hu
b68f6bf65e
fix the error about `draw` of GLNode and modify the related test cases
2014-04-03 17:02:14 +08:00
James Chen
7a5dba9eb9
issue #4557 : Adds const for `EventListener::isEnabeld`.
2014-04-03 16:46:16 +08:00
James Chen
ec56796062
Merge pull request #6125 from 2youyouo2/develop
...
Two fixes for armature:
1.fixed set blend func
2.fixed changedisplay does not rebind parent's bone
2014-04-03 16:23:55 +08:00
James Chen
405b1c6036
Merge pull request #6122 from mgcL/PhysicsShapeEdgeChain-create-failed
...
fix PhysicsShapeEdgeChain::init() always return false
2014-04-03 16:20:36 +08:00
yinkaile
66e37cf481
remove cc prefix
2014-04-03 16:19:49 +08:00
andyque
c35c006fbd
Merge branch 'develop' into feature3636
2014-04-03 16:02:00 +08:00
andyque
0875b4e51f
closed #4636 . Done
2014-04-03 15:56:45 +08:00
andyque
ed2c38eb98
issue #4636 , finish UITextBMFont
2014-04-03 15:45:06 +08:00
James Chen
89048dd6bd
closed #4557 : Comment fixes in CCEventListener.h.
2014-04-03 15:35:18 +08:00
andyque
b59beab61a
issue #4636 , finish UISlider
2014-04-03 15:33:57 +08:00
James Chen
f6859a3ca9
closed #4557 : Adds `EventListener::setEnabled/isEnabled`.
2014-04-03 15:32:16 +08:00
Huabing.Xu
960ac300d5
migrate cocostudio to director matrix stack
2014-04-03 14:55:55 +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
andyque
48429f5738
issue #4636 . finish UILoadingBar
2014-04-03 11:34:06 +08:00
andyque
fe33588038
issue #4636 . finish UILayout
2014-04-03 11:14:35 +08:00
andyque
1a97ebdcb0
issue #4636 . finish UIImageView
2014-04-03 10:42:30 +08:00