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

2306 Commits

Author SHA1 Message Date
minggo 38b982f938 Merge pull request #6286 from dumganhar/rename-listener-method 
Renames the protected method: 'EventListener::(s|g)etSceneGraphPriority'-> 'EventListener::(s|g)etAssociatedNode'
 2014-04-15 13:43:25 +08:00
boyu0 b53961b78d issue $4771: fix lua test and fix some bugs 2014-04-15 13:40:44 +08:00
James Chen 8134404734 Renames the protected method: 'EventListener::(s|g)etSceneGraphPriority' 
-> 'EventListener::(s|g)etAssociatedNode'
 2014-04-15 12:50:33 +08:00
Ricardo Quesada 3978cee2ee compiles on windows 2014-04-14 20:00:06 -07:00
Ricardo Quesada 584ccf65e4 Culling working again 2014-04-14 16:46:19 -07:00
boyu0 c98f50026f issue $4771: move PhysicsWorld to layer. 2014-04-15 03:21:18 +08:00
Huabing.Xu 15cc63c2ba remove kmVec3 in ActionCamera 2014-04-14 15:26:05 +08:00
minggo 26494c000b Merge pull request #6257 from dumganhar/group-command-manager-not-singleton 
GroupCommandManager should not be a singleton, it should be managed by Renderer.
 2014-04-14 14:52:39 +08:00
minggo bb15d0ecf9 Merge pull request #6267 from dabingnn/develop_add_culling_enabled_option 
Add interface setCullingEnabled(), culling is disabled by default
 2014-04-14 14:50:11 +08:00
Huabing.Xu 3601fe9297 android can work 2014-04-14 14:30:17 +08:00
Huabing.Xu c3bf78494a remove CCFrustum.cpp, we will use new instead 2014-04-14 14:18:32 +08:00
James Chen eb651a6ae4 Merge pull request #6272 from Dhilan007/develop 
LabelTTF:fixed display incorrect if create by FontDefinition.
 2014-04-14 14:09:50 +08:00
Huabing.Xu ec5398e7c6 Merge branch 'develop' into develop_migrate_math_lib_merge 
Conflicts:
	tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.h
 2014-04-14 14:08:19 +08:00
Dhilan007 aef2767d23 change variable name. 2014-04-14 13:42:37 +08:00
Dhilan007 6fe64b83f8 LabelTTF:fixed display incorrect if create by FontDefinition. 2014-04-14 11:33:46 +08:00
Huabing.Xu 9935e8ddfb setCullingEnabled set to public access 
changed renderer->culling test case
 2014-04-14 11:33:40 +08:00
minggo 9f9a87f09d Merge pull request #6254 from dumganhar/clippingnode-leak 
Memory leak fix for ClippingNode
 2014-04-14 10:17:37 +08:00
James Chen 44a01be0f5 Merge pull request #6266 from dumganhar/develop 
Const love: std::function<void(Texture2D*)> -> const std::function<void(Texture2D*)>&
 2014-04-14 10:04:44 +08:00
James Chen 5000873778 Const love: std::function<void(Texture2D*)> -> const 
std::function<void(Texture2D*)>&
 2014-04-14 10:01:17 +08:00
Huabing.Xu 37bfeff8f0 Add interface setCullingEnabled(), culling is disabled by default 2014-04-14 09:56:01 +08:00
Huabing.Xu 80f96398b3 1. changed comment message in CCNode.cpp 
2. changed Director projection to Matrix
 2014-04-14 09:30:51 +08:00
Sachin Garg 69223549f3 Add support for orientation change callback (applicationScreenSizeChanged) in Android Java activity. 2014-04-14 05:46:30 +05:30
Anton Sokolchenko 65cf2e1256 Update CCImage.cpp 2014-04-13 01:13:58 +03:00
Anton Sokolchenko a9ccb812ed Fix memory leak 2014-04-12 18:47:00 +03:00
Sergey 436285accd isActivityVisible method 2014-04-12 12:38:01 +04:00
James Chen b276c42ae6 GroupCommandManager should not be a singleton, it should be managed by Renderer. 2014-04-12 13:01:42 +08:00
James Chen 922b399ef2 Memory leak fix for ClippingNode 2014-04-12 12:56:36 +08:00
Huabing.Xu a8378a2b99 adjust comment 2014-04-11 17:31:35 +08:00
Huabing.Xu 7c027b16b0 change assert message 2014-04-11 16:07:55 +08:00
Huabing.Xu 51289e8a4c 1. add assert condition of rendering when adding command 
2. fix bug: renderTexture->SpriteRenderTextureBug
 2014-04-11 16:05:22 +08:00
Huabing.Xu 554ede75f0 remove kmMat4 in ActionCamera.cpp 2014-04-11 14:00:55 +08:00
Huabing.Xu e5802a56da remove kmMat4 in RenderTexture.cpp 2014-04-11 13:58:42 +08:00
James Chen 588d825691 Merge pull request #6236 from dumganhar/develop 
Small fix in CCRenderer.cpp, 'auto i = 0' -> 'ssize_t i = 0' in for loop
 2014-04-11 13:53:54 +08:00
James Chen 85cc100ac4 Small fix in CCRenderer.cpp, 'auto i = 0' -> 'ssize_t i = 0' in for loop 2014-04-11 13:51:40 +08:00
Huabing.Xu 685b9ea297 android can work now 2014-04-11 12:02:56 +08:00
Huabing.Xu 1670e07300 Merge branch 'develop' into develop_migrate_math_lib_merge 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	build/cocos2d_tests.xcodeproj/project.pbxproj
 2014-04-11 11:18:13 +08:00
Huabing.Xu ad18add1af remove kmMat4 in Sprite.cpp 2014-04-11 11:00:08 +08:00
James Chen 48a5fd555b Compilation error fix in CCQuadCommand.cpp 2014-04-11 10:50:38 +08:00
James Chen dbeefcdff2 Merge commit 'refs/pull/6230/head' of git://github.com/cocos2d/cocos2d-x into pull/6230 2014-04-11 10:48:29 +08:00
Huabing.Xu 591b1e9231 remove kmMat4 in Node.cpp 2014-04-10 23:12:29 +08:00
minggo 951bf1cbfa remove unneeded codes 2014-04-10 22:56:40 +08:00
Huabing.Xu d70305cf3b remove kmMat4 in Render.cpp GLProgram, Grid, Layer 2014-04-10 22:38:57 +08:00
James Chen 6b21e598c5 [win32] Fix typo in cocos2d_(winrt_|wp8_)headers.props, gui -> ui 2014-04-10 21:14:24 +08:00
James Chen 1fdcaaa2c6 Initialzies member variables for QualCommand class. 2014-04-10 20:31:44 +08:00
James Chen 7b4bec1395 Merge pull request #6226 from dumganhar/develop 
Initializes member variables for TransitionScene class
 2014-04-10 19:33:17 +08:00
James Chen e7a4ac531a Initializes member variables for TransitionScene class 2014-04-10 19:29:07 +08:00
Huabing.Xu 84cf5ca895 remove kmMat4 in Director.cpp 2014-04-10 17:36:47 +08:00
James Chen 167682fb46 Merge pull request #6222 from Dhilan007/develop 
Add CCFontFNT.h to cocos2d.h
 2014-04-10 17:33:36 +08:00
Dhilan007 8472e51b85 Add CCFontFNT.h to cocos2d.h 2014-04-10 17:31:42 +08:00
James Chen 5d882cea23 Merge pull request #6213 from koowolf/wp8_fix 
fix compiler error in wp8
 2014-04-10 17:10:08 +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
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 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
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
zhangbin 36892c3a98 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into issue2880 2014-03-25 16:21:41 +08:00
zhangbin d6ad9274c4 closed #2880, Generate mipmap for the texture has mipmaps when reload textures. 2014-03-25 16:19:34 +08:00
Dhilan007 674dffce21 Merge branch 'develop-label-stroke' of https://github.com/dumganhar/cocos2d-x into develop_label_fixs 2014-03-25 16:10:47 +08:00
James Chen 34245d4bd0 Merge pull request #5953 from dumganhar/merge5934 
closed #4541: [ui] Removed Widget::addNode, added ProtectedNode.
 2014-03-25 15:46:56 +08:00
minggo 3fc15e5e7d Merge pull request #5896 from splhack/remove_nativeactivity 
Remove NativeActivity
 2014-03-25 15:37:12 +08:00
minggo cab21adf4a Merge pull request #5919 from boyu0/bug4499_ParticleSystem_endRadiusVar_bug 
closed #4499: Read ParticleSystem::modeB.endRadiusVar from "minRadiusVariance...
 2014-03-25 15:34:36 +08:00
James Chen 45b98e7dc0 issue #4541: s_globalOrderOfArrival is an static variable of Node class. 2014-03-25 15:07:11 +08:00
LinWenhai 19341ceaf4 add getter of ClipMarginEnabled. 2014-03-25 14:54:42 +08:00
CaiWenzhi 2dffcb9808 Add ProtectedNode and remove "addNode" 2014-03-25 14:28:58 +08:00
James Chen 093b792221 Merge pull request #5946 from boyu0/iss3804_change_image_private_to_protected 
closed #3804: Change private functions and variables in Image class to protected, since its subclasses may need them.
 2014-03-25 14:07:58 +08:00
James Chen 32f647d38b Merge pull request #5940 from boyu0/iss4513_particle_readd_bug 
closed #4513: Particle doesn't animate when it was removed and re-added to another node.
 2014-03-25 14:05:12 +08:00
James Chen 8d28884c9f Merge pull request #5806 from Dhilan007/develop_reImplementationWithLabel 
issue #3821: Uses new label instead of LabelTTF in engine.
 2014-03-25 13:46:17 +08:00
James Chen 5625c98443 Merge pull request #5942 from Dhilan007/develop_label2 
label: 1) change default value of anchor point to Middle.
2) Shadow offset and outline size passed to new Label consider 'contentScaleFactor'
 2014-03-25 11:39:53 +08:00
boyu0 db0fe60974 closed #3804: Change Image private function and variable to protected, for the subclasses can use them. 2014-03-25 11:13:44 +08:00
Kazuki Sakamoto 3fba61f384 Remove NativeActivity 2014-03-24 19:57:29 -07:00
Dhilan007 8278a510aa Label:fixed shadow offset didn't consider 'contentScaleFactor' 2014-03-25 10:41:53 +08:00
Dhilan007 859fe98502 label:1.change default value of anchor point. 2.Shadow offset and outline size passed to new Label didn't consider 'contentScaleFactor' 2014-03-25 09:58:16 +08:00
Dale Stammen 04b529d328 fixed use of nullptr in variable args for wp8 2014-03-24 15:09:24 -07:00
pandamicro 45d4397d20 Issue #3897: Make Constructors public in Cocos2d-JS 2014-03-24 22:05:19 +08:00
boyu0 759ec61639 closed #4513: Particle doesn't animate when readd it. 2014-03-24 18:08:55 +08:00
pandamicro bdfcc6c8cc Issue #3897: Add missed constructors 2014-03-24 17:44:01 +08:00
James Chen 6defa062a8 closed #4530: Using 'Outside stroke' instead of 'Inside Stroke' for Label generated by 'Font name'. And fix stroke could not work on iOS7. 2014-03-24 16:58:31 +08:00
James Chen db7057e6f2 closed #4529: Stroke size and shadow offset don't consider ContentScaleFactor 2014-03-24 16:58:31 +08:00
James Chen 892662c5ef Merge pull request #5932 from pandamicro/ComponentScriptSupport 
Component script support
 2014-03-24 14:41:16 +08:00
