WenhaiLin
a3b5becb45
Sync v3.8 to v3
2015-08-31 22:05:37 +08:00
andyque
367a105a48
refactor EditBox iOS&Android implementation
...
Fixed issue: https://github.com/cocos2d/cocos2d-x/issues/13616#issuecomment-135742727
2015-08-31 18:36:27 +08:00
yangxiao
030ab8858d
enable depth write for transparent object
2015-08-31 18:34:09 +08:00
XiaoFeng
4cd3683e5b
Use solution path as root path
2015-08-31 18:14:38 +08:00
zhangbin
013ed60c15
Add node children tests.
2015-08-31 17:40:26 +08:00
pandamicro
0c94e48248
Merge pull request #13631 from geron-cn/v3.8
...
fix bug: bone can be see by other cameras
2015-08-31 17:36:17 +08:00
WenhaiLin
df383de894
This is a small optimization about TextReader.
2015-08-31 17:06:11 +08:00
zhangbin
46427bec59
Write the test data with json format.
2015-08-31 16:57:46 +08:00
XiaoFeng
be2be30162
Fix missing config.json notice when simulator start to run a cocostudio project
2015-08-31 16:16:10 +08:00
geron-cn
e7c7b248d6
fix bug: bone can be see by other cameras
2015-08-31 16:04:17 +08:00
zhangbin
351dee8c22
Optimize the implementation of Alloc Test.
2015-08-31 15:08:36 +08:00
pandamicro
4ad78778a8
Merge pull request #13630 from pandamicro/release-note
...
[ci skip]Update engine versions
2015-08-31 13:53:02 +08:00
pandamicro
8f6f5c1191
Update engine versions
2015-08-31 13:52:15 +08:00
pandamicro
d174a2a60e
Merge pull request #13619 from super626/v3.8
...
fix render state
2015-08-31 13:39:05 +08:00
pandamicro
c1da4eb893
Merge pull request #13629 from natural-law/v3.8
...
Update the reference of submodule cocos2d-console.
2015-08-31 13:37:50 +08:00
zhangbin
2520e16cc0
Update the reference of submodule cocos2d-console.
2015-08-31 12:04:18 +08:00
zhangbin
0e0213b121
Add logic for auto test the test cases.
2015-08-31 11:42:48 +08:00
frranck
8e195723e6
Update CCImage.cpp
...
When you're creating a sprite (e.g. with Sprite* Sprite::create(filename))
There's no way to test the file before, without getting "a unsupport image format!" thrown.
2015-08-30 09:40:15 +02:00
yangxiao
bc07d7954a
fix render state
2015-08-28 23:00:45 +08:00
pandamicro
28fcc4bceb
Merge pull request #13614 from perminovVS/update-authors-v3.8
...
Correct contribution in v3.8
2015-08-28 17:19:10 +08:00
Vladimir Perminov
8a1b74125b
Correct contribution in v3.8
2015-08-28 11:35:29 +03:00
zhangbin
00f2e99b2c
Add performance tests project for iOS & Mac.
2015-08-28 14:54:12 +08:00
子龙山人
20d7abe6f3
Merge pull request #13612 from zilongshanren/improve-github-issue
...
[ci skip]rename contribute.md to contributing.md
2015-08-28 14:12:37 +08:00
pandamicro
9d72d6a924
Merge pull request #13496 from ZhangMenghe/v3-notification
...
[ci rebuild] Notification effect enhancement
2015-08-28 14:10:42 +08:00
andyque
6a7922caf1
rename contribute.md to contributing.md
2015-08-28 14:10:41 +08:00
pandamicro
3dcdf791c9
Merge pull request #13608 from super626/v3.8
...
Skybox: enable depth write
2015-08-28 13:33:19 +08:00
pandamicro
07a6557a07
Merge pull request #13607 from VisualSJ/v3.8-index
...
[ci skip][js-tests] Update Socket.io test
2015-08-28 11:52:29 +08:00
VisualSj
2d77609fb7
Update socket@1.3.6 and web index
2015-08-28 11:48:58 +08:00
yangxiao
6fa6f1f0da
enable depth write
2015-08-28 11:46:11 +08:00
子龙山人
4fe9517ec7
Merge pull request #13592 from neokim/fix_13591
...
Fix #13591
2015-08-28 10:19:20 +08:00
pandamicro
d23d9677a1
Merge pull request #13602 from perminovVS/v3.8-overwrite-wint-unused-code
...
commit v3.8 overwrite this unused code
2015-08-28 09:36:03 +08:00
pandamicro
1264863b2f
Merge pull request #13598 from zilongshanren/fixSliderConstructor
...
fix Slider create missing res type.
2015-08-28 09:28:19 +08:00
pandamicro
fd68669a15
Merge pull request #13596 from liamcindy/v3.8_reader
...
update for reader
2015-08-28 09:24:25 +08:00
Liam
69da65d7a4
update for jsb_opengl_constants
2015-08-28 08:42:55 +08:00
Vladimir Perminov
b5688f504c
Desktop and WinRT use correct keyboard codes
...
Desktop:
GLFW_KEY_ENTER equals KEY_ENTER ( GLFW_KEY_KP_ENTER = KEY_KP_ENTER)
WinRT:
VK_PRIOR equals KEY_PG_UP ( not KEY_KP_PG_UP )
2015-08-27 23:46:24 +03:00
Vladimir Perminov
104013aebe
commit v3.8 overwrite this unused code
...
From commit #13397
2015-08-27 23:19:30 +03:00
andyque
40492e6169
fix Slider create missing res type.
...
fixed https://github.com/cocos2d/cocos2d-x/issues/13575
2015-08-27 23:34:39 +08:00
Liam
ed49250b9b
update for reader
...
1.update for sprite3d cullface
2.sync js code
2015-08-27 18:29:45 +08:00
pandamicro
18beea11ff
Merge pull request #13594 from VisualSJ/v3.8-index
...
[ci skip] Update web index
2015-08-27 17:48:15 +08:00
pandamicro
032bc590b7
Merge pull request #13593 from jianglong0156/fixActionParamError
...
fix Action:Place, RotateTo param wrong number error
2015-08-27 17:44:46 +08:00
VisualSj
b02e110529
Update web index
2015-08-27 17:39:41 +08:00
江龙
a060a82d88
fix Action:Place, RotateTo param wrong number error
2015-08-27 17:35:09 +08:00
Neo Kim
30d52d1394
Fix #13591
2015-08-27 17:12:07 +09:00
pandamicro
fcdfd16a7f
Merge pull request #13589 from pandamicro/v3
...
Sync v3.8 to v3
2015-08-27 13:33:16 +08:00
子龙山人
30d6c82da6
Merge pull request #13585 from WenhaiLin/v3.8-scheduleOnce-hotfix
...
[Node::scheduleOnce]Fixed the callback will be executed multiple times if the value of delay parameter equal zero.
2015-08-27 10:54:04 +08:00
pandamicro
d6045fdbea
Merge branch 'v3.8' of github.com:cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/audio/winrt/Audio.cpp
cocos/platform/winrt/CCCommon.cpp
cocos/platform/winrt/CCWinRTUtils.cpp
cocos/platform/winrt/CCWinRTUtils.h
2015-08-27 10:40:04 +08:00
pandamicro
b9de49dace
Merge pull request #13586 from MSOpenTech/v3.8-win10
...
V3.8: Win10 UWP platform fixes
2015-08-27 09:28:59 +08:00
Ricardo Quesada
d7eb7fd6b2
Merge pull request #13565 from ricardoquesada/primitive_command_test
...
Adds `PrimitiveCommand` test
2015-08-26 11:08:54 -07:00
Ricardo Quesada
d5d1be93cc
make it compile on win32
2015-08-26 10:16:50 -07:00
Dale Stammen
09a1211c96
use isWindowsPhone() to check for Windows Phone platform
2015-08-26 09:47:59 -07:00