WenhaiLin
42b24a9c5b
Rename AVAudioPlayer to CCAudioPlayer for avoid conflicting with system framework
2015-09-07 11:12:13 +08:00
Dale Stammen
030157ded0
update libcococs2d name to v3.9 for WinRT platforms
2015-09-04 08:46:08 -07:00
pandamicro
f9c20caa67
Merge pull request #13603 from perminovVS/correct-key-code
...
Desktop and WinRT use correct keyboard codes
2015-09-04 14:39:44 +08:00
pandamicro
ab5b634976
Merge pull request #13625 from frranck/patch-4
...
Update CCImage.cpp
2015-09-03 00:10:16 +08:00
linguofeng
7fc382055b
lua add UPDATE_FAILED ERROR_DECOMPRESS
...
add
cc.EventAssetsManagerEx.EventCode.UPDATE_FAILED
cc.EventAssetsManagerEx.EventCode.ERROR_DECOMPRESS
2015-09-02 11:27:47 +08:00
子龙山人
4530043d9b
Merge pull request #13649 from WenhaiLin/v3-string-empty-check
...
Use string::empty() to check whether string is empty.
2015-09-01 18:04:41 +08:00
WenhaiLin
5fdb041856
Use string::empty() to check whether string is empty.
2015-09-01 11:26:09 +08:00
子龙山人
2e9e660cbb
Merge pull request #13220 from zilongshanren/testEditBoxWin32
...
Improved EditBox implement for platform win32
2015-09-01 10:40:11 +08:00
Jeff Wang
b8105349c7
revert to the original state when user cancel input
2015-09-01 00:06:18 +08:00
WenhaiLin
a3b5becb45
Sync v3.8 to v3
2015-08-31 22:05:37 +08:00
geron-cn
e7c7b248d6
fix bug: bone can be see by other cameras
2015-08-31 16:04:17 +08:00
pandamicro
8f6f5c1191
Update engine versions
2015-08-31 13:52:15 +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
9d72d6a924
Merge pull request #13496 from ZhangMenghe/v3-notification
...
[ci rebuild] Notification effect enhancement
2015-08-28 14:10:42 +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
1264863b2f
Merge pull request #13598 from zilongshanren/fixSliderConstructor
...
fix Slider create missing res type.
2015-08-28 09:28:19 +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
032bc590b7
Merge pull request #13593 from jianglong0156/fixActionParamError
...
fix Action:Place, RotateTo param wrong number error
2015-08-27 17:44:46 +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
子龙山人
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
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
Dale Stammen
161954da87
fixed pdb file output location
2015-08-26 09:41:23 -07:00
Dale Stammen
4cb3d88232
added isWindowsPhone() to correctly detect Windows 10 phone
2015-08-26 09:19:28 -07:00
Dale Stammen
fcae139857
removed old WP8_SHADER_COMPILER defines
2015-08-26 08:50:11 -07:00
WenhaiLin
393af19237
[Node::scheduleOnce]Fixed the callback will be executed multiple times if the value of delay equal zero.
2015-08-26 23:41:48 +08:00
pandamicro
405e6c24c8
Merge pull request #13578 from geron-cn/v3.8
...
bone's color and opacity cannot cascade to bone
2015-08-26 22:33:31 +08:00
pandamicro
8459978dfa
Merge pull request #13572 from zilongshanren/fixIssue13564
...
fix Scale9Sprite draw extra pixels in spritesheet
2015-08-26 21:35:00 +08:00
pandamicro
d49edbb4f5
Merge pull request #13574 from super626/v3.8
...
Skybox brush set depth test function to always
2015-08-26 21:31:19 +08:00
pandamicro
9d1cf6eab3
Merge pull request #13579 from CocosRobot/update_lua_bindings_1440593794
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-26 21:29:56 +08:00
pandamicro
ee5c541cd1
Merge pull request #13573 from songchengjiang/v3.8
...
add annotations
2015-08-26 21:12:43 +08:00
CocosRobot
3d6866279a
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-26 13:01:17 +00:00
pandamicro
8a5fb709ad
Merge pull request #13566 from liamcindy/V3.8
...
update reader with skybox valid
2015-08-26 20:52:05 +08:00
geron-cn
7d01b16f62
bone's color and opacity cannot cascade to bone, also bone can not cascade from its parent.
2015-08-26 20:24:20 +08:00
songchengjiang
f9e9871bcc
supplement annotations
2015-08-26 17:24:36 +08:00
yangxiao
2f72a88a20
depth test always
2015-08-26 16:37:48 +08:00
songchengjiang
2239b624a8
add annotations
2015-08-26 16:19:30 +08:00
andyque
7f73415189
fix Scale9Sprite draw extra pixels in spritesheet
...
Fixed https://github.com/cocos2d/cocos2d-x/issues/13564
2015-08-26 16:15:00 +08:00
Liam
5a997cec1c
update reader with skybox valid
2015-08-26 10:22:20 +08:00
Ricardo Quesada
dfed33f6f2
Adds `PrimitiveCommand` test
2015-08-25 15:07:03 -07:00
andyque
6cea66f932
fixed Scale9Sprite default capInset bug.
...
Fixed https://github.com/cocos2d/cocos2d-x/issues/13560
2015-08-25 23:31:34 +08:00
pandamicro
8165775a3d
Merge pull request #13554 from super626/v3.8
...
disable blend when drawing skybox
2015-08-25 16:50:52 +08:00