pandamicro 6a8dfc4664 Fixed #4512: JSB script support added to Component 2014-03-24 14:24:27 +08:00
Dhilan007 538c01e76e label:support clip blank of upper and lower margin. 2014-03-24 14:16:27 +08:00
andyque 4a974e24df revert vcxproj files 2014-03-24 10:50:48 +08:00
andyque f5795c25b6 remove warnings under win32 2014-03-24 10:12:40 +08:00
Dale Stammen aa0dae4d1f added CC_PLATFORM_WINRT and WP8 2014-03-22 06:10:07 -07:00
Dale Stammen 6ee7f5d325 added CC_PLATFORM_WINRT and WP8 2014-03-22 06:09:48 -07:00
Dale Stammen bfaa5882fe fix for RELATIVE reserved word in wp8 compiler 2014-03-22 06:09:16 -07:00
Dale Stammen 44e6efea64 #pragma mark for ios and mac only 2014-03-22 06:08:05 -07:00
Dale Stammen b50a158b62 need to terminate variable args list with NULL. nullptr will not work with wp8 compiler 2014-03-22 06:04:36 -07:00
Dale Stammen 2577fc39d8 #pragma mark for ios and mac only 2014-03-22 05:58:37 -07:00
Dale Stammen fb574697aa added support for precompiled shaders in wp8 2014-03-22 05:58:07 -07:00
Dale Stammen 5e402ee433 fix for generic already defined in wp8 2014-03-22 05:56:49 -07:00
Dale Stammen 294341d0ab fixed texture memory leak and added comments to indicate problem 2014-03-22 05:56:08 -07:00
Dale Stammen 65400bf87b added wp8 device orientation. added purge for FontAtlasCache. Disabled console for wp8/winrt until networking code is added 2014-03-22 05:55:08 -07:00
Dale Stammen f6b57df505 added WP8 and WINRT platforms 2014-03-22 05:53:09 -07:00
Dale Stammen 77ab59ebab #pragma mark for ios and mac only 2014-03-22 05:52:45 -07:00
Dale Stammen 409ad77b6c disabled webp for wp8 and winrt 2014-03-22 05:51:39 -07:00
Dale Stammen e3e4e88bce added WP8 and WINRT platforms 2014-03-22 05:50:55 -07:00
James Chen da0c15c982 Merge pull request #5847 from newnon/develop_small_improvements 
Adds getCurrentLanguageCode() which returns iso 639-1 language code
 2014-03-21 16:33:43 +08:00
boyu0 5edb9b9f86 closed #4499: Read ParticleSystem::_endRadiusVar from "minRadiusVariance" in plist. 2014-03-21 16:25:22 +08:00
James Chen c30f466d56 Merge pull request #5915 from boyu0/iss3509_physicsbody_moves_randomly_when_switch_foreground_background 
closed #3509: PhysicsBody moves randomly when switch foreground/background
 2014-03-21 15:25:52 +08:00
boyu0 bc13956981 closed #3509: PhysicsBody moves randomly when switch foreground/background. 2014-03-21 15:16:55 +08:00
James Chen cecc00c650 Merge pull request #5893 from Dhilan007/develop_label 
closed #4489: Label: Refactoring relevant functions of setting text color.
 2014-03-21 14:52:55 +08:00
Dhilan007 1a08cd9b32 fix typo. 2014-03-21 13:52:12 +08:00
James Chen f51c39c034 closed #3897 : Constructors should be protected, but should be a way to disable them, added CC_CONSTRUCTOR_ACCESS. 
Thank @pandamicro.
 2014-03-21 13:44:29 +08:00
Dhilan007 6b74794c74 fix typo and mistake in Label::setTextColor. 2014-03-21 09:47:29 +08:00
Dhilan007 9dfa099bef Label:Refactoring related functions of color. 2014-03-20 20:56:10 +08:00
andyque f26ae8a019 remove unused params warnings 2014-03-20 16:34:42 +08:00
andyque 7ab639ec0f fix lots compile warnings 2014-03-20 16:24:55 +08:00
andyque 8c1bf48357 fixed label font size: from int to float 2014-03-20 15:03:48 +08:00
andyque 2dcc600fa1 remove unused accelerometer 2014-03-20 14:29:05 +08:00
andyque 8a409db1b6 change setFontSize from int to float 2014-03-20 14:14:02 +08:00
andyque 957eb9363e fix win32 compile error 2014-03-20 13:42:09 +08:00
andyque ca6851f114 fix warnings of font and RichText 2014-03-20 11:58:36 +08:00
andyque 6c16f16b1d fix CCDirectorCaller warnings 2014-03-20 11:32:43 +08:00
andyque 7ae77c9335 fix cocos2dx engine internal warnings 2014-03-20 10:58:04 +08:00
Sergey 13df593ae7 file attributes fixed 2014-03-19 18:58:19 +04:00
James Chen bed76d4460 Merge pull request #5870 from dabingnn/fix_scale0Bug 
closed #4382: added missed scaleZ feature in ScaleTo and ScaleBy.
 2014-03-19 18:28:12 +08:00
James Chen db4dd81030 Merge pull request #5871 from dumganhar/iss4450-missing-slash 
closed #4450: FileUtils::addSearchResolutionsOrder doesn't check whether there is a 'slash' at the end of path.
 2014-03-19 17:57:40 +08:00
James Chen a84873a67b closed #4450: FileUtils::addSearchResolutionsOrder doesn't check whether there is a 'slash' at the end of path. 2014-03-19 17:56:29 +08:00
James Chen 740aa30713 closed #4447: [Desktop] Can't receive touchEnded event when mouse up outside of window 2014-03-19 17:09:10 +08:00
andyque c90ef00668 add bool support for other platform 2014-03-19 16:47:57 +08:00
andyque cadbfbe9b1 add Bool Integer Float Double support to CCDictionary 2014-03-19 16:47:57 +08:00
andyque 00249328a6 add boolean support for mac and ios 2014-03-19 16:47:57 +08:00
Huabing.Xu dc9baa7c72 closed #4382: added missed scaleZ feature for scaleZ 2014-03-19 16:23:14 +08:00
James Chen 7061641dd8 Merge pull request #5860 from Dhilan007/develop_label 
closed #4434: Label's color is incorrect if it's created by font name
 2014-03-19 14:09:32 +08:00
Dhilan007 bb17da8f88 add override for Label::updateDisplayedColor 2014-03-19 10:36:44 +08:00
Dhilan007 f76460aee8 closed issue#4434:fixed display incorrect color of label if create by font name. 2014-03-19 10:10:47 +08:00
James Chen a5e9630db1 Merge pull request #5843 from Dhilan007/develop_label 
closed #4428: fixed display incorrect of multi-line label if invoking 'getLetter'.
 2014-03-19 09:52:14 +08:00
Dhilan007 a286ed8374 fixed typo. 2014-03-18 13:48:41 +08:00
samuele3hu 76abe8d1c9 make FileUtilsWin32::getWritablePath() return value unified whether release or debug 2014-03-18 10:51:07 +08:00
Sergey f65ef462e5 getCurrentLanguageCode() for all platforms return iso 639-1 language code 
iPhone template improvements(for game center support)
 2014-03-17 22:34:21 +04:00
Dhilan007 46a4c17097 change access specifier of SpriteBatchNode::addSpriteWithoutQuad. 2014-03-17 19:31:58 +08:00
Dhilan007 cc671835f8 closed issue#4428:fixed label display incorrect if invoking getLetter and it's multi-line. 2014-03-17 18:33:15 +08:00
James Chen 2e13d45848 Merge pull request #5819 from Dhilan007/develop_menu 
fixed content size of MenuItem is incorrect when font size or font name ...
 2014-03-15 01:27:05 +08:00
Dhilan007 e20676f939 fixed content size of MenuItem is incorrect when font size or font name change. 2014-03-15 01:24:23 +08:00
James Chen a47923e06d Fix potential overflow in Texture::getCachedTextureInfo. 2014-03-15 01:09:22 +08:00
James Chen c033591e6a [win32] Overflow fix when using MultiByteToWideChar and WideCharToMultiByte. 2014-03-15 01:05:04 +08:00
James Chen 306df0537e Reverts changes in CCApplication.cpp/.mm, pollEvent must after main loop, otherwise, potential crash will happen. 2014-03-15 00:10:39 +08:00
Dhilan007 e512235299 Remove the old implementation of LabelTTF 2014-03-14 21:06:40 +08:00
James Chen 9bc48a7ac1 PollEvents before main loop and beautifies codes in CCApplication.cpp/.mm. 2014-03-14 18:40:04 +08:00
James Chen a5775e9e6a Merge pull request #5793 from koowolf/win32_crash 
Crash while clicking close button on desktop platforms
 2014-03-14 18:26:34 +08:00
James Chen edde48e132 Merge pull request #5798 from Dhilan007/develop_label 
closed #4377: LabelAtlas::setColor takes no effect.
 2014-03-14 18:07:36 +08:00
Dhilan007 c4d91f512d LabelAtlas:fixed display incorrect color. 
MenuItem:using Label to replace LabelTTF.
 2014-03-14 17:36:05 +08:00
koowolf ad5f870f7c fix close crash in linux and mac 2014-03-14 17:21:27 +08:00
koowolf 90f5d6511e fix win32 crash while click close button. 2014-03-14 16:13:32 +08:00
James Chen 8c7bc11931 Merge pull request #5790 from dumganhar/warning-fix-and-project-update 
Warning fix and update VS project to fix compilation errors when building in Release mode
 2014-03-14 15:48:55 +08:00
James Chen 177bf4df9d Some warning fixes. 2014-03-14 15:38:43 +08:00
James Chen a94b82e738 Updates VS project to fix compilation errors when building in Release mode. 2014-03-14 15:30:12 +08:00
Dhilan007 5f6fbc6a33 label:fixed getter for font size and font name. 2014-03-14 15:18:45 +08:00
Dhilan007 971b1dd557 Label:fixed text display incorrect when come to foreground on android. 2014-03-14 14:59:26 +08:00
Dhilan007 36bfd6d2c2 label:fixed incorrect effect of outline. 2014-03-14 09:51:39 +08:00
James Chen 8743b00d9f Merge pull request #5768 from Dhilan007/develop_label2 
Refactor setter of label's font name and font size.
 2014-03-13 21:14:36 +08:00
