Commit Graph

1011 Commits

Author SHA1 Message Date
andyque 7d2db27cae fixed #3599. use a scheduler to fix the position of editbox when it's parent postion has been changed 2014-03-03 15:46:43 +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 c6b2b86fe5 closed #4106: Object which isn't in Vector would also be released when invoking Vector::eraseObject.
Also refactored 'Vector::eraseObject':
1) Removed 'toRelease' parameter, Vector class should manage reference count.
2) Added 'removeAll' parameter to decide wether to remove all elements with the same value or just the first occurrence .
3) Added relevant UnitTest for 'Vector::eraseObject'.
2014-02-21 11:24:37 +08:00
James Chen b06a98b8ee Compilation error fix after merging https://github.com/cocos2d/cocos2d-x/pull/5058 2014-02-20 21:01:52 +08:00
James Chen e59a14f205 Merge pull request #5058 from zhiqiangxu/develop
ScrollView should implement ActionTweenDelegate
2014-02-20 20:33:04 +08:00
James Chen be507f6fda Merge pull request #5059 from zhiqiangxu/useless_code_in_scrollview
delete useless code in deaccelerateScrolling
2014-02-20 20:20:28 +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 a079c9759a issue #4097: Deletes CCEditBoxImplTizen.h/.cpp. 2014-02-20 16:42:28 +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 472c630277 issue #4097: Deletes CCEditBoxImplTizen.h/.cpp. 2014-02-20 16:40:12 +08:00
James Chen 5e6130c92c issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +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 a261ba9df2 issue #2920: Change internal ios keyboard type EditBox::InputMode::NUMERIC from UIKeyboardTypeNumbersAndPunctuation to UIKeyboardTypeDecimalPad 2014-02-17 14:33:26 +08:00
Denis 3595a4f31b -fixed memleak 2014-02-12 16:48:18 +03: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 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 4cbbd8a9f5 EGLView is not longer a singleton 2014-01-30 15:11:54 -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 00b5a9add5 issue #2920: fix indent 2014-01-27 18:22:35 +08:00
boyu0 e16e6a8e84 issue #2920: fix coding style 2014-01-27 18:19:10 +08:00
boyu0 23d2d586ed closed #2920: fix bug voice recognition input crash on ios7 2014-01-27 18:08:34 +08:00
James Chen 1c20df5ca9 Makes an assert if CC_ENABLE_CHIPMUNK_INTEGRATION was not enabled in PhysicsDebugNode::create. 2014-01-26 20:05:51 +08:00
James Chen 13cbaf4968 Updates CCPhysicsDebugNode.h/.cpp, don’t define CC_ENABLE_CHIPMUNK_INTEGRATION in header file. 2014-01-26 19:35:21 +08:00
James Chen 8902359db0 Compilation fix when CC_ENABLE_BOX2D_INTEGRATION is enabled. 2014-01-26 18:32:50 +08:00
James Chen e8229ad4e3 Don’t define CC_ENABLE_CHIPMUNK_INTEGRATION or CC_ENABLE_BOX2D_INTEGRATION in CCPhysicsSprite.h. 2014-01-26 17:56:14 +08:00
James Chen 25b15d94d4 [Android] Don’t define CC_ENABLE_CHIPMUNK_INTEGRATION in extension project. Define it in `Application.mk` instead. 2014-01-26 17:55:38 +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
James Chen a63f092d94 closed #3808: EditBox on Mac works again. 2014-01-22 10:53:43 +08:00
James Chen 9f793f8a9b Warning fixes: 1) getZOrder —> getLocalZOrder. 2) long —> int 2014-01-20 15:03:30 +08:00
Ricardo Quesada 5fcbf42356 GlobalZOrder is used for render priority...
...and not vertexZ

Node::setGlobalZOrder() is used to change that.

Node::setZOrder() -> Node::setLocalZOrder();
2014-01-18 11:38:06 -08:00
Ricardo Quesada 8931d968c0 Renderer uses a float as a key
Instead of using a 64-bit int key with viewport, opaque and depth,
it only uses a 32-bit float with only the depth.
Saves time in:
 - No need to convert the 32-bit float into 24-bit int
 - keys are shorter
2014-01-17 16:08:29 -08:00
Ricardo Quesada 1b5b9da102 compiles on Android
compiles on Android
2014-01-16 21:58:14 -08:00
Ricardo Quesada cfbceb0e22 Fixes compilation issues on Linux 2014-01-16 21:49:14 -08:00
Ricardo Quesada d0dbf34319 removes "include "cocos2d.h" from cocos2d files 2014-01-16 21:35:58 -08:00
xuzhiqiang 6dc6101357 more useless code 2014-01-14 22:40:02 +08:00
xuzhiqiang 8f76080b15 more useless code 2014-01-14 22:30:38 +08:00
James Chen b9dfad3df3 Merge pull request #5039 from martell/win64
closed #3700: Added x64 support for Windows - CCExtensions
2014-01-14 05:49:42 -08:00
xuzhiqiang f59c969216 delete useless code in deaccelerateScrolling 2014-01-14 21:22:55 +08:00
xuzhiqiang 3a86ec1ead fix compile 2014-01-14 20:36:37 +08:00
xuzhiqiang a2afff85a8 fix compile 2014-01-14 20:33:02 +08:00
xuzhiqiang 1d30bd0d80 fix compile 2014-01-14 20:27:14 +08:00
xuzhiqiang 4eafd7b4c5 CCActionTweenDelegate => ActionTweenDelegate 2014-01-14 20:19:57 +08:00
xuzhiqiang 562fdcf98b CCScrollView should inherit CCActionTweenDelegate 2014-01-14 20:03:12 +08:00
Dhilan007 d7593fd0f0 fix wrong judgments of conditional compilation. 2014-01-13 11:24:49 +08:00
Dhilan007 fd11791389 add a blank line at the file end. 2014-01-13 10:37:31 +08:00
Dhilan007 34a79a02e7 fix compiling error when CC_ENABLE_CHIPMUNK_INTEGRATION and CC_ENABLE_BOX2D_INTEGRATION are zero. 2014-01-13 10:32:34 +08:00
martell 23cf748534 Added x64 support for Windows - CCExtensions 2014-01-11 12:31:04 +00:00
WuHuan 16367b7594 solve conflicted with math.h isnan 2014-01-10 14:20:00 +08:00
WuHuan 2f4b094598 Merge pull request #4 from cocos2d/develop
update
2014-01-09 02:56:21 -08:00