pandamicro
949eca2846
Improve some manual binding code
2015-07-16 14:34:14 +08:00
andyque
7c665e6447
remove EMSCRIPTEN related code
2015-07-16 14:15:41 +08:00
pandamicro
490d5a3747
Remove cleanup from auto bindings add made it support override in JS
2015-07-16 14:09:26 +08:00
WenhaiLin
d5d5af5ac3
change ‘auto’ to ‘auto&&’
2015-07-16 14:08:59 +08:00
CocosRobot
8442fe5f89
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-16 06:04:17 +00:00
子龙山人
40f4e0b27b
Merge pull request #12864 from zilongshanren/add-jumpToPage-api
...
add setCurPageIndex API to PageView.
2015-07-16 13:56:05 +08:00
pandamicro
0b1d105803
Merge pull request #12870 from VisualSJ/v3.7-release-parser
...
[ci skip] Fixed parser's bug
2015-07-16 13:04:06 +08:00
VisualSj
0bb385f37c
Check texture for existence
2015-07-16 11:54:45 +08:00
andyque
517221a0df
add jumpToPage API to PageView.
...
1. This commit also fix the default font size issue in ui::Button.
2015-07-16 11:33:57 +08:00
VisualSj
ef70e1f996
Fixed a bug that is Armature parser
2015-07-16 10:30:22 +08:00
WenhaiLin
1c9a181c35
Label:Fixed the color of letter will be overridden by fade action.
2015-07-15 20:17:05 +08:00
pandamicro
bcd20b1bf0
Merge pull request #12861 from pandamicro/v3
...
Sync Cocos2d-x v3.7 RC1
2015-07-15 17:16:44 +08:00
Jacky
e4b392d4c8
fix polygon sprite setColor, setOpacity, setTexture, setTextureRect.
2015-07-15 16:27:29 +08:00
CocosRobot
be71b6d563
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-15 08:23:23 +00:00
pandamicro
99e504e668
Merge pull request #12854 from yangws/issue_11310
...
fixed #11310 : multiple camera case utils::captureScreen bug.
2015-07-15 15:00:29 +08:00
pandamicro
436564f922
Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
docs/RELEASE_NOTES.md
web
2015-07-15 14:39:40 +08:00
andyque
2f31f6baa6
fixed Scale9Sprite gray state issue.
...
When call `setCapInsets`, the Scale9Sprite's inner sprite will be
rebuild and it's state will be lose.
This commit reset the shader state.
2015-07-15 14:35:13 +08:00
子龙山人
d291afe295
Merge pull request #12856 from fusijie/fix_rendertexture_backtofront
...
fixed renderTexture switch foreground to background issue.
2015-07-15 14:32:40 +08:00
Jacky
a204b02668
fixed renderTexture switch foreground to background issue.
2015-07-15 13:47:10 +08:00
CocosRobot
4b418fe823
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-15 05:46:42 +00:00
Vincent Yang
7a105ce1e1
fixed #11310 : multiple camera case utils::captureScreen bug.
2015-07-15 12:09:08 +08:00
andyque
e4cad50c2f
fix tons of warnings
2015-07-15 12:04:48 +08:00
pandamicro
c126aac35f
v3.7 rc1 release doc
2015-07-14 23:21:34 +08:00
Mazyad Alabduljaleel
008a5ef89c
replaced tabs with whitespace
2015-07-14 16:34:11 +03:00
Mazyad Alabduljaleel
6f8bc04934
First commit for improving iOS EditBox
...
+ Moved internal stuff to the implementation file
+ Added pragma and organized methods
+ cleanup synthesize, instance variables, and overall code style for ObjC
2015-07-14 16:18:03 +03:00
pandamicro
eb56ad6d60
Merge pull request #12836 from pandamicro/v3.7-release
...
Fixed #12834 Invoke cleanup function when override in JS
2015-07-14 17:37:00 +08:00
pandamicro
a90a8b12c6
Merge pull request #12840 from pandamicro/path
...
[ci skip] Add cc.path.mainFileName
2015-07-14 16:41:16 +08:00
子龙山人
49b47f576d
Merge pull request #12828 from WenhaiLin/v3-label-readability
...
Label:improving the code readability.
2015-07-14 16:38:53 +08:00
子龙山人
7e4e82da2c
Merge pull request #12835 from zilongshanren/improve-coding-style
...
add more descriptive message to ASSET macro.
2015-07-14 16:36:59 +08:00
子龙山人
af4442d0d6
Merge pull request #12833 from fusijie/v3
...
Fixed setAnimationInterval JNI bug.
2015-07-14 16:33:39 +08:00
pandamicro
41778f35fb
Add cc.path.mainFileName
2015-07-14 16:33:38 +08:00
pandamicro
658fe74141
Merge pull request #12838 from VisualSJ/v3.7-release-parser
...
[ci skip] Remove getRes (parser)
2015-07-14 16:20:42 +08:00
pandamicro
efffea5b91
Fixed #12834 Invoke cleanup function when override in JS
2015-07-14 15:35:29 +08:00
andyque
91dfb07a8c
add more descriptive message to ASSET macro.
2015-07-14 15:28:36 +08:00
VisualSj
a9deb6dda5
Remove getRes (parser)
2015-07-14 15:26:13 +08:00
Jacky
ea773cac20
Fixed setAnimationInterval JNI bug.
2015-07-14 15:11:35 +08:00
pandamicro
09775d6f2a
Ensure backward compatibility
2015-07-14 14:14:36 +08:00
WenhaiLin
b701fd9e73
Fixed compile error
2015-07-14 13:47:35 +08:00
WenhaiLin
964713355b
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-label-createfail
2015-07-14 13:43:43 +08:00
CocosRobot
6b9a5b8264
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-14 05:41:48 +00:00
pandamicro
43a5b6f020
Fix jsb loaders issues
2015-07-14 13:40:09 +08:00
子龙山人
616efbf0c3
Merge pull request #12812 from neokim/refactor_scroll_view_bar
...
Refactor scroll view bar
2015-07-14 13:34:07 +08:00
子龙山人
e1ae3631fc
Merge pull request #12818 from zilongshanren/v3
...
merge v3.7 back to v3
2015-07-14 13:32:56 +08:00
pandamicro
69a70010cf
Merge pull request #12827 from yangws/issue_12668
...
Fixed #12668 : Lua-bindings-manual-network--LuaMinXmlHttpRequest have…
2015-07-14 12:05:29 +08:00
WenhaiLin
d4f62a8063
Label:improving the code readability.
2015-07-14 11:30:56 +08:00
andyque
ef5d4ddf86
Merge remote-tracking branch 'upstream/v3' into v3
...
# Conflicts:
# tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems.filters
2015-07-14 11:24:38 +08:00
Neo Kim
7882a534c1
Correct the wrong boolean statement and make it easy to read
2015-07-14 11:58:44 +09:00
Vincent Yang
0a6933cc8c
Fixed #12668 : Lua-bindings-manual-network--LuaMinXmlHttpRequest have a memory leak.
2015-07-14 10:46:17 +08:00
Vincent Yang
0589c14302
Restructure CCFileUtils class, move platform related functions to CCFileUtilsXXX.
...
Add TestIsDirectoryExist and TestUnicodePath in cpp-tests FileUtil test.
2015-07-14 09:44:36 +08:00
Vincent Yang
06bf6ffa90
Merge pr11866: FileUtilsWin32 correct use all unicode version winapi.
2015-07-14 09:35:01 +08:00
Neo Kim
863c3a0a2a
Correct a typo
2015-07-14 10:17:05 +09:00
andyque
fc673ee502
Merge branch 'v3.7-release' into v3
2015-07-13 22:44:54 +08:00
Vincent Yang
74227eaf16
Add TestIsDirectoryExist and TestUnicodePath in cpp-tests FileUtil test.
2015-07-13 22:44:40 +08:00
CocosRobot
9e60713322
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-13 14:41:58 +00:00
子龙山人
3d06ca297f
Merge pull request #10255 from WenhaiLin/v3-activitylife-fix
...
Fixed game awaked by the clock on Android
2015-07-13 22:34:22 +08:00
子龙山人
cdc7e5205b
Merge pull request #11995 from MAUSMAUSgames/v3
...
using Action::_tag as flag field
2015-07-13 22:19:03 +08:00
子龙山人
22b4f5a11e
Merge pull request #12238 from lite3/patch-3
...
remove old path When added existing new searchPath
2015-07-13 22:16:50 +08:00
子龙山人
d1bef4db8d
Merge pull request #12369 from Dimon4eg/Fix_crash_cocos2d_log
...
Fix crash on Windows if pass string more than 16kb to cocos2d::log
2015-07-13 22:16:04 +08:00
子龙山人
c151ba89e5
Merge pull request #12774 from WenhaiLin/v3-label-createfail
...
Label:Fixed create fail if the font(TTF) not contain a Unicode charmap.
2015-07-13 21:58:39 +08:00
CocosRobot
300da3e3fc
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-13 12:57:03 +00:00
pandamicro
8944e932a1
Merge pull request #12786 from WenhaiLin/v3-animation-getCurrentFrame
...
Add Animate:getCurrentFrameIndex
2015-07-13 20:48:01 +08:00
Neo Kim
9757ee4ea8
Refine scroll event dispatching. And add an event to track every move including jump and so on.
2015-07-13 21:28:17 +09:00
Neo Kim
22ea504af8
Add methods to manipulate scroll bar's opacity
2015-07-13 21:28:16 +09:00
Neo Kim
f558158667
Use addProtectedChild() instead of addChild() in ScrollViewBar
2015-07-13 21:28:16 +09:00
CocosRobot
8b50c307e5
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-13 09:35:35 +00:00
pandamicro
d559971379
Merge pull request #12808 from pandamicro/v3
...
Fix CCSprite ; missing
2015-07-13 17:27:27 +08:00
子龙山人
db71e073dd
Merge pull request #12742 from WenhaiLin/v3-audioengine-preload
...
AudioEngine:support preload for audio
2015-07-13 17:06:17 +08:00
Vincent Yang
e65b01bdc0
Merge pr11866: FileUtilsWin32 correct use all unicode version winapi.
2015-07-13 17:06:01 +08:00
pandamicro
36e1f26570
Fix CCSprite ; missing
2015-07-13 16:44:33 +08:00
WenhaiLin
c95283f563
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-animation-getCurrentFrame
2015-07-13 12:54:02 +08:00
WenhaiLin
80dff7f1c4
Rollback pr12299
2015-07-13 11:32:25 +08:00
pandamicro
89927c7073
Merge pull request #12782 from xiaofeng11/v3.7-release
...
UISliderReader and component update
2015-07-13 11:05:59 +08:00
pandamicro
8ab1dce2a0
Merge pull request #12778 from yangws/issue_9586
...
Fix bug: FileUtils::isDirectoryExist not correct on Android when using relative path in 'assets'
2015-07-13 11:03:24 +08:00
Vincent Yang
8bc68395de
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into issue_9586
2015-07-13 11:00:18 +08:00
WenhaiLin
dee13756ec
Add Animate:getCurrentFrameIndex
2015-07-13 10:40:43 +08:00
pandamicro
c167e249cd
Merge pull request #12790 from pandamicro/shaderNormal
...
Use shader with normal while creating mesh with normals
2015-07-12 21:47:05 +08:00
WenhaiLin
142d354485
[ci skip]Replace tab with spaces.
2015-07-10 21:03:43 +08:00
WenhaiLin
b459940bb8
[ci skip]Replace tab with spaces.
2015-07-10 20:47:21 +08:00
WenhaiLin
c68469a611
Update Nibiru SDK.
2015-07-10 20:42:05 +08:00
CocosRobot
0e8a3f14f0
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-10 09:11:50 +00:00
子龙山人
3adecedcee
Merge pull request #12776 from fusijie/refine_capture
...
CaptureScreen save in thread.
2015-07-10 17:03:18 +08:00
XiaoFeng
92d78efce0
Fix percentage setting won't effect when UISlider's background resource set to null
2015-07-10 17:00:16 +08:00
Vincent Yang
34aa7a0bb1
Remove unused variable.
2015-07-10 16:40:02 +08:00
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