Vincent Yang
1711a70869
Merge v3 branch.
2015-07-10 16:39:36 +08:00
Vincent Yang
187c72e2b9
[ci skip] replace tab with 4 space.
2015-07-10 16:17:34 +08:00
pandamicro
c30ce38cb5
Merge pull request #12766 from super626/v3.7-release
...
Set default 3d animation quality to low
2015-07-10 15:35:22 +08:00
pandamicro
2d27091398
Merge pull request #12717 from jianglong0156/FileUtilsWriteFunctionMerge
...
add write api in FileUtils
2015-07-10 15:13:21 +08:00
WenhaiLin
eca192f7a6
Fixed compile error
2015-07-10 14:43:28 +08:00
WenhaiLin
81bc0b09da
Label:Fixed create fail if the font(TTF) not contain a Unicode charmap.
2015-07-10 14:39:21 +08:00
Vincent Yang
52293ad451
Fixed #9586 : FileUtils::isDirectoryExist not correct on Android when using relative path in 'assets'.
2015-07-10 14:37:42 +08:00
pandamicro
07fd337052
Merge pull request #12763 from folgerhu/v3.7-release
...
CCTMXXMLParser code negligence
2015-07-10 11:49:30 +08:00
yangxiao
c4587ecda1
if has normal use the shader with normal
2015-07-10 11:44:20 +08:00
Jacky
9eb5a1833b
fix malloc failed need to call afterCaptured callback.
2015-07-10 11:21:03 +08:00
pandamicro
69cdaca306
Auto add extend to jsb need to extend classes
2015-07-10 09:49:39 +08:00
pandamicro
bd5ae151d9
Merge pull request #12735 from yangws/issue_11887
...
Fix bug: Need to replace thread unsafe code from TextureCache::addImageAsync
2015-07-10 09:47:01 +08:00
Vincent Yang
8ff0ac6951
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into issue_9586
2015-07-10 09:35:41 +08:00
yangxiao
10fe728eee
animation quality default to low, do not interpolation
2015-07-09 17:54:21 +08:00
Vincent Yang
d9bc8b7c1b
fix bug: don't decrease _asyncRefCount correct in addImageAsyncCallback.
2015-07-09 17:06:55 +08:00
folgerhu@sina.com
a79586c052
CCTMXXMLParser code negligence
2015-07-09 17:02:12 +08:00
Vincent Yang
02226c6a26
Fix bug: Clipping node doesn't work on Android 5.0.
2015-07-09 16:49:26 +08:00
CocosRobot
2065e5b4a7
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-09 07:45:43 +00:00
子龙山人
8e256dcd09
Merge pull request #12718 from WenhaiLin/v3-label-addchild
...
Label:Support add child nodes.
2015-07-09 15:37:49 +08:00
pandamicro
a2da5d5f9d
Merge pull request #12738 from super626/v3.7-release
...
Update tiny obj loader and fix empty textrue
2015-07-09 14:57:10 +08:00
pandamicro
cab670f0ff
Merge pull request #12748 from fusijie/refineSetTexture
...
refine setTexture.
2015-07-09 14:56:06 +08:00
WenhaiLin
86a68f5a09
AudioEngine:refine thread pool
2015-07-09 14:31:03 +08:00
VisualSj
9f52b1e6fb
Fixed a bug that is SingleNode setColor is null
2015-07-09 11:49:11 +08:00
andyque
7243f2cff5
add const & to string arguments
2015-07-09 11:23:20 +08:00
WenhaiLin
41bc3a1900
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3.8
...
Conflicts:
AUTHORS
2015-07-09 11:11:34 +08:00
pandamicro
893d39c543
Merge pull request #12737 from chengstory/FixReaderBug
...
Fix cocos reader bug.
2015-07-09 10:33:45 +08:00
Jacky
1dbb2ab17a
refine setTexture.
2015-07-09 10:11:15 +08:00
CocosRobot
bfe6db174e
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-09 01:07:59 +00:00
Jacky
02597eb369
Completed test case and comment.
2015-07-08 22:34:33 +08:00
Wenhai Lin
5d50663c35
AudioEngine:support preload for audio[MAC/iOS]
2015-07-08 18:04:43 +08:00
WenhaiLin
6a33702c80
Refine Label::onDraw
2015-07-08 17:59:24 +08:00
Jacky
a59828605b
Support TileGrid rectangle.
2015-07-08 17:47:04 +08:00
Jacky
4a9e9f3744
completed api.
2015-07-08 17:26:29 +08:00
andyque
d4066a5ff8
improve coding style of Socket.IO
2015-07-08 17:23:48 +08:00
yangxiao
97a17cdc8a
program created dummy texture instead of empty texture
2015-07-08 17:00:01 +08:00
zhangcheng
0862d313b2
Fix cocos reader bug.
...
Fixes child nodes can't be rendered when particle and TiledMap as parent and their resource have been removed from disk.
2015-07-08 16:13:38 +08:00
子龙山人
155ac8c07e
Merge pull request #11583 from hannon235/v3-update-sio
...
Updates socket.io network extension to correctly detect and manage connection to socket.io server versions 0.9.x - 1.x
2015-07-08 16:11:05 +08:00
Jacky
260ce177d7
refine GridNode with rect.
2015-07-08 15:57:27 +08:00
yangxiao
f7cdd7162b
adapter according to latest objloader
2015-07-08 15:33:43 +08:00
WenhaiLin
8cf27b9174
Update comments.
2015-07-08 15:30:34 +08:00
jianglong0156
d55c0c64c5
add std::nothrow
2015-07-08 15:19:17 +08:00
Vincent Yang
7f9028b20c
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into issue_11887
2015-07-08 15:14:08 +08:00
Vincent Yang
1f8b46e911
Fixbug: Need to replace thread unsafe code from TextureCache::addImageAsync.
2015-07-08 15:13:48 +08:00
子龙山人
3f550ef331
Merge pull request #12663 from xiaofeng11/v3.7-release
...
Fix drawLine & drawPoints won't use blendFunc bug
2015-07-08 14:38:10 +08:00
jianglong0156
7e26c381c6
remove invalid code
2015-07-08 14:36:37 +08:00
子龙山人
2bcd70f681
Merge pull request #12726 from xpol/fixes-warnings-and-related-bug-in-CCSprite
...
Fixes some warnings and a related bug in CCSprite.
2015-07-08 14:12:40 +08:00
yangxiao
dac84ade0d
index to short
2015-07-08 14:03:53 +08:00
CocosRobot
9638ae628a
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-08 05:48:55 +00:00
yangxiao
40b33604d8
adjust objloader to cocos
2015-07-08 13:44:15 +08:00
yangxiao
fdd78ef73f
update objloader to latest
2015-07-08 13:42:14 +08:00
WenhaiLin
b395ef06d8
AudioEngine:support preload for audio[WIN32/WINRT 8.1/WP8.1]
2015-07-08 10:48:20 +08:00
Jacky
06c06a1f03
fix polygon sprite bug.
2015-07-08 10:07:35 +08:00
xpol
8179fe04f0
And more warnings.
2015-07-07 23:10:04 +08:00
xpol
29dcbe6685
Fixes some warnings and a related bug in CCSprite.
...
This story tells us that we should not just ignore warnings.
2015-07-07 23:01:24 +08:00
Neo Kim
160bff8e13
Add a setter for line width in DrawNode
2015-07-07 18:48:02 +09:00
XiaoFeng
1b1af798bc
Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3.7-release
2015-07-07 17:35:41 +08:00
WenhaiLin
581f1ab42b
Add test case
2015-07-07 15:41:54 +08:00
pandamicro
8f0cf8c3e6
Merge pull request #12575 from ywxzm/v3
...
fix onTouch begin don't return value
2015-07-07 14:57:13 +08:00
WenhaiLin
158d96046e
Label:Support add child nodes.
2015-07-07 14:20:23 +08:00
pandamicro
e717155930
Merge pull request #12715 from VisualSJ/v3.7-release2
...
[ci skip] Constant value error (ccui.Layout.BACKGROUND_IMAGE_ZORDER )
2015-07-07 14:13:31 +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
4a486077c0
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-07 06:05:39 +00:00
pandamicro
701df24301
Merge pull request #12698 from VisualSJ/v3.7-release
...
[ci skip] Fixed a bug that action texture address error
2015-07-07 13:57:30 +08:00
子龙山人
f28fbdd0c4
Merge pull request #12683 from neokim/add_scroll_bar_into_scroll_view
...
Add scroll bar feature into ScrollView
2015-07-07 13:56:09 +08:00
pandamicro
5970f56e1f
Merge pull request #12714 from VisualSJ/v3.7-release2
...
[ci skip] Constant value error (ccui.Layout.BACKGROUND_IMAGE_ZORDER )
2015-07-07 13:55:12 +08:00
子龙山人
a41d3847d5
Merge pull request #12709 from WenhaiLin/v3-37-crash-winfix
...
Fixed crash cause by the case of file name on WIN32.
2015-07-07 13:42:01 +08:00
VisualSj
dd0edac171
Constant value error (ccui.Layout.BACKGROUND_IMAGE_ZORDER )
2015-07-07 13:36:47 +08:00
子龙山人
cdaa994b84
Merge pull request #12711 from yangws/issue_12626
...
Fix bug taken from pr12602: scroll view can't scroll if pressed the b…
2015-07-07 13:33:24 +08:00
Vincent Yang
b4559a005b
Fix bug taken from pr12602: scroll view can't scroll if pressed the button on it.
2015-07-07 10:42:04 +08:00
andyque
6238ddebf3
Merge remote-tracking branch 'upstream/v3.7-release' into v3
2015-07-07 10:18:43 +08:00
WenhaiLin
4bd1fa7d37
Fixed crash cause by the case of file name on WIN32.
2015-07-07 10:08:47 +08:00
XiaoFeng
9a6ffd8904
Add bug test for PageView layout & CCNodeDraw::onDrawGLLine
2015-07-07 09:54:42 +08:00
子龙山人
a6b29666c9
Merge pull request #12674 from WenhaiLin/v3-38-issue12673
...
Label:Fixed the characters are displayed incorrect with "dark roast.ttf"
2015-07-07 09:50:00 +08:00
CocosRobot
4c88db3fb2
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-07 00:44:47 +00:00
Ricardo Quesada
ad1fc88fa8
compiles on Xcode 7
2015-07-06 16:30:29 -07:00
Ricardo Quesada
4c88be9520
removes -fno-excpetion and -fexception from cmake
2015-07-06 12:09:50 -07:00
CocosRobot
a4bce56cca
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-06 10:37:24 +00:00
VisualSj
3b69a1726f
Fixed a bug that action texture address error
2015-07-06 17:17:20 +08:00
jianglong0156
6f3b977c1e
add UserDefault api deleteValueForKey
2015-07-06 17:01:17 +08:00
XiaoFeng
214684b3be
Fix
2015-07-06 16:45:04 +08:00
XiaoFeng
9fab1e7702
Change to use auto & for each to enum sub items
2015-07-06 16:39:00 +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
XiaoFeng
d6fc8ecc94
Fix when use percentage size & position to a UIWidget which parent is a layout component, when change simulator screen size, layout won't effect correctly.
2015-07-06 16:02:19 +08:00
Jacky
4499b60446
Refine setAnimationInterval from double to float.
2015-07-06 14:57:42 +08:00
Neo Kim
a01f31c75c
Change NULL to nullptr
2015-07-06 15:54:28 +09:00
Neo Kim
c4dc9b04fd
Add a guard filtering tries to set same value.
2015-07-06 14:54:28 +09:00
XiaoFeng
df2a2d253d
Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3.7-release
2015-07-06 10:31:09 +08:00
Neo Kim
0ff7aaef95
Modify loop iteration codes
2015-07-06 11:30:24 +09:00
Neo Kim
43308e258a
Fix an issue of not releasing Texture instance in ScrollViewBar
2015-07-06 11:29:39 +09:00
Neo Kim
a4803c6713
Remove unnecessary commented out code.
2015-07-05 21:30:13 +09:00
Neo Kim
3ab4285960
Refactor code
2015-07-04 16:06:05 +09:00
Neo Kim
6264f7fefb
Correct include-related build errors in some platforms
2015-07-04 15:03:05 +09:00
Neo Kim
ceeca575f3
Replace 'margin' of scroll bar with 'positionFromCorner'
2015-07-04 14:05:47 +09:00
Neo Kim
f667b085b8
Change not to show scroll bar when the scroll view is initiated.
2015-07-04 09:59:22 +09:00
Neo Kim
9548d85f08
Fix radio button group clear issue
2015-07-04 09:57:54 +09:00
Neo Kim
3b6cd4dffc
Modify indentation to comply with the convention
2015-07-04 09:56:53 +09:00
Neo Kim
86cbd59bfd
Add UIScrollViewBar.cpp into CMake and Windows project configuration.
2015-07-04 09:56:53 +09:00
Neo Kim
60c32f6fb5
Refactor some codes
2015-07-04 09:56:53 +09:00
Neo Kim
ec45be699d
Add UIScrollViewBar class documentation
2015-07-04 09:56:52 +09:00
Neo Kim
c093bb18e2
Add scroll bar manipulation methods into ScrollView
2015-07-04 09:56:52 +09:00
Neo Kim
9a11cfd496
Add a way of changing scroll bar width
2015-07-04 09:56:52 +09:00
Neo Kim
2cae17b462
Add scroll bar feature into ScrollView
2015-07-04 09:56:52 +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
WenhaiLin
c11e91e215
Label:Fixed the characters are displayed incorrect with "dark roast.ttf"
2015-07-03 18:08:32 +08: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
WenhaiLin
91bc8f2e2d
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3.8
2015-07-03 14:59:12 +08:00
pandamicro
1f48beee1e
Reorganize code
2015-07-03 12:55:55 +08:00
XiaoFeng
993e420ce4
Fix drawLine & drawPoints won't use blendFunc bug
2015-07-03 11:30:38 +08:00
pandamicro
155b9b918c
Add retain/release for XMLHTTPReqest in JSB
2015-07-03 11:01:43 +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
zhang
48c3466774
Update LayerEx.lua
2015-07-01 20:25:45 +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
Neo Kim
3f05ad2b98
Replace all tabs to 4 spaces to comply with the convention
2015-06-30 20:31:31 +09:00
Neo Kim
f5e7184f0b
Add new cpp files into Android.mk
2015-06-30 18:50:13 +09:00
Neo Kim
bed90606d3
Add RadioButton feature and a test case for it.
2015-06-30 18:50:13 +09:00
Neo Kim
a37015d083
To create radio button feature which uses almost same logic with CheckBox, extract the common logic from CheckBox and make it as AbstractCheckButton class.
2015-06-30 18:50:13 +09:00
子龙山人
40521ad1c4
Merge pull request #12600 from fusijie/fix_spritebatchnode_sort_error
...
Fix SpriteBatchNode sort error.
2015-06-30 17:29:59 +08:00
Bin Zhang
d0db3aee98
Remove the plugin-x related files from the Xcode project of js-bindings .
2015-06-30 17:28:47 +08:00
子龙山人
077241eecf
Merge pull request #12599 from jianglong0156/jsbProjectMerge
...
merge the jsb project into cocos2d project
2015-06-30 17:04:12 +08:00
Bin Zhang
bb77101f0b
Solve the error when building simulator for android.
2015-06-30 16:45:13 +08:00
子龙山人
d5d68223f1
Merge pull request #12604 from WenhaiLin/v3.8-audio-iosfix
...
AudioEngine:Fixed play audio may fail(error code:-1) on iOS
2015-06-30 16:30:05 +08:00
子龙山人
3b4d134050
Merge pull request #12603 from jianglong0156/autoPolygonFileEncode
...
change the file encoding,
2015-06-30 16:29:44 +08:00
Wenhai Lin
e124593a5c
AudioEngine:Fixed play audio may fail(error code:-1) on iOS
2015-06-30 15:38:24 +08:00
jianglong0156
bc341edf1f
change the file encoding,
...
It display a coded warning in current encoding, leading to incredbuild unusable
2015-06-30 15:33:54 +08:00
Vincent Yang
2ba6f266ad
Fixed bug: UI component can't click correctly by moving UI and camera far away of origin.
2015-06-30 14:32:14 +08:00
Jacky
25bac2f6a9
Fix SpriteBatchNode sort error.
2015-06-30 14:12:18 +08:00
jianglong0156
185b4419be
merge job project into cocos2d-x project
2015-06-30 13:49:24 +08:00
Shin Hirota
221d33a431
Fixed iOS/JS-Bind callStaticMethod() with bool arg
2015-06-30 14:00:28 +09:00
子龙山人
29cccf631e
Merge pull request #12550 from kompjoefriek/v3-vibrate
...
Vibrate support in v3
2015-06-30 10:28:59 +08:00
子龙山人
950cb840c2
Merge pull request #12582 from super626/listview
...
fix camera mask of listview
2015-06-30 10:25:57 +08:00
pandamicro
92c869f408
Merge pull request #12594 from MSOpenTech/v3-winrt-js-keyboard
...
V3 winrt js keyboard support
2015-06-30 07:24:17 +08:00
Dale Stammen
38b687f8d8
enable support for keyboard on winrt platforms to fix back button
2015-06-29 09:13:19 -07:00
Dale Stammen
7684c208e0
unsupported cocos2d-x image formats removed or updated
2015-06-29 08:41:44 -07:00
Dale Stammen
eb668f63ce
unsupported cocos2d-x image formats removed or updated
2015-06-29 08:39:31 -07:00
pandamicro
15c763d84a
Update engine version
2015-06-29 18:21:06 +08:00
子龙山人
c997284825
Merge pull request #12352 from andyque/add-two-events-to-ui-slider
...
Improve ui::Slider
2015-06-29 17:01:27 +08:00
yangxiao
a56a5d24b6
fix camera mask of listview
2015-06-29 14:41:03 +08:00
andyque
60834e6f0c
Merge branch 'v3' into v3-finish-android-9-patch-image-format
...
Conflicts:
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
2015-06-29 12:05:52 +08:00
andyque
30d2129f0c
improve indent and getTime function
2015-06-29 11:52:53 +08:00
zhang
43ea04da3c
fix onTouch begin don't return value
...
fix only receive "begin" envent,can't receive "moved" "ended"
2015-06-28 13:18:33 +08:00
pandamicro
c055028485
Merge pull request #12566 from jianglong0156/winrtMouse
...
Winrt mouse
2015-06-26 18:43:33 +08:00
pandamicro
88aeaa36f4
Merge pull request #12534 from super626/skybox
...
Skybox improvement
2015-06-26 17:05:17 +08:00
子龙山人
260d5035bb
Merge pull request #12555 from WenhaiLin/v3-simpleaudio-AndroidL-Fix
...
Fixed SimpleAudioEngine may cause application to crash on Android L(5.0.x)
2015-06-26 11:05:40 +08:00
Wenhai Lin
1875829ab4
[CppTests:ExtensionsTest-->CocoStudioComponentsTest]Fixed crash on Android 5.0.x
2015-06-26 10:16:52 +08:00
pandamicro
e9ee303445
Merge pull request #12547 from MSOpenTech/v3.7-winrt-audio
...
V3.7 winrt audio fix
2015-06-26 09:47:11 +08:00
pandamicro
4b34963329
Merge pull request #12537 from andyque/fix-v3.7-scrollView-dpi
...
use inch for childFocusCancelOffset in UIScrollView
2015-06-26 08:11:00 +08:00
kompjoefriek
6eca03fdd2
Merged changes from "Vibrate support in v4" into v3 branch.
2015-06-26 01:02:44 +02:00
Dale Stammen
61f4e280b4
Merge branch 'v3.7-release' into v3.7-winrt-audio
2015-06-25 12:46:20 -07:00
pandamicro
1ab369a70b
Merge pull request #12542 from andyque/fix-v3.7-stuio-percent-mode
...
Fix v3.7 cocosStudio percent position bug
2015-06-25 21:37:12 +08:00
pandamicro
3136bef9e3
Fix convertDistanceFromPointToInch logic (add x, y)
2015-06-25 21:34:00 +08:00
pandamicro
e29284374b
Fix convertDistanceFromPointToInch logic
2015-06-25 20:57:23 +08:00
pandamicro
0275b54b63
Merge pull request #12540 from samuele3hu/v3_7_test
...
Fix the compile error of js-template by using android-studio compile param.
2015-06-25 18:49:43 +08:00
samuele3hu
3a654b4615
Fix the compile error of js-template by using android-studio compile param.
2015-06-25 17:44:51 +08:00
jianglong0156
11ac928f59
winrt use touch event replace mouse event
2015-06-25 17:44:03 +08:00
jianglong0156
c60e9dfc9e
winrt not suppot mouse
2015-06-25 17:25:27 +08:00
andyque
d83f528327
use inch for childFocusCancelOffset in UIScrollView
2015-06-25 16:57:00 +08:00
andyque
0c1ee8b26a
fix studio json reader percentage mode bug
2015-06-25 16:14:22 +08:00
yangxiao
f4a81f0e53
optimize draw
2015-06-25 15:14:44 +08:00
yangxiao
13dbd44250
remove unused variable
2015-06-25 15:05:21 +08:00