Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
32,204 Commits 2 Branches 33 Tags 1.2 GiB
Commit Graph

32204 Commits

Author SHA1 Message Date
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
子龙山人 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 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
Vladimir Perminov 104013aebe commit v3.8 overwrite this unused code 
From commit #13397
 2015-08-27 23:19:30 +03: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
pandamicro fcdfd16a7f Merge pull request #13589 from pandamicro/v3 
Sync v3.8 to v3
 2015-08-27 13:33:16 +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
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
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 37bfe85c7e Merge pull request #13567 from VisualSJ/v3.8-p-22354 
Add BlendFuncFrame auto binding
 2015-08-26 20:53:49 +08: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
pandamicro 2a41367a02 Merge pull request #13569 from jianglong0156/addClearScriptManifest 
add scriptTest project manifest
 2015-08-26 14:58:57 +08:00
江龙 7ce5542ffc add scriptTest project manifest 2015-08-26 14:50:34 +08:00
VisualSj 71f4b804ea Add BlendFuncFrame auto binding 2015-08-26 13:42:52 +08:00
Liam 5a997cec1c update reader with skybox valid 2015-08-26 10:22:20 +08:00
子龙山人 7c091b7529 Merge pull request #13563 from zilongshanren/fixUIScale9PathchIssue 
fixed Scale9Sprite default capInset bug.
 2015-08-26 07:19:29 +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 b6de58c21c Merge pull request #13558 from WenhaiLin/v3.8-testcase-refine2 
[cpp-tests]Refine test cases about label
 2015-08-25 18:30:44 +08:00
pandamicro 44c1624fe7 Merge pull request #13559 from pandamicro/release 
[ci skip]Add release note for v3.8
 2015-08-25 18:29:43 +08:00
pandamicro 634bf0dd3a Update web engine 2015-08-25 18:28:48 +08:00
pandamicro 4a3ace6ff5 Add release note for v3.8 2015-08-25 18:24:31 +08:00
WenhaiLin d6ed3b417c [cpp-tests]Refine test cases about label 2015-08-25 17:50:47 +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
子龙山人 734388d2bd Merge pull request #13556 from zilongshanren/fix-listview-intial-position 
fix ListView innerContainer initial position error
 2015-08-25 16:50:02 +08:00
pandamicro 68444bc3b1 Merge pull request #13553 from liamcindy/V3.8 
update reader with new skybox
 2015-08-25 16:34:28 +08:00
子龙山人 f09f3e11da Merge pull request #13555 from fusijie/fix_spriteblur_crash_foreground 
Fixed spriteblur crash foreground.
 2015-08-25 16:06:13 +08:00
Liam c998639c30 update interface for gamenode3d 2015-08-25 15:18:09 +08:00
andyque 65b78d4a49 fix ListView innerContainer initial position error 2015-08-25 15:15:18 +08:00
fusijie 19901c43ea fix spriteblur crash foreground. 2015-08-25 14:39:17 +08:00
yangxiao 7884138dcc disable blend when drawing skybox 2015-08-25 14:32:25 +08:00