pandamicro
|
67c731f587
|
Merge pull request #12798 from VisualSJ/v3.7-release-backup
[ci skip] update web index
|
2015-07-13 11:18:16 +08:00 |
VisualSj
|
38756fb44b
|
update web index
|
2015-07-13 11:14:06 +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 |
Liam
|
c61e09a9e7
|
update for reader
|
2015-07-13 10:29:22 +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 |
pandamicro
|
600568fdba
|
Migrate test case from #10692 @babcca
|
2015-07-12 11:33:22 +08:00 |
Liam
|
4a53afc798
|
update for error resource,just for build
|
2015-07-10 17:24:35 +08:00 |
子龙山人
|
a4ea35b0c7
|
Merge pull request #12781 from natural-law/v3.7-release
[ci skip] Use msbuild to generating engine prebuilt libs on win32.
|
2015-07-10 17:03:53 +08:00 |
Bin Zhang
|
8ca9e10a22
|
Use msbuild to generating engine prebuilt libs on win32.
|
2015-07-10 17:01:08 +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 |
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
|
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 |
子龙山人
|
0468cf7ba9
|
Merge pull request #12772 from zilongshanren/v3.7-release
[ci skip]fix js template run error on linux.
|
2015-07-10 10:20:31 +08:00 |
andyque
|
1ea7926083
|
fix js template run error on linux.
|
2015-07-10 10:19:36 +08:00 |
yangxiao
|
10fe728eee
|
animation quality default to low, do not interpolation
|
2015-07-09 17:54:21 +08:00 |
Liam
|
e50fc4f184
|
merge code
|
2015-07-09 17:12:48 +08:00 |
folgerhu@sina.com
|
a79586c052
|
CCTMXXMLParser code negligence
|
2015-07-09 17:02:12 +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
|
17ef09551b
|
Merge pull request #12756 from VisualSJ/v3.7-release-update
[ci skip]Fixed a bug that is SingleNode setColor is null
|
2015-07-09 14:55:32 +08:00 |
VisualSj
|
9f52b1e6fb
|
Fixed a bug that is SingleNode setColor is null
|
2015-07-09 11:49:11 +08:00 |
pandamicro
|
893d39c543
|
Merge pull request #12737 from chengstory/FixReaderBug
Fix cocos reader bug.
|
2015-07-09 10:33:45 +08:00 |
Liam
|
c6ebaa19ec
|
add scene 3d test
|
2015-07-09 10:19:07 +08:00 |
pandamicro
|
0c2bb9f691
|
Merge pull request #12745 from CocosRobot/update_lua_bindings_1436403718
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-09 09:27:12 +08:00 |
CocosRobot
|
bfe6db174e
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-09 01:07:59 +00:00 |
pandamicro
|
7f4675b43f
|
Merge pull request #12739 from pandamicro/v3.7-release
Add auto bindings for Frame::g|setTweenType
|
2015-07-09 08:58:07 +08:00 |
pandamicro
|
30c79fea02
|
Add auto bindings for Frame::g|setTweenType
|
2015-07-08 17:19:30 +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 |
yangxiao
|
f7cdd7162b
|
adapter according to latest objloader
|
2015-07-08 15:33:43 +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 |
子龙山人
|
5e8609e5d7
|
Merge pull request #12728 from fusijie/fix_polygonsprite
fix polygon sprite bug.
|
2015-07-08 14:13:32 +08:00 |
yangxiao
|
dac84ade0d
|
index to short
|
2015-07-08 14:03:53 +08: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 |
Jacky
|
06c06a1f03
|
fix polygon sprite bug.
|
2015-07-08 10:07:35 +08:00 |
XiaoFeng
|
8429cc1d90
|
Update CCDrawNode bug test
|
2015-07-08 09:35:29 +08:00 |
XiaoFeng
|
707b4d8b90
|
Fix windows universal project file
|
2015-07-07 19:44:18 +08: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 |
pandamicro
|
f42a76b438
|
Merge pull request #12720 from VisualSJ/v3.7-release-update
[ci skip] Update the web index
|
2015-07-07 15:46:33 +08:00 |
VisualSj
|
3ccfb2f364
|
Update the web index
|
2015-07-07 15:44:42 +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 |
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 |
子龙山人
|
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 |
肖峰
|
37674c3689
|
Add bug test to Mac & iOS cpp-test project
|
2015-07-07 11:17:08 +08:00 |
XiaoFeng
|
a9dfd8012c
|
Add new bug test to Android, Win 10, Win Universal, Linux project file
|
2015-07-07 11:02:00 +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 |
pandamicro
|
e73906a119
|
Merge pull request #12707 from pandamicro/v3.7-release
[ci skip][Simulator JSB] Fix issue caused by video and web view binding
|
2015-07-07 09:48:42 +08:00 |