Dhilan007 fe6f485a6b label:rename some API for clearly. 2014-03-13 21:00:36 +08:00
Dhilan007 62d0fa8564 label:rename some API for clearly. 2014-03-13 20:52:33 +08:00
andyque c4e20dd63a fix ease action error 2014-03-13 19:53:06 +08:00
Dhilan007 bc68c6b629 Refactor setter of label's font name and font size. 2014-03-13 18:46:35 +08:00
heliclei c26b103b23 remove node name related features from v3.0 2014-03-13 10:45:02 +08:00
James Chen ac0aecb394 Merge pull request #5737 from dumganhar/runtime-fix 
Lua Runtime fix
 2014-03-12 21:48:35 +08:00
James Chen 77a8476c80 GLView::end needs to release self. 2014-03-12 21:45:57 +08:00
James Chen ac4faeb8c4 Merge pull request #5730 from Dhilan007/develop_label 
Label:Fixes the font rendering on Windows and  possible crash when create the label by font name.
 2014-03-12 21:25:38 +08:00
Dhilan007 3acaf3ece5 1.Label:Fixes the font rendering on Windows. 
2.fixed Label::setColor crash when create the label by font name.
 2014-03-12 20:39:13 +08:00
James Chen f609d57a00 Merge pull request #5671 from heliclei/walk-node-tree 
Add enumerateChildrenByName for walking through node tree with callback
 2014-03-12 18:23:43 +08:00
heliclei 2a3cb0847e refactor api name 2014-03-12 18:10:45 +08:00
James Chen f01ca554aa Merge pull request #5708 from Dhilan007/develop_label 
fixed incorrect initial value of label's TextVAlignment.
 2014-03-12 16:46:22 +08:00
Dhilan007 c11ef679da fixed incorrect initial value of label's TextVAlignment. 2014-03-12 16:11:12 +08:00
James Chen 2ae283d506 Merge pull request #5702 from dumganhar/glview-inherit-order 
Changes the order of inheritance for GLView. Reason:
 2014-03-12 15:34:53 +08:00
James Chen a974e5e42b Merge pull request #5704 from Dhilan007/develop_label 
label: Change default font size from `32` to `12`, it's compatible with old LabelTTF.
 2014-03-12 15:33:30 +08:00
Dhilan007 f5daf1af24 label:change default font size 2014-03-12 15:30:14 +08:00
James Chen ca27bc4d6f Merge pull request #5703 from Dhilan007/develop_label 
label:fixed crash and incorrect getter.
 2014-03-12 15:23:06 +08:00
Dhilan007 2786b40dc3 using string::empty() for judge whether string is empty. 2014-03-12 15:03:22 +08:00
Dhilan007 233b04269b label: 
1.fixed crash if create label by font name and text is empty.
2.fixed getter of font name and font size is incorrect.
 2014-03-12 14:49:19 +08:00
James Chen 42c724a59d Changes the order of inheritance for GLView. Reason: 
```
 	bool ok = true;
 	JSObject *obj = JS_THIS_OBJECT(cx, vp);
 	js_proxy_t *proxy = jsb_get_js_proxy(obj);
	cocos2d::GLViewProtocol* cobj = (cocos2d::GLViewProtocol *)(proxy ? proxy->ptr : NULL);   // This line will cause the 'cobj' to be an invalid object, since the instance is a 'GLView', but we force cast it to 'GLViewProtocol*'.
 	JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_GLViewProtocol_setDesignResolutionSize : Invalid Native Object");
 	if (argc == 3) {
 		double arg0;

```
After changing the order, the result could be fixed. But I don't know whether it's the best way to fix it. Anyway, it wouldn't break anything right now.
 2014-03-12 14:43:51 +08:00
heliclei d57d2f3059 Merge remote-tracking branch 'upstream/develop' into walk-node-tree 2014-03-12 14:19:55 +08:00
heliclei a907580d0a use lambda callback 2014-03-12 14:15:45 +08:00
James Chen 4b4b706066 Merge pull request #5635 from andyque/fix_ease_action 
fix wrong display of ease elastic action test.
 2014-03-12 12:07:26 +08:00
James Chen 0bf58c8096 Merge pull request #5690 from Dhilan007/develop_labelttf 
issue #3821: LabelTTF was re-implemented as a wrapper of Label.
 2014-03-12 11:18:40 +08:00
Dhilan007 6f165bb592 fixed incorrect initial value of label type. 2014-03-12 11:06:51 +08:00
Dhilan007 aefafdbe77 Add conditions to evaluate for setter of font size and font name. 2014-03-12 10:53:51 +08:00
Dhilan007 bc7e39283f issue #3821:LabelTTF re-implemented as a wrapper of Label. 2014-03-12 10:19:33 +08:00
Dhilan007 d96cc9ecb9 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-03-12 10:08:57 +08:00
minggo b2e27947a3 Merge pull request #5654 from dabingnn/develop_RenderTextureImprovement 
Develop render texture improvement
 2014-03-11 18:50:51 +08:00
Dhilan007 df12ca963e issue #4337:label support create by font name,compatible with old labelTTF 
1.fixed color and opacity has not yet gone into effect.
2.fixed display is not consistent with old LabelTTF when content scale factor of Director not equal to 1.
 2014-03-11 18:06:14 +08:00
Dhilan007 b72d009eac Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-03-11 16:16:07 +08:00
heliclei 80417f0f35 correct naming convetion 2014-03-11 15:27:28 +08:00
Dhilan007 c2ef7b8796 fix incorrect implementation of Label::getContentSize 2014-03-11 15:03:16 +08:00
Dhilan007 792e182e12 typo fix and coding style improvements. 2014-03-11 14:32:07 +08:00
heliclei 8db680b9ee add EnumChildNodesByName, walk node tree with callback 2014-03-11 13:58:43 +08:00
minggo 2aa5c7aadd Merge pull request #5649 from dabingnn/develop_fix_clippingNodeShaderBug 
closed #4315: fixed clippingNode alphaTest Bug
 2014-03-10 21:45:47 +08:00
Dhilan007 11d3acd478 fixed inappropriate usage of inline. 2014-03-10 20:35:36 +08:00
Dhilan007 8bac35ae2a closed #4337:label support create by font name,compatible with old labelTTF. 2014-03-10 19:42:43 +08:00
James Chen 63292b5ba6 Merge pull request #5544 from heliclei/node-string-tag 
CCNode:Add String tag, to support runtime manipulation
 2014-03-10 18:26:51 +08:00
heliclei 83c4d5b479 fix comments 2014-03-10 18:21:53 +08:00
Huabing.Xu f0ae3fd4dc Merge branch 'develop' into develop_RenderTextureImprovement 2014-03-10 18:11:55 +08:00
Huabing.Xu e15d0a9d20 RenderTexture saveToFile will return true 2014-03-10 17:42:27 +08:00
Huabing.Xu f8f2373c2a closed #4315: fixed clippingNode alphaTest Bug 2014-03-10 15:12:44 +08:00
James Chen eca0bce1be Merge pull request #5633 from huangml/patch-1 
closed #4319: Node::removeAllChildrenWithCleanup() does not remove PhysicsBody.
 2014-03-10 10:55:54 +08:00
James Chen 2784955845 Merge pull request #5636 from dumganhar/iss3290-onenter-order 
closed #3290: The order of onEnter / onExit  work correctly on JSB and LuaBindings.
 2014-03-08 22:35:09 +08:00
James Chen 7aec578b35 closed #3290: The order of onEnter works correctly on JSB and LuaBindings. 2014-03-08 22:07:55 +08:00
andyque 82fcf939d0 fix ease elastic action error 2014-03-08 21:51:17 +08:00
黄梦龙 8b737d8aab Update CCNode.cpp 
removeAllChildrenWithCleanup() not remove PhysicsBody
 2014-03-08 17:42:35 +08:00
minggo c291cb32a0 Merge pull request #5624 from Dhilan007/develop_label 
label:fixed vertical alignment is incorrect.
 2014-03-07 21:07:09 +08:00
James Chen 84a76db060 Merge pull request #5622 from pandamicro/MotionStreakFix 
closed #4294: Added unimplemented position getter/setter in MotionStreak.
 2014-03-07 19:10:02 +08:00
pandamicro 2427314a65 Issue #4294: MotionStreak: Improve position setters 2014-03-07 19:06:51 +08:00
Dhilan007 4905acfa0b label:fixed vertical alignment is incorrect. 2014-03-07 18:31:33 +08:00
pandamicro e94cd2357d Issue #4294: Add override declaration 2014-03-07 18:11:37 +08:00
Huabing.Xu ad9c104cfd migrate saveToFile compatible with new renderer 2014-03-07 17:41:51 +08:00
pandamicro a005fa1dce Issue #4294: Add unimplemented position getter/setter in MotionStreak 2014-03-07 16:32:00 +08:00
minggo 07c0fac44f Merge pull request #5620 from Dhilan007/develop_label 
closed #4301:Label support vertical alignment and assign dimensions.
 2014-03-07 16:12:21 +08:00
Dhilan007 ac944cd42b fixed incorrect display when the size of label not enough to support display all text. 2014-03-07 15:58:49 +08:00
minggo 4251bcf425 Merge pull request #5469 from natural-law/issue3991 
Add method to reload cached texture & update the nodes used the texture.
 2014-03-07 15:58:17 +08:00
Dhilan007 c233b636cd closed #4301:Label support vertical alignment and assign dimensions. 2014-03-07 14:58:44 +08:00
James Chen 9b0c0ab44e Merge pull request #5616 from dumganhar/glview-refactor 
Refactoring GLView for desktop platforms, and adding protected method `updateDesignResolutionSize` for GLViewProtocol class.
 2014-03-07 14:15:20 +08:00
James Chen e0e9e1723c Merge pull request #5612 from Dhilan007/develop_label 
fixed #4300:fixed Label:draw location and BBOX is incorrect.
 2014-03-07 14:09:39 +08:00
James Chen 1cfd14f27d Tab -> 4 spaces, remove unused spaces for CCGLView.h 2014-03-07 14:03:57 +08:00
James Chen ae2f7a4a7d updateDesignResolution -> updateDesignResolutionSize. 2014-03-07 14:01:30 +08:00
James Chen d699f62193 Tab -> 4 spaces, remove unused spaces. 2014-03-07 13:59:56 +08:00
James Chen 8b359dd90e Refactoring GLView for desktop platforms, and adding protected method `updateDesignResolutionSize` for GLViewProtocol class. 2014-03-07 13:51:12 +08:00
Dhilan007 f0119ef62f fixed horizontal kerning is incorrect. 2014-03-07 12:03:45 +08:00
Dhilan007 063bde51c3 fixed #4300:fixed Label:draw location and BBOX is incorrect. 2014-03-07 11:42:13 +08:00
Huabing.Xu 5c1be5f2ef Merge branch 'develop' into develop_fix_node_transform_bug 
* develop:
  Improved documentation
  better doctrings
  fixes for linux
  small setup.py fixes
  Update CHANGELOG [ci skip]
  closed #4291：open CCEditBox as modal dialog
  Fixes 'schedule test/issue#2268' crashes
  closed #4150:  fix physics position/rotation tag bug.
 2014-03-07 10:07:19 +08:00
