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 |
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 |
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 |
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 |
CocosRobot
|
bfe6db174e
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-09 01:07:59 +00: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 |
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
|
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
|
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 |
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 |
VisualSj
|
3b69a1726f
|
Fixed a bug that action texture address error
|
2015-07-06 17:17:20 +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 |
Liam
|
51993d5733
|
update for reader
|
2015-07-06 16:14:41 +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 |
Liam
|
fff4e2f34c
|
update for reader
|
2015-07-06 14:05:06 +08: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 |
Liam
|
64b8660873
|
update for skybox reader
|
2015-07-03 17:52:42 +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
|
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 |
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 |
Sijie.Wang
|
7818bfcc7a
|
Fixed a bug that is don't analytical frame
|
2015-07-02 14:30:44 +08: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 |
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 |
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 |
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 |
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 |
Bin Zhang
|
d0db3aee98
|
Remove the plugin-x related files from the Xcode project of js-bindings .
|
2015-06-30 17:28:47 +08:00 |
Bin Zhang
|
bb77101f0b
|
Solve the error when building simulator for android.
|
2015-06-30 16:45:13 +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 |
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 |
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 |
yangxiao
|
63f948c822
|
modify skybox to projection space
|
2015-06-25 15:01:39 +08:00 |
pandamicro
|
ac3f2f235b
|
Merge pull request #12523 from andyque/fix-linux-audio-engine-crash
add guard to audio engine pointer
|
2015-06-25 11:48:23 +08:00 |
子龙山人
|
f545794b56
|
Merge pull request #12525 from WenhaiLin/v3-37-warnfix
[ci skip]Fixed warns
|
2015-06-25 11:02:02 +08:00 |
WenhaiLin
|
3cb29bbc65
|
[ci skip]Fixed warns
|
2015-06-25 10:53:41 +08:00 |
andyque
|
2bb7b96839
|
add guard to audio engine pointer
|
2015-06-25 10:17:31 +08:00 |
anniruddh
|
e89a6c1651
|
fixed issue #160
|
2015-06-24 17:50:11 -07:00 |
pandamicro
|
19c57daf92
|
Merge pull request #12511 from samuele3hu/v3_7_test
Fix crash of the some Texture2D test case about s3tc on the nexus9(android 5.0.1)
|
2015-06-24 21:46:38 +08:00 |
pandamicro
|
f9db471026
|
Merge pull request #12495 from super626/v3
Fix terrain getIntersectionPoint
|
2015-06-24 18:36:52 +08:00 |
samuele3hu
|
63eb0d34f3
|
Fix crash of the some Texture2D test case about s3tc on the nexus9(android 5.0.1)
|
2015-06-24 16:11:36 +08:00 |
pandamicro
|
49e783820e
|
Merge pull request #12507 from dabingnn/v3_fixClearColor
fix clearcolor bug which has no effect
|
2015-06-24 15:58:53 +08:00 |
yangxiao
|
77f1af91f9
|
opt getIntersectionPoint
|
2015-06-24 15:49:09 +08:00 |
yangxiao
|
086b01321c
|
code simplify
|
2015-06-24 14:10:38 +08:00 |
Huabing.Xu
|
ecfe35489c
|
fix clearcolor bug which has no effect
|
2015-06-24 11:40:23 +08:00 |
yangxiao
|
7546bfe9af
|
make getChunkByIndex protected
|
2015-06-24 10:56:46 +08:00 |
yangxiao
|
d1baacdf8a
|
fix terrain ray trace
|
2015-06-24 10:49:18 +08:00 |
pandamicro
|
04af5dfbe3
|
#12494 Upgrade platform constants for WP8 & WINRT
|
2015-06-23 23:23:25 +08:00 |
pandamicro
|
e574c38a6b
|
Merge pull request #12496 from WenhaiLin/v3-tagetplatform-fix
Fixed cannot differentiate between Windows Phone Application and Windows Store Application by `Application::getTargetPlatform`
|
2015-06-23 22:26:54 +08:00 |
pandamicro
|
72fde7efb8
|
Merge pull request #12500 from jianglong0156/webviewHide
fix the bug:webview can not display
|
2015-06-23 21:11:33 +08:00 |
pandamicro
|
cc00cbedbe
|
Merge pull request #12482 from yangws/fixbug_20214
fixbug: cpp-test -> NewRenderer (drag the layer to test the result of…
|
2015-06-23 21:09:59 +08:00 |
江龙
|
7ff383e4d2
|
add the return value
|
2015-06-23 20:27:30 +08:00 |
pandamicro
|
29840df88e
|
Fix indent of Audio.cpp
|
2015-06-23 20:08:00 +08:00 |
pandamicro
|
1d4a496aaa
|
Merge pull request #12472 from MSOpenTech/v3-winrt-audio
V3: WinRT Fix for issue 12448 cpp-tests[ win8.1-universal--window 8.1]:Audio - CocosDenshion:Crash
|
2015-06-23 20:01:18 +08:00 |
pandamicro
|
32accbf21b
|
Merge pull request #12488 from WenhaiLin/v3-37-androidApplicationFix
Fixed Application may be created more than once on Android.
|
2015-06-23 19:43:39 +08:00 |
WenhaiLin
|
ed029d264f
|
Fixed cannot differentiate between Windows Phone Application and Windows Store Application by `Application::getTargetPlatform`
|
2015-06-23 18:40:39 +08:00 |
yangxiao
|
bfdb06e31b
|
add empty line
|
2015-06-23 18:31:20 +08:00 |
yangxiao
|
c3593c9d64
|
merge cocos
|
2015-06-23 18:29:39 +08:00 |
pandamicro
|
60372056ce
|
Merge pull request #12484 from andyque/fix-nine-patch-image-error
fix nine patch image parser error on Windows.
|
2015-06-23 18:26:16 +08:00 |
yangxiao
|
251c81d7be
|
Merge branch 'newcode' into v3
|
2015-06-23 18:25:41 +08:00 |
pandamicro
|
2a0c2b6e32
|
Merge pull request #12250 from hawkwood/patch-10
Fails if file does not exist
|
2015-06-23 17:32:47 +08:00 |
WenhaiLin
|
f95245312a
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-37alpha0
|
2015-06-23 17:08:25 +08:00 |
pandamicro
|
4c7f33e66f
|
Merge pull request #12481 from jianglong0156/restartGameBug
fix Restart game bug
|
2015-06-23 17:02:09 +08:00 |
WenhaiLin
|
cbb073e905
|
Fixed Application may be created more than once on Android.
|
2015-06-23 16:58:38 +08:00 |
XiaoYang
|
59e6b6fdc2
|
Merge pull request #352 from tangziwen/v3
Using ray-triangle intersect test instead of the newton method
|
2015-06-23 16:30:18 +08:00 |
pandamicro
|
ac138a3287
|
Merge pull request #12474 from xiaofeng11/v3_xiaofeng
Update 3d reader for compatible with cocosstudio 3.1.2 version csd file
|
2015-06-23 16:27:32 +08:00 |
XiaoFeng
|
befe97a78b
|
Update js parser for compatible with CocosStudio 2.3.2 json format export
|
2015-06-23 16:24:53 +08:00 |
tangziwen
|
5b857f7d66
|
fix some bug
|
2015-06-23 16:11:00 +08:00 |
andyque
|
7fff2bd3c4
|
fix nine patch image parser error on Windows.
|
2015-06-23 15:42:58 +08:00 |
子龙山人
|
fca9b89a4c
|
Merge pull request #12480 from andyque/fix-rapidjson-assert-error
fix rapidjson assert error
|
2015-06-23 15:34:47 +08:00 |
pandamicro
|
f617d6f1aa
|
Merge pull request #12478 from WenhaiLin/v3-37-label-sfFix
Label:Fixed IllegalArgumentException on Android 2.3.x
|
2015-06-23 15:27:43 +08:00 |
Vincent Yang
|
4b768c5fd8
|
fixbug: cpp-test -> NewRenderer (drag the layer to test the result of culling), some object will be culling before out of screen.
|
2015-06-23 15:22:27 +08:00 |
jianglong0156
|
90f9bf37cd
|
fix redmine issue #20277 RestartGameTest only used in native will crash
|
2015-06-23 14:41:41 +08:00 |
tangziwen
|
1e016dc6d8
|
Always get the minimum distance intersect point.
|
2015-06-23 14:41:20 +08:00 |
tangziwen
|
f71ca4f179
|
Using ray-triangle intersect test instead of the newton method
|
2015-06-23 14:27:19 +08:00 |
andyque
|
70b709f4a8
|
fix rapidjson assert error
|
2015-06-23 13:54:11 +08:00 |
WenhaiLin
|
79aa300448
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-37alpha0
|
2015-06-23 13:42:32 +08:00 |
WenhaiLin
|
b275ce2283
|
Label:Fixed IllegalArgumentException on Android 2.3.x
|
2015-06-23 13:38:06 +08:00 |
pandamicro
|
9445aeacb7
|
Merge pull request #12456 from super626/camera
quaternion instead of euler angle
|
2015-06-23 13:16:39 +08:00 |
XiaoFeng
|
375e80bd70
|
Update 3d reader for compatible with cocosstudio 3.1.2 version csd file
Update easing default speed
|
2015-06-23 11:31:16 +08:00 |
子龙山人
|
6bd61a3a5f
|
Merge pull request #12469 from WenhaiLin/v3-37-label-lineheightfix
Label should be invisible when the line height is set to zero.
|
2015-06-23 11:02:48 +08:00 |
WenhaiLin
|
fbe1bd8253
|
Label should be invisible when the line height is set to zero.
|
2015-06-23 09:42:48 +08:00 |
Anniruddh
|
4a15d57093
|
Fixed issue #168
|
2015-06-20 00:20:15 -07:00 |
yangxiao
|
d252250968
|
quaternion instead of euler angle
|
2015-06-19 18:46:14 +08:00 |
andyque
|
55b86b2e14
|
add more docs for samsung enhanced API
|
2015-06-19 18:09:42 +08:00 |
子龙山人
|
8ca0f18575
|
Merge pull request #12446 from pandamicro/v3
Add auto bindings for navmesh
|
2015-06-19 17:21:00 +08:00 |
子龙山人
|
869e3c5243
|
Merge pull request #12444 from WenhaiLin/v3-37-label-linewrapfix
Label:Fixed line wrap error without space.
|
2015-06-19 15:08:13 +08:00 |
pandamicro
|
7b1694bfeb
|
Merge pull request #12443 from VisualSJ/v3-aa
[ci skip]Studio parser: Code for defense
|
2015-06-19 14:24:39 +08:00 |
WenhaiLin
|
d32a317ea0
|
Label:Fixed line wrap error without space.
|
2015-06-19 13:39:19 +08:00 |
VisualSJ
|
8fa755d0e4
|
Studio parser: Code for defense
|
2015-06-19 13:15:10 +08:00 |
VisualSJ
|
ea0ab5c738
|
Studio parser: Code for defense
|
2015-06-19 11:13:07 +08:00 |
pandamicro
|
8e9fed936c
|
Add auto bindings
|
2015-06-19 10:36:36 +08:00 |
pandamicro
|
276ce3a0a7
|
Update versions
|
2015-06-19 09:56:19 +08:00 |
pandamicro
|
c6d4f283bb
|
Fix compilation issue in navmesh conversion
|
2015-06-19 08:11:45 +08:00 |
pandamicro
|
f405d00336
|
Fix linux compilation
|
2015-06-19 01:14:16 +08:00 |
江龙
|
91bc19fb29
|
Merge branch 'v3_origin' into navmesh
Conflicts:
tests/js-tests/src/Physics3DTest/Physics3DTest.js
|
2015-06-18 23:50:19 +08:00 |
江龙
|
8fc5835dee
|
modify linux file
|
2015-06-18 23:29:04 +08:00 |
江龙
|
61db9ef103
|
modify cocos2d_specifics , add navmesh head file。 modify template。add navmesh head file and register code
|
2015-06-18 23:21:53 +08:00 |
江龙
|
8c97fec5af
|
add navmesh project file path
|
2015-06-18 23:17:49 +08:00 |
jianglong0156
|
618d8f01e8
|
Merge pull request #9 from pandamicro/navmesh
Improve bindings for navmesh
|
2015-06-18 23:15:05 +08:00 |
pandamicro
|
b757837239
|
Move NavMesh to jsb namespace
|
2015-06-18 22:57:41 +08:00 |