b9af100493
visit() using Matrix instead of kmMat4
2014-04-08 21:45:54 +08:00
29c345bd02
Merge branch 'develop' into develop_migrate_math_lib_merge
2014-04-04 18:45:21 +08:00
f9405e0ea9
Merge branch 'develop' into develop_migrate_math_lib_merge
2014-04-03 17:47:16 +08:00
bb19e39e37
migrate ScrollView to director matrix stack
2014-04-03 15:55:37 +08:00
0a6b0a4389
issue #4636 . refactor Scale9Sprite
2014-04-03 10:07:47 +08:00
432ec49c88
fix issue that ControlButton can't swallow touch event.
2014-04-02 17:01:11 +08:00
48839b9d4d
closed #4635 : ControlSwitch's marksprite is shown at a wrong place
2014-04-02 11:26:39 +08:00
9f68a1111e
added wp8 editbox support
2014-03-28 16:03:09 -07:00
898e2136b1
LabelTTF and LabelBMFont tagged as deprecated
2014-03-28 14:18:01 +08:00
fd5a4acddb
Remove the old implementation of LabelBMFont.
2014-03-28 10:28:44 +08:00
57d8f155df
issue #4401 . resolve conflicts
2014-03-26 14:54:50 +08:00
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
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
04b529d328
fixed use of nullptr in variable args for wp8
2014-03-24 15:09:24 -07:00
44e6efea64
#pragma mark for ios and mac only
2014-03-22 06:08:05 -07:00
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
f7e003758f
issue #4448 : Respond to move event if dragging is enabled, no matter whether mouse is in the content of cocos2d::extension::ScrollView.
2014-03-19 17:11:34 +08:00
02ee3a52eb
closed #4448 : Elastic bounce back effect support for cocos2d::extension::ScrollView.
2014-03-19 17:11:34 +08:00
2f1a7ebf42
Elastic bounceback for ScrollView
...
Add iOS-like elastic bounceback.
If you scroll content of scroll view out of insets,
its content will be scrolled 0.35 of user scrolled distance.
2014-03-18 18:51:07 +09:00
e512235299
Remove the old implementation of LabelTTF
2014-03-14 21:06:40 +08:00
cea307bfb8
EditBox:fixed nothing to display when input flag is PASSWORD on Android.
2014-03-13 22:16:38 +08:00
1595465361
Merge pull request #5736 from Dhilan007/develop_editbox
...
EditBox:fixed clip the text width to fit to the text box on Android and IOS.
2014-03-13 18:36:48 +08:00
a567d467b3
Issue #4277 : fixed a bug of ControlButton that it will crash when it deletes itself in its callback.
2014-03-13 10:14:24 +08:00
9c9d2c24bf
EditBox:fixes clip the text width to fit to the text box on Android and IOS.
2014-03-12 21:40:58 +08:00
a393eded58
CCLOG -> CCLOGINFO for change of EditBox's position.
2014-03-12 14:16:42 +08:00
08ce108454
Comment some lines in CCEditBoxImplIOS.mm/CCEditBoxImplAndroid.cpp, since After re-implement LabelTTF by Label, '(g|s)etTextureRect' will not work, it's because LabelTTF is inherited from Node rather than Sprite now.
...
We need to fix this as soon as possible.
2014-03-12 14:12:07 +08:00
0aaa1dc0db
closed #4291：open CCEditBox as modal dialog
2014-03-06 22:17:20 +08:00
61ae219a5c
fix: controlSwitch Bug
2014-03-05 14:03:44 +08:00
7ac663e02c
GL Program API fixes
2014-03-04 13:51:43 -08:00
c386f88e32
Merge branch 'develop' into visit_draw_improved
...
Conflicts:
CHANGELOG
cocos/gui/UILayout.h
2014-03-03 11:27:42 -08:00
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
d78304599d
Cache working OK.
...
Performance increased in 20% for static objects.
2014-02-28 16:10:48 -08:00
6920bec6ef
transform object returns the MV
...
code cleaner.
the kmGL code is altogether
2014-02-28 11:20:53 -08:00
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
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
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
b06a98b8ee
Compilation error fix after merging https://github.com/cocos2d/cocos2d-x/pull/5058
2014-02-20 21:01:52 +08:00
e59a14f205
Merge pull request #5058 from zhiqiangxu/develop
...
ScrollView should implement ActionTweenDelegate
2014-02-20 20:33:04 +08:00
be507f6fda
Merge pull request #5059 from zhiqiangxu/useless_code_in_scrollview
...
delete useless code in deaccelerateScrolling
2014-02-20 20:20:28 +08:00
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
0d8846d876
closed #4097 : Adds a macro to disable inserting script binding relevant codes.
2014-02-20 16:40:46 +08:00
472c630277
issue #4097 : Deletes CCEditBoxImplTizen.h/.cpp.
2014-02-20 16:40:12 +08:00
5e6130c92c
issue #4058 : Get rid of Object ,rename it to Ref.
2014-02-20 10:53:49 +08:00
a261ba9df2
issue #2920 : Change internal ios keyboard type EditBox::InputMode::NUMERIC from UIKeyboardTypeNumbersAndPunctuation to UIKeyboardTypeDecimalPad
2014-02-17 14:33:26 +08:00
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
7da8c84a75
Renames EGLView -> GLView
2014-01-30 16:51:43 -08:00
862500f99a
Renames EGLView -> GLView
2014-01-30 15:40:56 -08:00
4cbbd8a9f5
EGLView is not longer a singleton
2014-01-30 15:11:54 -08:00
00b5a9add5
issue #2920 : fix indent
2014-01-27 18:22:35 +08:00
e16e6a8e84
issue #2920 : fix coding style
2014-01-27 18:19:10 +08:00
23d2d586ed
closed #2920 : fix bug voice recognition input crash on ios7
2014-01-27 18:08:34 +08:00
8ecaf49f93
GLView improvements
...
it is not longer a singleton
it is possible to specify the size
2014-01-23 15:36:55 -08:00
a63f092d94
closed #3808 : EditBox on Mac works again.
2014-01-22 10:53:43 +08:00
9f793f8a9b
Warning fixes: 1) getZOrder —> getLocalZOrder. 2) long —> int
2014-01-20 15:03:30 +08:00
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
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
1b5b9da102
compiles on Android
...
compiles on Android
2014-01-16 21:58:14 -08:00
cfbceb0e22
Fixes compilation issues on Linux
2014-01-16 21:49:14 -08:00
d0dbf34319
removes "include "cocos2d.h" from cocos2d files
2014-01-16 21:35:58 -08:00
6dc6101357
more useless code
2014-01-14 22:40:02 +08:00
8f76080b15
more useless code
2014-01-14 22:30:38 +08:00
f59c969216
delete useless code in deaccelerateScrolling
2014-01-14 21:22:55 +08:00
3a86ec1ead
fix compile
2014-01-14 20:36:37 +08:00
a2afff85a8
fix compile
2014-01-14 20:33:02 +08:00
1d30bd0d80
fix compile
2014-01-14 20:27:14 +08:00
4eafd7b4c5
CCActionTweenDelegate => ActionTweenDelegate
2014-01-14 20:19:57 +08:00
562fdcf98b
CCScrollView should inherit CCActionTweenDelegate
2014-01-14 20:03:12 +08:00
ccda90cab5
fix compiling error in CCControlSlider.cpp on vs.
2014-01-09 15:52:04 +08:00
46009e5daf
Merge commit 'refs/pull/4085/head' of git://github.com/cocos2d/cocos2d-x into iss3619
...
Conflicts:
extensions/GUI/CCControlExtension/CCControlButton.cpp
2014-01-09 11:16:44 +08:00
d4ff0ff7b8
Merge pull request #4075 from v1ctor/fix-extensions-slider
...
closed #3615 : ControlSlider doesn't support setting selected thumb sprite
2014-01-08 18:50:34 -08:00
e93b567000
ScrollView::intWithView supports be invoked several times.
2014-01-07 22:16:24 +08:00
4bb091067f
Adds empty constructor for TableView and TableViewCell.
2014-01-07 22:15:20 +08:00
26efb4bf5c
long —> ssize_t for some classes.
2014-01-07 18:26:31 +08:00
5c217f70d1
ScrollView uses new renderer now.
2014-01-07 17:46:24 +08:00
6827538802
Adds override keyword for override functions.
2014-01-04 18:12:09 +08:00
d75d2159dd
fix control switch bug
2014-01-03 19:53:14 +08:00
d1ad635ad8
Merge pull request #4497 from zhiqiangxu/develop
...
closed #3559 : Useless conversion in ScrollView::onTouchBegan
2014-01-01 17:55:41 -08:00
93ed5a4f0f
long --> ssize_t for TableView callback.
2013-12-26 04:09:24 -08:00
07925d112e
issue #2920 : add version detect.
2013-12-25 17:21:28 +08:00
3764005d88
issue #2920 : add “FIX ME” comment.
2013-12-25 14:46:29 +08:00
622431758e
issue #2920 : temporary fix dictation input crash on ios7.
2013-12-25 10:22:52 +08:00
ed93f90ccc
Removes unneeded ‘override’ codes, uses `using Node::addChild;` to prevent compiler warnings.
2013-12-23 16:58:26 +08:00
756f8f7a11
Merge pull request #4482 from dabingnn/develop_gridNode
...
Develop grid node
2013-12-19 18:30:42 -08:00
59fee6b8d2
replaces std::for_each with for()
...
replaces `std::for_each` with C++11 `for( : )`
2013-12-19 13:34:41 -08:00
d51ad36613
Merge branch 'develop' into develop_gridNode
...
* develop: (67 commits)
Adds const in ShaderTest2.h
Skew works again!
[AUTO] : updating submodule reference to latest autogenerated bindings
[AUTO] : updating submodule reference to latest autogenerated bindings
Reverts submodule.
Updates submodule of bindings-generator.
Adds `std::for_each` test in invocation
Reverts bindings-generator.
fixed not render
iterator in Sprite fixes
update vs project for removes unneeded files
getNodeToParentTransform fixes
Node cleanup
[AUTO] : updating submodule reference to latest autogenerated bindings
Improves SpriteTest
[AUTO] : updating submodule reference to latest autogenerated bindings
Android and Linux fixes
removes `using namespace std` from header file
Removes unneeded files
change play arguments
...
Conflicts:
cocos/2d/CCNode.cpp
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
2013-12-19 17:20:22 +08:00
ef54ed3c15
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into HEAD
...
Conflicts:
cocos/2d/CCLabel.cpp
cocos/2d/CCLabel.h
cocos/2d/CCLabelBMFont.cpp
cocos/2d/CCLabelBMFont.h
cocos/2d/CCLayer.cpp
cocos/2d/CCLayer.h
cocos/2d/CCNode.cpp
extensions/GUI/CCControlExtension/CCControl.cpp
extensions/GUI/CCControlExtension/CCControlButton.cpp
extensions/GUI/CCControlExtension/CCScale9Sprite.cpp
tools/tojs/cocos2dx.ini
2013-12-19 17:05:59 +08:00
0695e32fff
Some warning fixes in SocketIO, ContriolButton, js_manual_conversion.h/.cpp.
2013-12-18 15:40:31 +08:00
25fc3d3c2a
Merge branch 'develop' into develop_gridNode
...
* develop: (105 commits)
update armature to new render
iOS & Mac project fix.
[AUTO] : updating submodule reference to latest autogenerated bindings
use size_t replace unsigned int for record redeque::size returned value.
issue #2171 : Updates CMakeLists.txt.
issue #2171 : Binds New renderer classes, ignores NewTextureAtlas.
issue #2171 : Adds header files of renderer in cocos2d.h.
issue #2171 : Reorder renderer files for iOS & mac project.
issue #2171 : small fix in ccTypes.h
issue #2171 : Don’t ‘using namespace std;’ in header file.
[AUTO] : updating submodule reference to latest autogenerated bindings
issue #2171 : Ignores Director::getFrustum.
issue #2171 : Fixing compilation errors for Linux port.
issue #2171 : NULL —> nullptr for Android warning of CCBAnimationManager.cpp.
issue #2171 : [New Renderer] Fixing compilation errors for Android.
[Win32] fix argument type. - argument of interface is ssize_t.
Update AUTHORS [ci skip]
Update CHANGELOG [ci skip]
Add mouse scrolling support for extension test
issue #3341:fix Incorrect at TextureCache::addImageAsync for repeatedly execute for the same image
...
Conflicts:
cocos/2d/CCNode.cpp
cocos/2d/cocos2d.vcxproj.filters
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
2013-12-17 18:16:05 +08:00
d16fa07661
Removes Vector<T>::forEach, please use std::for_each instead. The same as Vector<T>::sort.
2013-12-17 17:45:29 +08:00
2a38d4fe94
issue #2171 : Fixing compilation errors for Linux port.
2013-12-17 14:50:40 +08:00
c7d350c83e
Merge branch 'develop' into newRenderer
2013-12-16 20:43:43 -08:00
e8f55069e3
reduce useless convert
2013-12-16 18:20:10 +08:00
f797dea827
bug fix
2013-12-16 12:27:30 +08:00
b1eacd52cb
Merge branch 'develop' into develop_gridNode
...
* develop:
fix compile error related to ssize_t.
issue #2771 : add and change some physics API, and add more documents
[AUTO] : updating submodule reference to latest autogenerated bindings
Some fixes for XXX:getDescription.
Reverts CCSpriteBatchNode.h
size_t —> ssize_t in CCTMXLayer.cpp
issue #2771 : add PhysicsWorld function set/getUpdateRate and set/getSpeed. Change name PhysicsQueryRectCallbackFunc and PhysicsPointQueryCallbackFunc to PhysicsRectQueryCallbackFunc and PhysicsQueryPointCallbackFunc
Fix:Add lua binding of ’registerScriptHandler’、’unregisterScriptHandler’ and ’removeObjectAllHandlers’ of ScriptHandlerMgr and some constants define
[AUTO] : updating submodule reference to latest autogenerated bindings
More renames of description() to getDescription()
getDescription() works as expected
fix compiling error after fixing conflicts
fix compiling error after fixing conflicts
use ssize_t for index
use ssize_t for index and capacity
use ssize_t for capacity and index in containers
Fix:Remove some needless lua binding functions and resolve a bug
2013-12-16 10:43:49 +08:00
c15ad14ed3
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
2013-12-16 03:45:06 +08:00
3838268fd0
Merge branch 'develop' into newRenderer
2013-12-14 19:28:01 -08:00
defae416f3
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
2013-12-13 18:09:39 +08:00
4e2e423615
fix compile error related to ssize_t.
2013-12-13 17:53:03 +08:00
29a15c885a
Merge branch 'develop' into newRenderer
2013-12-12 11:44:09 -08:00
d7106d49be
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
2013-12-12 17:04:21 +08:00
Huabing.Xu