Huabing.Xu 9fc6177570 fix bug for outdated transform status 2014-03-07 10:03:34 +08:00
Ricardo Quesada 57b6478de7 Improved documentation 2014-03-06 16:14:06 -08:00
Ricardo Quesada 77d19e9bc2 better doctrings 
improved documentation for Node
 2014-03-06 14:04:19 -08:00
zhangbin 56a46892fe closed #3991, Remove the method CCTextureCache::updateTexture(). 2014-03-06 17:38:18 +08:00
zhangbin 822ef8d588 Merge branch 'develop' into issue3991 2014-03-06 17:28:20 +08:00
zhangbin fec04dd6ae Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-03-06 11:03:49 +08:00
James Chen 87b657b5bb Merge pull request #5575 from dumganhar/iss4286-event-crash 
closed #4286: 'EventDispatcherTest/Issue 4129' crashes on Windows.
 2014-03-06 11:03:34 +08:00
Ricardo Quesada 273d0d22f1 little performance improvement in quad command 2014-03-05 18:50:09 -08:00
James Chen 183622c718 'EventDispatcherTest/Issue 4129' crashes on Windows. 2014-03-06 10:45:29 +08:00
heliclei 73a3011b11 fix comments 2014-03-06 10:31:29 +08:00
heliclei 08d0cde490 Merge remote-tracking branch 'upstream/develop' into node-string-tag 2014-03-06 10:02:50 +08:00
zhangbin 6da0afdd03 Solve the crash in CocoStudioComponentsTest. 2014-03-06 09:23:27 +08:00
Ricardo Quesada a0ab8fcdf3 onDraw() updated 
`onDraw()` receives `const kmMat4 &transform` and `bool
transformUpdated`.

`CC_NODE_DRAW_SETUP()` is no longer used in our code.
`_modelViewTransform` is only used as a cache.
 2014-03-05 15:49:08 -08:00
Ricardo Quesada 0cb759cab8 Better names for tests 2014-03-05 11:50:12 -08:00
minggo b7df75745e Merge pull request #5562 from Dhilan007/develop_label 
issue #3629:new label support customize the effects such as Shadow[blur is unsupported], Outline
 2014-03-05 17:28:37 +08:00
heliclei 55080d713b refactor string tag to name 2014-03-05 17:03:25 +08:00
Dhilan007 dfdf19daff remove unused shader and also did adjust FontAtlas::getTexture 2014-03-05 16:51:16 +08:00
Dhilan007 23501b40aa issue #3629:new label support customize the effects such as Shadow[blur is unsupported], Outline 2014-03-05 15:54:40 +08:00
James Chen 20146c3ecb Merge pull request #5558 from Dhilan007/develop_label 
close #4276:fixed crash on CocoStudioGuiTest->LabelBMFontTest.
 2014-03-05 15:24:36 +08:00
James Chen 9652da06f8 Merge pull request #5554 from koowolf/#5550_win 
closed #4278: Upgrading kazmath to the latest version.
 2014-03-05 14:58:24 +08:00
James Chen ec70d067d7 Merge pull request #5556 from boyu0/v3.0_final_test 
Fix particle test->AddAndRemove test crash.
 2014-03-05 14:53:05 +08:00
Dhilan007 c3c3e12ee6 close #4276:fixed crash on CocoStudioGuiTest->LabelBMFontTest. 2014-03-05 14:41:59 +08:00
boyu0 06faad7020 Fix partical test->add and remove particle system crash. 2014-03-05 14:32:22 +08:00
koowolf 3365280a0a build kazmath on win32 2014-03-05 14:30:55 +08:00
James Chen 02572da9dc Adds EventListenerTouchOneByOne::isSwallowTouches, fixes a typo for Director::EVENT_AFTER_UPDATE. 2014-03-05 11:28:21 +08:00
samuele3 3edeba5001 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug_fix 2014-03-05 09:52:37 +08:00
samuele3 53851151d9 fix:TimerScriptHandler can’t do anything in the `cancel` function 2014-03-05 09:51:57 +08:00
Ricardo Quesada c63f210e26 Compiles on Android 2014-03-04 16:59:39 -08:00
Ricardo Quesada 4fe3b16287 Updates to latest version of kazmath 2014-03-04 16:33:00 -08:00
Ricardo Quesada 7ac663e02c GL Program API fixes 2014-03-04 13:51:43 -08:00
heliclei cbec0f9a15 CCNode:Add String tag, to support runtime manipulation 2014-03-05 00:15:01 +08:00
James Chen bb86a9e350 Merge pull request #5517 from bmanGH/feature/fix_timer_cancel_bug 
closed #4272: Timer::cancel always call Director::getInstance()->getScheduler() even in another Scheduler
 2014-03-04 22:08:55 +08:00
minggo 6cb665b637 Merge pull request #5534 from dabingnn/develop_RenderTextureImprovement 
Develop render texture improvement
 2014-03-04 18:30:37 +08:00
Huabing.Xu 3d0cd62e12 add comment to make interface clearer 2014-03-04 17:34:48 +08:00
James Chen 98e1099370 Fixes crash of PerformanceTest/EventDispatcherTest. 2014-03-04 16:43:04 +08:00
Huabing.Xu 99d0ce160a rename setVirtualViewPort->setVirtualViewport 2014-03-04 15:41:36 +08:00
Huabing.Xu ec397611f6 remove blank line，adjust indent 2014-03-04 15:30:05 +08:00
Huabing.Xu 756024e9f1 implement interface setKeepMatrix, setVirtualViewPort 2014-03-04 15:07:28 +08:00
James Chen 387174d633 issue #4234: Acceleration -> const Acceleration& 2014-03-04 13:42:36 +08:00
James Chen 5c70548742 issue #4234: 'Event* event' needs to be in 'TouchScriptData' struct. 2014-03-04 13:42:06 +08:00
Huabing.Xu 68130fb4d0 fix matrix push/pop bug 2014-03-04 11:06:39 +08:00
Huabing.Xu a759d9ae60 calculate viewport based on _fullRect _rtRect and _fullRectViewport 2014-03-04 10:57:57 +08:00
Huabing.Xu 7949cb2cd9 add interface for keep Matrix 2014-03-04 10:41:03 +08:00
Ricardo Quesada 8bdfce9bbe Merge branch 'develop' into visit_draw_improved 2014-03-03 17:31:29 -08:00
Ricardo Quesada 81f5254e15 Removes setNormalizedPosition 
This funciton is useful, but the code is buggy.
In should check the parents' position instead of Director::Size()
Let's do it correctly, and then re-add this function
 2014-03-03 16:08:30 -08:00
Ricardo Quesada c386f88e32 Merge branch 'develop' into visit_draw_improved 
Conflicts:
	CHANGELOG
	cocos/gui/UILayout.h
 2014-03-03 11:27:42 -08:00
bmanGH d0f8dbd4be Fix Timer::cancel always call Director::getInstance()->getScheduler() even in another Scheduler; 2014-03-03 19:12:59 +08:00
minggo 594342ea3e Merge pull request #5505 from dumganhar/event-dispatcher-refactor 
[EventDispatcher] Adds 'pauseEventListenersForTarget', 'resumeEventListenersForTarget' and 'removeEventListenersForTarget'.
 2014-03-03 17:56:57 +08:00
minggo be0ac5dc1c Merge pull request #5493 from boyu0/bug4150_physics_position_rotation 
closed #4150: fix physics position and rotation bug.
 2014-03-03 14:57:33 +08:00
James Chen 1d2d2df1e9 issue #4165: Adds missing deprecated methods in Scheduler class. 2014-03-03 11:57:36 +08:00
James Chen 1aa9e35fb2 Merge pull request #5500 from dumganhar/scheduler-refactor 
closed #4165: Refactors Scheduler class.
 2014-03-03 11:20:06 +08:00
James Chen 04663b4a9c closed #4165: Updates comments. 2014-03-03 11:12:04 +08:00
James Chen 09c0bae4a1 closed #4165: Deprecates old methods: Scheduler::(un)scheduleSelector, Scheduler::isScheduleForTarget. 2014-03-03 11:07:48 +08:00
James Chen 757425c54b issue #4165: Scheduler::scheduleCallback -> Scheduler::schedule, Scheduler::scheduleSelector -> Scheduler::schedule. APIs are clear for c++ developers now. 2014-03-03 11:00:30 +08:00
boyu0 c99b0a0b6a closed #4150: Fix missing "!" 2014-03-03 01:48:56 +08:00
James Chen dceb047ba6 TimerTargetCallback::initWithLambda -> TimerTargetCallback::initWithCallback. 2014-03-02 18:43:17 +08:00
James Chen f3949e078b [EventDispatcher] Adds 'pauseEventListenersForTarget', 'resumeEventListenersForTarget' and 'removeEventListenersForTarget'. 2014-03-02 17:41:18 +08:00
James Chen 30d7130eb0 closed #4160: Out of range exception in EventDispatcher 2014-03-02 16:16:03 +08:00
Ricardo Quesada cdc19eea1c Nodes: setAdditionalTransform() receives a pointer 
and not a const reference.
If the pointer is `NULL`, then it won't use the additionalTransform
 2014-03-01 08:26:54 -08:00
Ricardo Quesada 219ef6d897 removes CC_TEXTURE_ATLAS_USE_TRIANGLE_STRIP support 
It was never used. And it is slower.
 2014-02-28 22:09:18 -08:00
James Chen e6d2c4ec73 Refactors Scheduler class. 
* Timer is an abstract class now.
* Adds three new timers ( `TimerTargetSelector`, `TimerTargetCallback`, `TimerScriptHandler`) which are inherited from Timer.
* Adds new API 'scheduleCallback` / `unscheduleCallbackForKey', and callback's target could be any classes since we're using `void*` to identify target.
* `Scheduler::scheduleCallback` use `std::function`, therefore, it supports passing `lambda`, `member_function` and `global_function`.
* The old selector API is still kept since it's very useful when schedule callback is a member function, it doesn't need a `key` to identify the callback function. (+1 squashed commit)
* Adds relevant test cases.
 2014-03-01 14:09:09 +08:00
Ricardo Quesada b50a787f6d Adds new ParticleTest for auto-batching 2014-02-28 22:03:36 -08:00
Ricardo Quesada 3588041409 removed empty spaces 2014-02-28 16:39:04 -08:00
Ricardo Quesada 9d501479c1 removes unused ivar from ParticleSystemQuad 2014-02-28 16:19:27 -08:00
Ricardo Quesada da8e571862 shaders set in the correct position 2014-02-28 16:14:55 -08:00
Ricardo Quesada d78304599d Cache working OK. 
Performance increased in 20% for static objects.
 2014-02-28 16:10:48 -08:00
