jianglong0156
7e26c381c6
remove invalid code
2015-07-08 14:36:37 +08:00
jianglong0156
abee4a376a
add write api in FileUtils
...
bool writeStringToFile(std::string dataStr, const std::string& fullPath);
bool writeDataToFile(Data retData, const std::string& fullPath);
bool writeValueMapToFile(ValueMap& dict, const std::string& fullPath);
bool writeValueVectorToFile(ValueVector vecData, const std::string& fullPath);
and
formate the FileUtils code
2015-07-07 14:06:59 +08:00
CocosRobot
ae860bd6ee
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-06 08:29:03 +00:00
子龙山人
17207f14e5
Merge pull request #12689 from fusijie/refine_setAnimationInterval
...
Refine setAnimationInterval from double to float.
2015-07-06 16:18:45 +08:00
Jacky
4499b60446
Refine setAnimationInterval from double to float.
2015-07-06 14:57:42 +08:00
Neo Kim
9548d85f08
Fix radio button group clear issue
2015-07-04 09:57:54 +09:00
CocosRobot
fbf98adc7a
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-03 14:48:11 +00:00
pandamicro
38ded61568
Merge pull request #12670 from yangws/issue_8256
...
Fixbug: CCTargetedAction executes callback twice.
2015-07-03 22:34:54 +08:00
CocosRobot
91dc2d22de
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-03 10:37:33 +00:00
Vincent Yang
ca02f167c6
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2015-07-03 15:43:58 +08:00
Vincent Yang
1abeb8bf1e
Fixbug: CCTargetedAction executes callback twice.
2015-07-03 15:42:49 +08:00
pandamicro
f126eb3267
Merge pull request #12644 from WenhaiLin/v3-38-backevent-fix
...
Fixed EventListenerKeyboard.onKeyPressed not firing for back button on Android.
2015-07-03 15:42:45 +08:00
pandamicro
1b22438792
Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into merge-v3.7
...
Conflicts:
cocos/ui/UICheckBox.cpp
2015-07-03 10:23:49 +08:00
pandamicro
e7aeb335a3
Merge pull request #12609 from alexpeak/fixCCLabelPurgeResetOrder
...
Ensure CCLabel atlases are purged before resetting
2015-07-02 19:01:50 +08:00
pandamicro
ecf7148f85
Merge pull request #12624 from WenhaiLin/v3.8
...
AudioEngine:Fixed play audio may fail when switch to new scene on iOS.
2015-07-02 18:47:44 +08:00
pandamicro
e7c6ae7b13
Merge pull request #12637 from super626/skybox
...
Set Texturecube tex parameter to clamp to edge
2015-07-02 18:34:38 +08:00
子龙山人
91a8872cbd
Merge pull request #12647 from xiaofeng11/v3.7-release
...
UISlider update
2015-07-02 18:01:38 +08:00
pandamicro
dbd72d0123
Merge pull request #12646 from VisualSJ/v3.7-release
...
[ci skip] Fixed a bug that is don't analytical frame
2015-07-02 17:22:13 +08:00
子龙山人
5b971ee93d
Merge pull request #12607 from neokim/add_radio_button_and_group
...
Add RadioButton and RadioButtonGroup widgets
2015-07-02 17:12:59 +08:00
XiaoFeng
668dc50e07
Fix when slider set to disable mode then clean slider ball disable texture, normal texture won't show
2015-07-02 16:45:17 +08:00
WenhaiLin
a28ad6939d
Fixed EventListenerKeyboard.onKeyPressed not firing for back button on Android.
2015-07-02 16:19:33 +08:00
pandamicro
d155d42c0e
Merge pull request #12617 from yangws/issue_8194
...
Fixbug :EventDispatcher wrong dispatch order
2015-07-02 14:42:30 +08:00
Sijie.Wang
7818bfcc7a
Fixed a bug that is don't analytical frame
2015-07-02 14:30:44 +08:00
Neo Kim
61df7bc827
Add class documentation
2015-07-02 15:20:06 +09:00
Neo Kim
ec589c8d6f
Correct the wrong comment for lua
2015-07-02 15:19:50 +09:00
Neo Kim
0e35ee597a
Add logic for not belonging radio button checking.
2015-07-02 15:01:24 +09:00
pandamicro
079ccbb0e2
Merge pull request #12639 from VisualSJ/v3.7-release
...
Fixed a bug that is LayoutComponent position error
2015-07-02 13:58:15 +08:00
VisualSJ
a475caf35a
Fixed a bug that is LayoutComponent position error
2015-07-02 11:52:31 +08:00
Neo Kim
c4aa5a6274
Remove the code related to becoming parent node of radio buttons. Radio button group is not a parent node of radio buttons anymore.
2015-07-02 11:50:50 +09:00
Neo Kim
6550a9ccc2
Replace all tabs to 4 spaces to comply with the convention
2015-07-02 11:30:14 +09:00
XiaoFeng
9a905ede56
Fix check box front cross texture expand to normal size when change status between normal and disable frequency
2015-07-02 10:29:53 +08:00
Neo Kim
4b2bff4674
Change RadioButtonGroup not to be a node-parent of radio buttons but just a grouping node. And add one more test case.
2015-07-02 11:28:14 +09:00
CocosRobot
bf3c970534
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-01 14:12:18 +00:00
pandamicro
3b9fd5502e
Fix cc.isArray for JSB
2015-07-01 21:57:39 +08:00
pandamicro
a95edbfb65
Merge pull request #12618 from super626/clippingnode2
...
Sprite3D Clipping
2015-07-01 18:56:16 +08:00
pandamicro
6b730b5fbd
Merge pull request #12619 from WenhaiLin/v3-37-labelfix
...
Label:Fixed the top of character's texture may be tailored if enable outline effect.
2015-07-01 18:55:04 +08:00
songchengjiang
da5e077b55
texture set GL_CLAMP_TO_EDGE
2015-07-01 18:06:17 +08:00
Wenhai Lin
c06b5c5570
AudioEngine:Fixed play audio may fail when switch to new scene on iOS.
2015-07-01 17:19:28 +08:00
Vincent Yang
cb0e93fc08
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_scene3dtest
2015-07-01 14:58:06 +08:00
WenhaiLin
322bd30d7b
Label:Fixed the top of character's texture may be tailored if enable outline effect.
2015-07-01 14:57:01 +08:00
Vincent Yang
d26c08de46
Merge branch 'v3_scene3d_fixvisitingcamera' into v3_scene3dtest
2015-07-01 14:47:42 +08:00
pandamicro
2774d6ff1d
Merge pull request #12602 from yangws/v3_scene3dtest
...
Fixed bug: UI component can't click correctly by moving UI and camera far away of origin.
2015-07-01 14:46:35 +08:00
Vincent Yang
276ed46c01
Fixbug : issue 8194.
2015-07-01 14:39:35 +08:00
yangxiao
52daa2234c
add setForce2DQueue
2015-07-01 14:24:22 +08:00
yangxiao
269feeb1f9
remove stencil from Renderstate
2015-07-01 14:06:37 +08:00
pandamicro
4d95c8778b
Merge pull request #12598 from shinhirota/v3
...
Fixed iOS/JS-Bind callStaticMethod() with bool arg
2015-07-01 11:34:03 +08:00
Neo Kim
a64e50688e
Add the new files into CMake and Windows project configurations.
2015-07-01 12:21:42 +09:00
Vincent Yang
96b49277cc
[ci skip] add comment for UIWidget::_hittedByCamera.
2015-07-01 11:03:09 +08:00
Alex Peak
5328996a18
Fix event listener cleanup in destructor
...
Event listeners should always be removed at destroy (move out of
if-block)
2015-06-30 18:59:33 -07:00
Alex Peak
7cea464a11
Ensure CCLabel atlases are purged before resetting
...
The current purge->reset behavior occurs per label according to scene
graph priority. This has two disadvanages; firstly, any labels that are
initialized but not part of the scene graph will not be reset.
Secondly, any labels which share atlases in the FontAtlasCache may not
be reset since each label will call releaseFontAtlas individually before
resetting its fontConfig. This means that any shared atlases may not be
released all the way to a reference count of 0 and the invalid atlas
will not be deleted and reset from scratch.
By putting a fixed priority on both the purge and reset steps we can
ensure that firstly: all labels will be reset regardless of whether they
have been added to the scene-graph. Secondly, ALL labels with the same
atlas must call releaseFontAtlas before any others are allowed to
rebuild their textures. This will prevent any old atlases from sticking
around after a new GL context is created.
This is a fix for Github issue #8305
https://github.com/cocos2d/cocos2d-x/issues/8305
2015-06-30 13:16:25 -07:00