Ricardo Quesada 13b60c8759 Applies Wu Hao's patch for 2.5D 2014-02-28 13:48:00 -08:00
Ricardo Quesada 6920bec6ef transform object returns the MV 
code cleaner.
the kmGL code is altogether
 2014-02-28 11:20:53 -08:00
Ricardo Quesada ff79c0d9ad Merge branch 'develop' into visit_draw_improved 2014-02-28 10:59:07 -08:00
James Chen 225b5e0e4f Merge pull request #5492 from dumganhar/iss4129-remove-all-listener 
closed #4129: Event listeners used in engine shouldn't be removed by method removeAllEventListeners().
 2014-02-28 16:09:54 +08:00
James Chen d33017f27a issue #4129: Adds default argument(nullptr) for dispatchCustomEvent. 2014-02-28 15:40:45 +08:00
boyu0 a934d29c57 issue #4150: Correct body position with the node has a parent. Add set/getPosition/Rotation method. 2014-02-28 15:31:25 +08:00
James Chen 7774bb4c6c closed #4129: Event listeners in engine shouldn't be removed by method removeAllEventListeners(). 2014-02-28 15:09:53 +08:00
James Chen bbc1c385c2 issue #4129: EventTouch::getTouches return const reference. 2014-02-28 15:08:18 +08:00
Ricardo Quesada eb66ddd931 visit and draw improved. 
`visit()` and `draw()` are improved.
they both receive:
 - `Renderer`
 - `kmMat4` for transformation
 - `bool` whether or not the transform changed from the previous frame

Although `draw` and `visit` are not using the 3 new parameters,
they will start using it in the coming days (or weeks, or months).

Those parameters are needed for:
 - `Renderer` shouldn't be a singleton. There should be one renderer per Director. There could be more than one renderer
 - we should get rid of `kmGLXXX` functions since nodoby knows what is happening. the `kmMat4` is for that.
 - whenever possible, we should try to optimize the multiplications. the `dirty` flag is for that.

We need those changes, so, it is better to change the API now, and not right after v3.0-final is released.
 2014-02-27 21:43:54 -08:00
James Chen 658cf72d31 issue #4129: Uses 'const reference' when getting touches by EventTouch::getTouches. 2014-02-28 13:43:28 +08:00
James Chen 8a04fbabf1 issue #4129: EventDispatcher::_listeners -> _listenerMap. 2014-02-28 12:01:47 +08:00
zhangbin ddf5957a9c closed #3684, Set shader program before TextureAtlas is rendered. 2014-02-28 11:43:41 +08:00
James Chen 4277509966 Merge pull request #5463 from andyque/refactor3877 
closed #3877. make fadeIn and fadeOut behaviours correct
 2014-02-27 21:49:38 +08:00
James Chen a96f44f31d Adds override for override functions (onEnter, onExit) in cpp-tests. 2014-02-27 21:10:03 +08:00
andyque 32d3bf03bd fixed #3877. make fadeIn and fadeOut behaviours correct 2014-02-27 21:00:25 +08:00
boyu0 8c536589df Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss4118_physical_performance_improve 2014-02-27 20:04:04 +08:00
minggo 8d47d5f16a return immediately when no changing 2014-02-27 15:12:57 +08:00
boyu0 b63641c7a5 issue #4118: delete physicsSetPosition/Rotation method and add physics position/rotation tag. 2014-02-27 14:36:09 +08:00
boyu0 f400c1ac68 issue #4118: edit contact test and fix node setPhysicsBody bug 2014-02-27 13:35:37 +08:00
boyu0 75ec508f0a issue #4118: improve performance. add Node and Sprite physicsSetPosition and physicsSetRotation method. 2014-02-27 09:45:35 +08:00
Huabing.Xu cd7b075900 closed #3874: fix bug, blendID should be shifted by 50 bits 2014-02-27 09:27:33 +08:00
boyu0 4df1e104f3 issue #4118: improve performance. 2014-02-26 19:56:52 +08:00
Huabing.Xu c7315a2e3e closed #3874: expand textureID bit to 32bits 2014-02-26 15:01:45 +08:00
zhangbin 24ba47a43a closed #3991, Add method to reload cached texture & update the nodes used the texture. 2014-02-26 11:44:54 +08:00
James Chen 5e315273f9 Merge pull request #5467 from boyu0/bug4144_node_setphysicsbody 
closed #4144: fix bug: Can not use Node::setPhysicsBody to reset a physics body.
 2014-02-26 11:43:19 +08:00
James Chen 2b2979551e Merge pull request #5460 from boyu0/iss4118_physical_performance_improve 
issue #4118: Physical performance improve.
 2014-02-26 11:37:13 +08:00
boyu0 912dad7a71 closed #4144: fix bug: Node::setPhysicsBody doesn't work at the second time. 2014-02-26 10:53:41 +08:00
James Chen 51808b59e9 More const reference love in EventDispatcher. 2014-02-25 14:31:24 +08:00
Ricardo Quesada 18c3a8dd02 little fixes for sprite 2014-02-24 15:18:07 -08:00
James Chen 21fe4f234b Merge pull request #5382 from boyu0/iss4039_tilemap_objectgroup_fix 
closed #4039: fix bug: tilemap <object> x, y, width and height value parse incorrect.
 2014-02-24 22:23:05 +08:00
James Chen dfde6938d2 Merge pull request #5452 from dabingnn/develop_CC_SPRITE_DEBUG_DRAW 
closed #3818: fix CC_SPRITE_DEBUG_DRAW feature
 2014-02-24 21:51:24 +08:00
James Chen b5b9c7f938 Merge pull request #5451 from Dhilan007/develop_movePDC 
closed #4123:fixed thread deadlock if new functions are added in callback.
 2014-02-24 21:43:37 +08:00
Dhilan007 387bd544bf closed issue#4123:fixed thread deadlock if new functions are added in callback. 2014-02-24 21:08:05 +08:00
boyu0 d15009c510 issue #4039: delete name "converted_x", "converted_y", "converted_width", "converted_height". 2014-02-24 20:14:46 +08:00
James Chen 81e7cec98f Merge pull request #5385 from boyu0/refactor_tilemap_xml_format_index 
refactor tilemap xml format index count.
 2014-02-24 20:09:11 +08:00
Huabing.Xu f20d487ade closed #3818: fix CC_SPRITE_DEBUG_DRAW feature 2014-02-24 20:02:48 +08:00
James Chen 1b91234325 Merge pull request #5283 from seemk/director_cleanup_fix 
closed #4099: Fixed crashing when calling CCDirector's end() on win32.
 2014-02-24 16:58:34 +08:00
boyu0 1082f3cad4 issue #4039: change name “position_x”, “position_y”, “size_width”, “size_height” to "converted_x", "converted_y", "converted_width", "converted_height". 2014-02-24 16:39:15 +08:00
boyu0 a4cc0edb4a issue #4118: refactor physics update 2014-02-24 16:17:42 +08:00
Dhilan007 b54607bfc9 only using std::max for window. 2014-02-24 11:54:58 +08:00
Dhilan007 d6cd2eb05f fix compiling error cause by using 'fmaxf'. 2014-02-24 11:38:03 +08:00
Ricardo Quesada f77b92f1d7 performance improvements in culling 2014-02-23 02:02:28 -08:00
Ricardo Quesada 04460750b8 culling working for both 2d and 3d projections 2014-02-23 01:09:52 -08:00
Ricardo Quesada fe1160cd8c changes in API to support 3D 2014-02-22 19:16:42 -08:00
Ricardo Quesada f37c606c4e removes unsued function 
keeps the code cleaner
 2014-02-22 17:55:03 -08:00
Ricardo Quesada 8ca746af17 Implements AABB culling for sprites 2014-02-22 17:47:56 -08:00
James Chen e9c1335084 Merge pull request #5434 from Dhilan007/develop_label 
closed #3758:fixed character will not aligned on the the baseline when label using distance field.
 2014-02-21 18:29:47 +08:00
Dhilan007 821c8a73bc closed #3758:fixed character will not aligned on the the baseline when label using distance field. 2014-02-21 18:09:52 +08:00
James Chen 3885772e5f Merge pull request #5263 from boyu0/iss2920_voice_recognition_input_crash_on_ios7 
closed #2920: fix bug: voice recognition input crash on ios7
 2014-02-21 13:46:31 +08:00
James Chen ac59006ee5 Merge pull request #5431 from dumganhar/develop 
closed #4107: Director::setAnimationInterval could not work on Mac platform
 2014-02-21 11:58:36 +08:00
James Chen c5bf3950bc closed #4107: Director::setAnimationInterval could not work on Mac platform. Also removed unused files (CCDirectorCaller.h/.mm). 2014-02-21 11:55:37 +08:00
James Chen d92e995f8c Merge pull request #5361 from Dhilan007/develop_label 
issue #3821: LabelBMFont re-implemented as a wrapper of Label.
 2014-02-21 11:36:23 +08:00
Dhilan007 d0e640d966 remove CC prefix. 2014-02-21 09:59:43 +08:00
Dhilan007 54f48b23e6 LabelBMFont re-implemented as a wrapper of Label. 2014-02-20 22:33:52 +08:00
James Chen 68eaa746ea closed #2535: TouchScriptHandlerEntry will release twice lua reference 2014-02-20 21:58:20 +08:00
James Chen 0b6858bdde Added virtual and override keywords to Scene::init() method 2014-02-20 21:37:01 +08:00
James Chen 95143da782 Merge pull request #4990 from daltomi/debug 
closed #4102: Uses 'cbegin/cend', 'const std::string' where it's reasonable.
 2014-02-20 20:29:56 +08:00
James Chen 7970e37bf5 closed #4097: Adds missing include. 2014-02-20 17:23:22 +08:00
James Chen b1e44a7ed6 issue #4097: Enables script bindings by default. 2014-02-20 17:02:20 +08:00
James Chen a218369ecd issue #4097: fix linking error of missing functions. 2014-02-20 17:01:13 +08:00
boyu0 6f7dde3a99 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2920_voice_recognition_input_crash_on_ios7 2014-02-20 16:51:21 +08:00
James Chen 0d8846d876 closed #4097: Adds a macro to disable inserting script binding relevant codes. 2014-02-20 16:40:46 +08:00
James Chen 62e0deaf35 Merge pull request #5384 from wefiends/s3tc_nomipmaps 
closed #4096: s3tc compressed textures with no mipmaps fail to be loaded.
 2014-02-20 15:58:13 +08:00
James Chen 0af0ce9032 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss4058-ref-step1 
Conflicts:
	cocos/scripting/auto-generated
 2014-02-20 15:13:40 +08:00
James Chen 4cf4e15ba6 issue #4058: Adds CCStdC.h. 2014-02-20 15:12:35 +08:00
minggo 196ab2caff Merge pull request #5401 from natural-law/issue3540 
Solve the bug: Sometimes RenderTexture not drawn after a background/foreground
 2014-02-20 14:46:26 +08:00
zhangbin 9b2c5f71af closed #3540, Solve the bug: Sometimes RenderTexture not drawn after a background/foreground. 2014-02-20 14:43:07 +08:00
James Chen e3d14608df issue #4058: Uses 'void*' instead of 'Ref*' as target of Scheduler. Any class could response scheduler callback now. 2014-02-20 14:11:47 +08:00
Nick Barrios d9cbc5625c CCImage.cpp: If dds header reports 0 mipmaps, force _numberOfMipmaps to 1 to enable software decoding. Set _renderFormat just once for both hardware and software decoding (moved out of "load mipmaps" loop). 2014-02-20 00:48:09 -05:00
James Chen 2c5f791e03 issue #4058: Scheduler:: scheduleUpdateForTarget is a template function now. And it works perfect. 2014-02-20 11:57:04 +08:00
Nick Barrios 45d751caa7 CCImage.cpp: initWithS3TCData() - When there is s3tc hardware support, set PixelFormat before loading mipmaps, to allow for textures with no mipmaps. 2014-02-19 22:13:12 -05:00
James Chen 9436173039 issue #4058: typedef Ref Object; and deprecate it. 2014-02-20 10:58:37 +08:00
James Chen 0ea27d8543 issue #4058: CCObject.cpp -> CCRef.cpp for all platform projects. 2014-02-20 10:56:25 +08:00
James Chen 5e6130c92c issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
Dhilan007 fd528b389d fix warning 2014-02-20 10:24:35 +08:00
Dhilan007 ddd02b463c optimize label: 
1.remove unnecessary API
2.reduces object-creation and function calls.
 2014-02-19 20:26:14 +08:00
Dhilan007 f086f39319 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into new_label 2014-02-19 17:00:26 +08:00
boyu0 810196d25b closed #2920: add a variable to save shared director. 2014-02-19 14:23:41 +08:00
boyu0 49cb2ce9d5 closed #2920: fix compile error after merge. 2014-02-19 14:12:57 +08:00
boyu0 0b07d376f6 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2920_voice_recognition_input_crash_on_ios7 2014-02-19 13:42:02 +08:00
boyu0 8be6932863 refactor tilemap xml format index count. 2014-02-19 10:41:12 +08:00
boyu0 50cdc67191 issue #4039: set tilemap <object> x and y value to original, and add “position_x”, “position_y”, “size_width” and “size_height” value. 2014-02-18 17:44:05 +08:00
Dhilan007 5361413383 replace [auto] with [const auto&] in FOR loop. 2014-02-18 16:41:01 +08:00
Dhilan007 2ad81b0edb closed #4060:fixed Label wasn't implemented correctly when Label::_fontAtlas contains multiple texture. 2014-02-18 14:30:51 +08:00
andyque 143f5975a6 fix cross-platform comiple error 
details:
remove CCActionEaseEx dependency
fix compile errors on android platform
fix a few inproper decalare
fix linux compile error
fix win32 compile error
 2014-02-18 14:22:15 +08:00
andyque 6d392766a2 refactor easeIn, easeOut and easeInOut, elastic, bounce, back, quartic etc with free tween functions 
finish refactor all ease action with tween functions
 2014-02-18 14:22:14 +08:00
andyque bcfa32f4e9 remove unused std::function declare 2014-02-18 14:22:14 +08:00
andyque 68b1c9f2c1 change CCTweenFunction class to tweenfunc namespace 2014-02-18 14:22:13 +08:00
andyque 838c71b135 refactor EaseIn with CCTweenFunction 2014-02-18 14:22:13 +08:00
andyque ab11147eeb rename namespace of CCTweenFunction to cocos2d and fix some compile errors 2014-02-18 14:22:13 +08:00
andyque f16b0022a3 move CCActionEaseEx content to CCActionEase 2014-02-18 14:22:13 +08:00
andyque 895b2a0055 move CCActionEaseEx and CCTweenFunction to core engine 2014-02-18 14:22:12 +08:00
James Chen 19205e3db8 Merge pull request #5365 from natural-law/issue3964 
closed #3964: Solve the bug of Image::saveImageToPNG().
 2014-02-18 11:49:09 +08:00
James Chen 34f8f0a308 Uses `malloc` instead of `new[]`, keep malloc/free matching. 2014-02-18 11:14:02 +08:00
James Chen b4121f47fc [Android] Don't free BitmapDC::_data in BitmapDC's destructor. Remove unused BitmapDC::env. 2014-02-18 11:07:58 +08:00
zhangbin 650331769a closed #3964, Use GL methods instead in function RenderTexture::newImage() 2014-02-18 10:47:14 +08:00
James Chen 905443d17c new[] free mismatching after PR #5326. 2014-02-18 10:11:04 +08:00
James Chen f67f324378 Merge commit 'refs/pull/5289/head' of git://github.com/cocos2d/cocos2d-x into merge5289 
Conflicts:
	cocos/2d/platform/win32/CCImage.cpp
 2014-02-17 22:10:45 +08:00
James Chen 01b9d9be56 Merge pull request #5369 from Dhilan007/develop_labttfMultiline 
closed #4048:fixed LabelTTFMultiline test case show nothing on mac.
 2014-02-17 21:45:24 +08:00
James Chen 19b1945efb closed #4054: Removing child from TMXLayer may cause crash. 2014-02-17 21:15:26 +08:00
Dhilan007 4f94064242 closed #4048:fixed LabelTTFMultiline test case show nothing on mac. 2014-02-17 14:35:49 +08:00
zhangbin e02f488224 Merge branch 'develop' into issue3964 2014-02-16 11:01:07 +08:00
James Chen 1693ea0ef6 Typo fix in CCDevice.mm. 2014-02-14 09:41:06 +08:00
Dhilan007 0d5c702708 move labelttf's platform-dependent code from CCImage to CCDevice 2014-02-13 21:08:43 +08:00
James Chen 4837b2dd2d issue #3990: setTotalParticles works as expected. _emissionRate has to be updated in setTotalParticles. 2014-02-13 17:01:38 +08:00
zhangbin 8ae5d2a049 closed #3964, Solve the bug of logic code in method Image::saveImageToPNG(). 2014-02-13 16:22:41 +08:00
James Chen 67630311f2 Adds 'ParticleSystemQuad::updateTexCoords' method. 2014-02-13 11:03:35 +08:00
James Chen c0b8460aef closed #3990: ParticleSystemQuad::setTotalParticles() can't set a value larger than the initialized value. 2014-02-13 11:03:34 +08:00
Ricardo Quesada 61e4ffbc3c quick fix for positioning the FPS on non HD 2014-02-13 04:10:23 +08:00
Ricardo Quesada 200eb9713c Merge branch 'develop' into droid_fonts 2014-02-12 20:23:40 +08:00
Ricardo Quesada 0a2d701e9f Update verts and calls every frame 2014-02-12 08:41:32 +08:00
Ricardo Quesada 07764d03f9 Uses Droid Sans Console font for FPS and more 
* Uses Droid Sans Console: Size 10
* Don't scale up font even if content scale factor is bigger (not needed for FPS)
* Adds better labels in FPS console
 2014-02-12 06:58:34 +08:00
chuanweizhang2013 d5aee5eb04 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into jsruntime 2014-02-11 18:08:14 +08:00
Ricardo Quesada ff802ed753 Merge pull request #5279 from edba/develop 
Added getPropertiesForGID that assings value instead of returning it.
 2014-02-10 12:19:47 -08:00
chuanweizhang2013 e9dd3d828a issue #3498: commit jsruntime 2014-02-10 18:15:30 +08:00
Dhilan007 47e16728cc reduce unnecessary calculation amount. 2014-02-10 12:38:32 +08:00
Dhilan007 6a662a6330 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into develop 2014-02-10 11:47:05 +08:00
Ricardo Quesada 68143d3093 re-add missing assert 2014-02-09 19:39:56 -08:00
Ricardo Quesada 907446d8d0 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into gl_vertices 2014-02-09 19:32:35 -08:00
Ricardo Quesada 24f655f9b1 Better 'vertices drawn' 2014-02-09 19:31:45 -08:00
Dhilan007 e12c1f57ac Label::reduce unnecessary calculation amount. 2014-02-10 11:21:54 +08:00
James Chen 3b57f897d9 Merge pull request #5310 from dumganhar/event-disp-typo 
Some case sensitivity fixes in EventDispatcher. e.g. xxxlisteners -> xxxListeners.
 2014-02-10 11:19:45 +08:00
James Chen 9a02568eca Some case sensitivity fixes in EventDispatcher. e.g. xxxlisteners -> xxxListeners. 2014-02-10 11:15:56 +08:00
James Chen eda4c9a420 Merge pull request #5302 from Pisces000221/improve-label-chinese 
closed #3933 :A string which only contains CJK characters can't make a line-break when it's needed
 2014-02-10 11:03:03 +08:00
Dhilan007 a8387a12f0 Merge branch 'improve-label-chinese' of https://github.com/Pisces000221/cocos2d-x into develop 2014-02-10 10:09:56 +08:00
Ricardo Quesada 560abe77c8 better Console support 
* Arguments are passed as std::string
* Adds `resolution` and `projection` command
* `texture` and `fileutils` supports the `flush` argument
 2014-02-08 12:46:44 -08:00
Ricardo Quesada 13aa3ad2b5 Adds new commands to Console 
* resolution
* projection
 2014-02-08 12:35:11 -08:00
Pisces000221 c9e4944321 Fix one character disappears when breaking line 2014-02-08 15:18:18 +08:00
Pisces000221 da2a58ccc9 Improved formatting when using both CJK and ASCII 2014-02-08 15:05:36 +08:00
Pisces000221 7484286f25 Rename ischinese_unicode as iscjk_unicode 2014-02-08 14:52:59 +08:00
Pisces000221 b5e9a4a00a Rename ischinese_unicode as iscjk_unicode 2014-02-08 14:52:10 +08:00
Ricardo Quesada 61c8bf23b6 optimized draw 2014-02-07 22:19:03 -08:00
Pisces000221 7aebdd89a5 Added ischinese_unicode function 2014-02-08 14:15:42 +08:00
Pisces000221 ae8057b933 Added ischinese_unicode function 2014-02-08 14:07:18 +08:00
Ricardo Quesada 82700339c0 Adds a way to print the renderer vertices 2014-02-07 19:37:44 -08:00
James Chen bca9bba8c5 A typo fix: GL::VERTEX_ATTRIB_FLAT_NONE -> GL::VERTEX_ATTRIB_FLAG_NONE. 2014-02-08 10:41:02 +08:00
Ricardo Quesada 78fdabe926 more cleanup in TMX code 2014-02-07 18:33:30 -08:00
Ricardo Quesada 616feadda1 More fixes and "tiles" is an uint32 (GID) 2014-02-07 18:11:17 -08:00
Ricardo Quesada f2836e627b Code is cleaner 2014-02-07 17:33:27 -08:00
Ricardo Quesada e33baac396 iso almost working 2014-02-06 22:20:28 -08:00
boyu0 20ee1d2666 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2920_voice_recognition_input_crash_on_ios7 2014-02-07 11:37:01 +08:00
Ricardo Quesada ad7b54eb0e iso almost working 100% ok 2014-02-06 18:47:45 -08:00
Ricardo Quesada cf08d0b3f9 isometric kind of working 2014-02-06 16:19:46 -08:00
Ricardo Quesada 02af5059bf code cleanup 2014-02-05 22:43:06 -08:00
Ricardo Quesada 314d3955b6 working!! 2014-02-05 22:36:03 -08:00
Ricardo Quesada d3aed1124a what is happening here? 2014-02-05 20:09:04 -08:00
Ricardo Quesada 3560227d09 sort of working 2014-02-05 19:51:24 -08:00
Ricardo Quesada 9a53f5a9f5 Testing a new TMX renderer 
faster
 2014-02-04 17:59:21 -08:00
Maks 72ede55ac7 fix string size check and assert condition 
1. std::string::size() return size_t (is never < 0)
2. "event must be larger than 0" and 'event' has unsigned int type
 2014-02-03 22:12:03 +02:00
James Chen 3026e6d5ca Removes unused variable (GLViewProtocol::_delegate) and relevant method (GLViewProtocol::setTouchDelegate). 2014-02-02 20:46:15 +08:00
Siim Kallas 881757a792 Fixed crashing when calling CCDirector's end(). 2014-02-01 22:10:00 +02:00
edba 4da6b97786 Added getPropertiesForGID that assings value instead of returning it. 2014-01-31 14:57:26 -08:00
Ricardo Quesada 28a6626852 Updates Windows project 2014-01-30 21:30:51 -08:00
Ricardo Quesada 924951d3b5 glview uses rect instead of size 
this is because it could be needed if you want to create a view
inside a window in an specific position
 2014-01-30 20:16:40 -08:00
Ricardo Quesada c9dc113fa2 Fixes compilation issues on Android and Linux 2014-01-30 17:28:12 -08:00
Ricardo Quesada 5691829b72 Linux with #ifdef 2014-01-30 17:10:18 -08:00
Ricardo Quesada 7da8c84a75 Renames EGLView -> GLView 2014-01-30 16:51:43 -08:00
Ricardo Quesada 862500f99a Renames EGLView -> GLView 2014-01-30 15:40:56 -08:00
Ricardo Quesada d19a1012a4 Adds the possibility to create EAGLView with an EAGLView 2014-01-30 15:11:37 -08:00
Ricardo Quesada f1af117a1c code follows c++ guidelines 2014-01-30 15:11:11 -08:00
Ricardo Quesada 43a4c1937f Add `else` to `if` 2014-01-30 15:10:52 -08:00
Ricardo Quesada 4ed2e0d9d2 Merge branch 'develop' into glview_improvements 
Conflicts:
	CHANGELOG
	cocos/2d/platform/linux/CCApplication.cpp
	samples/Cpp/AssetsManagerTest/Classes/AppDelegate.cpp
	samples/Cpp/HelloCpp/Classes/AppDelegate.cpp
	samples/Cpp/HelloCpp/Classes/AppMacros.h
	samples/Cpp/HelloCpp/proj.ios/AppController.mm
	samples/Cpp/HelloCpp/proj.mac/main.cpp
	samples/Cpp/SimpleGame/Classes/AppDelegate.cpp
	samples/Cpp/SimpleGame/proj.ios/AppController.mm
	samples/Cpp/SimpleGame/proj.mac/main.cpp
	samples/Cpp/TestCpp/Classes/AppDelegate.h
	samples/Javascript/CocosDragonJS/Classes/AppDelegate.cpp
	samples/Javascript/CocosDragonJS/proj.ios/AppController.mm
	samples/Javascript/CocosDragonJS/proj.mac/main.cpp
	samples/Javascript/CrystalCraze/Classes/AppDelegate.cpp
	samples/Javascript/CrystalCraze/proj.ios/AppController.mm
	samples/Javascript/CrystalCraze/proj.mac/main.cpp
	samples/Javascript/MoonWarriors/Classes/AppDelegate.cpp
	samples/Javascript/MoonWarriors/proj.ios/AppController.mm
	samples/Javascript/MoonWarriors/proj.mac/main.cpp
	samples/Javascript/WatermelonWithMe/Classes/AppDelegate.cpp
	samples/Javascript/WatermelonWithMe/proj.ios/AppController.mm
	samples/Javascript/WatermelonWithMe/proj.mac/main.cpp
	samples/Lua/HelloLua/Classes/AppDelegate.cpp
	samples/Lua/HelloLua/proj.ios/AppController.mm
	samples/Lua/HelloLua/proj.mac/main.cpp
 2014-01-28 11:32:25 -08:00
James Chen 6a3e9d7c13 Merge pull request #5222 from martell/dutch3 
closed #3879: Added Dutch Language support for 3.x branch.
 2014-01-28 00:30:53 -08:00
Ricardo Quesada 20346499ab Continue with the refactoring 2014-01-27 19:16:09 -08:00
Ricardo Quesada b96c4f1ad0 Only compile iOS files on iOS 2014-01-27 16:44:10 -08:00
Ricardo Quesada 67b62224b4 restore it to platform=10 2014-01-27 12:39:24 -08:00
Ricardo Quesada 3bb74c08ca Merge branch 'glview_improvements' of github.com:ricardoquesada/cocos2d-x into glview_improvements 2014-01-27 10:53:12 -08:00
Ricardo Quesada efaec7b7ec Merge branch 'develop' into glview_improvements 
Conflicts:
	samples/Lua/HelloLua/Classes/AppDelegate.cpp
	template/multi-platform-lua/Classes/AppDelegate.cpp
 2014-01-27 10:52:35 -08:00
boyu0 23d2d586ed closed #2920: fix bug voice recognition input crash on ios7 2014-01-27 18:08:34 +08:00
James Chen fa995c27fb Merge pull request #5257 from dumganhar/iss3871-stop-propagation-fix 
closed #3871: event->stopPropagation can't work for EventListenerAllAtOnce.  And add relevant test case.
 2014-01-27 00:35:04 -08:00
James Chen 8141397bbd closed #3871: event->stopPropagation can't work for EventListenerAllAtOnce. And add relevant test case. 2014-01-27 16:30:20 +08:00
Dhilan007 35cf49c26d close #3861:fixed NativeActivity issue ANR on android 2.3 when press hardware button. 2014-01-27 15:37:36 +08:00
James Chen abc6488b75 Merge pull request #5254 from Dhilan007/develop_label 
close #3869:fixed Font::setCurrentGlyphCollection not saved the settings
 2014-01-26 21:59:22 -08:00
Dhilan007 cb9330dfd6 close #3869:fixed Font::setCurrentGlyphCollection not saved the settings 2014-01-27 13:53:57 +08:00
James Chen 6c69626a4f closed #3867: "Testing empty labels" in LabelTest crashes on Linux platform. 2014-01-27 10:31:24 +08:00
James Chen 2c4faeefe0 Merge pull request #5244 from dumganhar/memory-leak-new-label 
closed #3862: [New Label] Memory leak in FontFreeType::createFontAtlas()
 2014-01-26 06:06:45 -08:00
James Chen a1b02b24ae Merge pull request #5245 from Dhilan007/develop_label 
fix mistake of label's transparency.
 2014-01-26 05:39:56 -08:00
James Chen 75dddf390b unsigned short int * -> unsigned short* , remove unneeded `int`. 2014-01-26 21:33:22 +08:00
James Chen f2981adf1f unsigned short int * -> unsigned short* , remove unneeded `int`. 2014-01-26 21:32:21 +08:00
Dhilan007 710b614680 fix mistake of label's transparency. 2014-01-26 21:19:40 +08:00
James Chen 2ee58c913c NewLabel memory leak fix. 2014-01-26 20:53:55 +08:00
James Chen 6a302735d8 Removes unused files. 2014-01-26 17:54:13 +08:00
minggo b7d5d430a4 Merge pull request #5225 from dumganhar/iss3853-jsb-crash-debug-mode 
closed #3853: Some JSB projects(TestJavascript, WatermelonWithMe) crash in DEBUG mode on iOS platform.
 2014-01-25 20:37:31 -08:00
James Chen 5b9f1697d3 closed #3853: Some JSB projects(TestJavascript, WatermelonWithMe) crash in DEBUG mode on iOS platform. Don’t define `DEBUG` macro in our projects since all third party libraries(e.g. Spidermonkey) were built in RELEASE mode. 2014-01-26 11:16:25 +08:00
martell 609ee3db2b Added Dutch for 3.x branch 2014-01-25 20:38:15 +00:00
Ricardo Quesada 8c62fcb7ba Merge branch 'develop' into glview_improvements 2014-01-24 14:22:25 -08:00
Ricardo Quesada ed299202b6 Android works again 2014-01-24 13:43:46 -08:00
James Chen f95a862718 Merge pull request #5220 from dumganhar/develop 
Fixes two mistakes 1) Color4B(const Color3B& color), 2) A comment typo in CCObject.h
 2014-01-24 06:36:44 -08:00
James Chen 04d91f7e1d Fix a mistake in Color4B(const Color3B& color). 2014-01-24 22:33:43 +08:00
James Chen 7a8f24a313 Merge pull request #5219 from dabingnn/develop_hotFix 
3.0 Beta2 HotFix: fix shader PositionTextureColorAlphaTest
 2014-01-24 06:20:53 -08:00
Huabing.Xu 52ca254ecf 3.0 Beta2 HotFix: fix shader PositionTextureColorAlphaTest 2014-01-24 18:39:26 +08:00
Dhilan007 6655ad79d7 use const ValueMap& for setters. 2014-01-24 16:05:38 +08:00
Dhilan007 43ef9051a3 close #3835:fix TMXMapInfo::startElement insert property to properties fail 2014-01-24 15:37:32 +08:00
Dhilan007 771ed300c4 close #3642:fix bounding box of new label is incorrect. 2014-01-24 14:04:08 +08:00
James Chen 2e75a86431 Merge pull request #5185 from hanjukim/develop 
closed #3832: color and opacity settings are invalid when alignText.
 2014-01-23 19:56:45 -08:00
Ricardo Quesada 2b92ba75b4 more fixes for new GLView API 2014-01-23 16:04:11 -08:00
Ricardo Quesada 8ecaf49f93 GLView improvements 
it is not longer a singleton
it is possible to specify the size
 2014-01-23 15:36:55 -08:00
Hanju Kim 1a34a6ff84 remove unused header 
remove CC Prefix
 2014-01-23 18:55:51 +09:00
James Chen 41c63e2f4d Merge pull request #5183 from dumganhar/iss3823-fullscreen-glfw 
closed #3823: Fullscreen support for desktop platforms (windows, linux, mac).
 2014-01-23 01:41:41 -08:00
Hanju Kim 0d05db2326 Merge remote-tracking branch 'remotes/upstream/develop' into develop 2014-01-23 18:40:07 +09:00
Hanju Kim c042c5f3db updateColor should be called after updating quads on alignText 2014-01-23 17:27:28 +09:00
minggo 636205147f Merge pull request #5184 from minggo/update-version 
update version
 2014-01-23 00:26:35 -08:00
minggo c1f503bed0 update version 2014-01-23 16:25:38 +08:00
James Chen 8a6e5c1904 issue #3823: Updates desktop/CCEGLView.h/.cpp to support fullscreen. Use EGLView::initWithFullScreen() to initialize a window with full screen. 2014-01-23 15:56:12 +08:00
Hanju Kim 4773fd0937 Merge develop 2014-01-23 16:20:42 +09:00
Hanju Kim 39904e304d Merge remote-tracking branch 'remotes/upstream/develop' into develop 
Conflicts:
	cocos/2d/CCLabel.cpp
 2014-01-23 15:57:25 +09:00
James Chen 49efe0acc2 Merge pull request #5177 from Dhilan007/develop_label 
Label:Change the default parameters of TextHAlignment and let setString method do a single function
 2014-01-22 21:50:22 -08:00
Dhilan007 bd97394ccc 1.Label:Change the default parameters 
2.Label:let setString method do a single function
 2014-01-23 13:42:27 +08:00
James Chen aba15dfc2d Merge pull request #5172 from dumganhar/use-unified-cceglview 
Using unified 'desktop/CCEGLView.h/cpp' for Windows platform too.
 2014-01-22 19:23:44 -08:00
James Chen ce28972269 Updates cocos/2d/cocos2d.vcxproj. 2014-01-23 10:36:44 +08:00
James Chen 19062d716d Updates includes path to 'desktop/CCEGLView.h'. And added windows relevant codes. 2014-01-23 10:27:42 +08:00
James Chen 9b02f97217 Updates windows project to use the unified 'desktop/CCEGLView.h/.cpp'. 2014-01-23 09:58:12 +08:00
minggo a1729fa1b4 Merge pull request #5159 from natural-law/develop 
Add test case for issue 2572
 2014-01-22 17:49:56 -08:00
Ricardo Quesada c48415ef3c Merge pull request #5163 from dabingnn/develop_improve_renderer 
Develop improve renderer
 2014-01-22 17:04:19 -08:00
Ricardo Quesada dceb9cb1b9 compiles on Linux 2014-01-22 14:17:32 -08:00
Ricardo Quesada 6b8781241c code is cleaner 2014-01-22 13:51:01 -08:00
Ricardo Quesada 7249d3ca76 Unified CCEAGLView on Linux and Mac 2014-01-22 13:05:37 -08:00
Ricardo Quesada 1b6dfcda40 Merge branch 'develop' into cceglview_in_desktop 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-01-22 11:21:16 -08:00
James Chen 45bbbca8c6 Merge pull request #5164 from Dhilan007/develop_label 
close #3642:fix bounding box of new label is incorrect.
 2014-01-22 06:23:39 -08:00
Huabing.Xu 159f44a5dc issue #3812: performance improvement, 1. add vector reserve 2. use C++11 range loop 2014-01-22 18:24:23 +08:00
Dhilan007 ec297a2c31 close #3642:fix bounding box of new label is incorrect. 2014-01-22 18:01:37 +08:00
Dhilan007 a2f5146731 close #3642:fix bounding box of the new label is a bit off. 2014-01-22 17:45:56 +08:00
James Chen 351814c0be Merge pull request #5158 from Dhilan007/develop_label 
Label:remove unused code and optimization performance.
 2014-01-22 01:24:48 -08:00
Huabing.Xu cc39ca4f16 issue #3812: rename convertToWorldCoordiantes->convertToWorldCoordinates 2014-01-22 17:09:13 +08:00
minggo 9c6a65baba Merge pull request #5156 from minggo/deprecate-function 
deprecated some functions in Object
 2014-01-22 00:51:50 -08:00
Huabing.Xu 7ea9a4f025 issue #3812: remove member variable _lastCommand 2014-01-22 16:03:04 +08:00
Huabing.Xu 5bbd48a9bf issue #3812: remove member variable _firstCommand, remove comment codes 2014-01-22 15:52:00 +08:00
zhangbin 3c2ef04f2b Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-01-22 15:39:28 +08:00
zhangbin 3007f34240 issue #2572, Add test case for issue 2572. 2014-01-22 15:38:59 +08:00
Huabing.Xu 5397618aab Merge branch 'develop' into develop_refactor_culling 
* develop: (127 commits)
  issue #3677: Wrong include fix.
  issue #3677: File rename. PerformanceEventDispatcher.h/.cpp -> PerformanceEventDispatcherTest.h/.cpp.
  issue #3677: Updates Windows project to add PerformanceEventDispatcherTest.
  issue #3677: Updates Android.mk and CMakeLists.txt.
  issue #3677: Adds EventDispatcher performance test.
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Update CHANGELOG [ci skip]
  Update CHANGELOG [ci skip]
  [AUTO] : updating submodule reference to latest autogenerated bindings
  issue #3713: every autorelease will cause a release operation
  do not mix github access token with jenkins job trigger token
  issue #3781, Update travis-scripts, llvm-installing parts no need now.
  issue #3713: use reference in loop
  issue #3781, Minor fix & update submodule.
  closed #3808: EditBox on Mac works again.
  issue #3713:fix memory leak of autoreleas pool
  closed #3808: Removes unused files for MAC platform after using glfw3 to create opengl context
  global Z order uses floats
  ActionsProgress test include fixes
  Removed unused code and files.
  ...

Conflicts:
	cocos/2d/renderer/CCRenderer.cpp
 2014-01-22 15:37:25 +08:00
Dhilan007 4095ab36b6 update xcode project. 2014-01-22 15:22:46 +08:00
Huabing.Xu cf6785ffcf issue #3812: using std::vector<QuadCommand*> to hold current batched command 2014-01-22 15:18:27 +08:00
Dhilan007 65c2e03721 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into new_label 2014-01-22 15:08:05 +08:00
Dhilan007 df21bbf7df 1.remove unused code 
2.reduce calculation amount.
3.reduces expenses of function calls
 2014-01-22 14:57:11 +08:00
minggo 4381685a9d deprecated some functions in Object 2014-01-22 13:47:29 +08:00
Hanju Kim 64ab0c0e35 Merge remote-tracking branch 'remotes/upstream/develop' into develop 
Conflicts:
	cocos/2d/CCFontDefinition.cpp
 2014-01-22 14:15:21 +09:00
James Chen 3aac0b32a2 Merge pull request #5142 from Dhilan007/develop_label 
close #3805:fix wrap error and alignment error.
 2014-01-21 19:35:45 -08:00
James Chen 0ab5ec742a closed #3808: Removes unused files for MAC platform after using glfw3 to create opengl context 2014-01-22 10:16:34 +08:00
Ricardo Quesada 1113587f47 mac/CCEGLView moved to desktop/ 2014-01-21 17:52:30 -08:00
Ricardo Quesada 94ea94a113 global Z order uses floats 2014-01-21 16:36:19 -08:00
Ricardo Quesada b51b04f315 ActionsProgress test include fixes 2014-01-21 16:28:52 -08:00
Ricardo Quesada 06be466f29 Removed unused code and files. 
Making the mac platform easier to mantain
 2014-01-21 16:25:29 -08:00
Ricardo Quesada 98d23d30a6 First step in simplifying the mac platform 2014-01-21 15:44:01 -08:00
Ricardo Quesada e402f35e7f BatchCommand API fixes 
don't pass Texture Id.
Instead fetch it from the `TextureAtlas`
 2014-01-21 11:13:21 -08:00
Ricardo Quesada 7a8707cb08 Merge branch 'develop' into local_z_Order_fixes 
Conflicts:
	cocos/2d/CCNode.cpp
	cocos/2d/CCNode.h
 2014-01-21 10:10:50 -08:00
Ricardo Quesada f1444a26a1 Improves documentation with local z order 2014-01-21 09:26:58 -08:00
minggo 4833810c6e Merge pull request #5132 from minggo/iss3713-replace_CCObject 
remove Object::_autoReleaseCount
 2014-01-21 02:26:40 -08:00
Dhilan007 697b0289c7 close #3805:fix wrap error and alignment error. 2014-01-21 17:55:49 +08:00
James Chen b647659c9e Merge pull request #5138 from natural-law/develop 
closed #2572, Amend the arithmetic of child's position in ParallaxNode::addChild().
 2014-01-21 01:51:57 -08:00
James Chen ccecaeb94f Merge pull request #5125 from Dhilan007/develop_label 
close #3765:Simplify label.Remove FontAtlasFactory,FontDefinition and TextImage.
 2014-01-21 00:58:21 -08:00
zhangbin 6c0ccea547 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-01-21 16:33:53 +08:00
zhangbin 89c8e7e2fb closed #2572, The arithmetic of child's position in ParallaxNode::addChild() is wrong. 2014-01-21 16:25:35 +08:00
Hanju Kim 09579abac9 Merge remote-tracking branch 'remotes/upstream/develop' into develop 2014-01-21 17:24:07 +09:00
minggo 5fd35c3bab Merge https://github.com/cocos2d/cocos2d-x into iss3713-replace_CCObject 2014-01-21 13:46:40 +08:00
Dhilan007 f22e4d474f move some method to FontFreeType that only relating to FontFreeType from Font. 2014-01-21 10:36:32 +08:00
James Chen 0f9c3fa59c closed #3789: EventDispatcher supports sorting listeners by global Z and local Z order. And adds relevant test case. 2014-01-21 10:23:05 +08:00
minggo ee06a5908c issue #3713:invoke static member function to destroy singleone object 2014-01-21 10:14:00 +08:00
James Chen 43b2217fcf Include fix: CCFileUtils.h —> platform/CCFileUtils.h 2014-01-20 21:30:32 +08:00
James Chen 432534d857 #include “cocos2d.h” was FORBIDDEN in cocos modules. Reduces the dependence when header file changes. 2014-01-20 17:31:12 +08:00
minggo 3e5fbb2422 issue #3713: remove Object::_autoReleaseCount 2014-01-20 17:08:22 +08:00
James Chen 9f793f8a9b Warning fixes: 1) getZOrder —> getLocalZOrder. 2) long —> int 2014-01-20 15:03:30 +08:00
Hanju Kim a8f21761a7 Merge remote-tracking branch 'upstream/develop' into develop 
Conflicts:
	cocos/2d/CCFontAtlas.cpp
	cocos/2d/CCFontDefinition.cpp
	cocos/base/CCConsole.cpp
 2014-01-20 16:03:16 +09:00