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

1297 Commits

Author SHA1 Message Date
Dale Stammen 27f2397142 undefine ABSOLUTE for CC_PLATFORM_WINRT 2015-10-02 18:04:31 -07:00
Martin Taylor 62e36e8006 fix typos and syntax error. A thorough check by tool VSSpellChecker. 2015-09-22 16:08:23 +08:00
geron-cn f93cfac0f7 rename setAnimationEndCallFunc 2015-09-20 16:24:41 +08:00
geron-cn 0cfc33e4d3 format apis added in https://github.com/cocos2d/cocos2d-x/pull/13770 2015-09-20 12:34:34 +08:00
pandamicro 6bf54a3eda Merge pull request #13770 from geron-cn/v3 
add  Frame End Call Back and Animation Clip End Call Back
 2015-09-19 00:24:21 +08:00
WenhaiLin a17a702cd1 Refine components to improve performance 2015-09-18 14:34:02 +08:00
geron-cn e6fb2f8924 fix ReEntry a same frame when scale action's speed. 2015-09-16 15:44:43 +08:00
pandamicro 5e037c9ad8 Merge pull request #13806 from xiaofeng11/v3 
Fix 1.6 version bone animation crash when perform getBoneAtPoint(0,0)
 2015-09-15 14:05:02 +08:00
pandamicro dbe3e062bc Merge pull request #13801 from chengstory/OptimizateDoLayout 
Move "ui::Helper::DoLayout"  to "CreateNode"。
 2015-09-15 13:37:00 +08:00
XiaoFeng 12f0f7f580 Fix 1.6 version bone animation crash when perform getBoneAtPoint(0,0) 2015-09-14 17:36:19 +08:00
zhangcheng 224f392a9c Add createNodeWithVisibleSize to CSLoader. 2015-09-14 16:51:58 +08:00
geron-cn c800d0d824 fix crash recall a cached timeline after exit scene 2015-09-14 14:24:42 +08:00
zhangcheng f88b23f52b Move "ui::Helper::DoLayout" to "CreateNode". 2015-09-14 13:07:15 +08:00
geron-cn 966e568051 add ActionTimeline Frame End Call Back and Animation Clip End Call Back 2015-09-10 18:29:09 +08:00
pandamicro 4fb34ba190 Merge pull request #13703 from cocos2d/v3.8 
Sync v3.8 to v3
 2015-09-07 14:56:37 +08:00
WenhaiLin 5fdb041856 Use string::empty() to check whether string is empty. 2015-09-01 11:26:09 +08:00
子龙山人 59c1b21d0b Merge pull request #13634 from WenhaiLin/v3.8-textreader-refine 
This is a small optimization about TextReader.
 2015-09-01 09:40:52 +08:00
WenhaiLin df383de894 This is a small optimization about TextReader. 2015-08-31 17:06:11 +08:00
geron-cn e7c7b248d6 fix bug: bone can be see by other cameras 2015-08-31 16:04:17 +08:00
Liam ed49250b9b update for reader 
1.update for sprite3d cullface
2.sync js code
 2015-08-27 18:29:45 +08:00
Dale Stammen 161954da87 fixed pdb file output location 2015-08-26 09:41:23 -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
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
Liam 5a997cec1c update reader with skybox valid 2015-08-26 10:22:20 +08:00
Liam c998639c30 update interface for gamenode3d 2015-08-25 15:18:09 +08:00
Liam 650a5c2318 update reader with new skybox 2015-08-25 13:20:19 +08:00
pandamicro 11113c85da Improved logic of skybox reader fix 2015-08-24 10:02:38 +08:00
Liam 110de9ee3e fix skybox crash with error data 2015-08-24 10:02:37 +08:00
Dale Stammen d55bc653e0 update c++ debug info settings 2015-08-20 13:25:17 -07:00
pandamicro 81ca089d27 Merge pull request #13479 from liamcindy/V3.8_reader 
fix object size error while data is error
 2015-08-20 18:09:28 +08:00
Liam 788be3016a update annotation 2015-08-20 18:04:49 +08:00
XiaoFeng 6bdb5431f1 Update code, using condition macro to determine studio or user project 2015-08-20 13:33:48 +08:00
Liam aa6f2ec4b6 fix object size error while data is error 2015-08-20 11:27:01 +08:00
XiaoFeng 93f026f8e6 Fix https://github.com/cocos2d/cocos2d-x/issues/9488 2015-08-20 11:18:59 +08:00
XiaoFeng 935b0f006b Fix https://github.com/cocos2d/cocos2d-x/issues/10205 2015-08-20 10:55:30 +08:00
Dale Stammen 8493365be7 updates to pass Windows App Certification tests 2015-08-18 11:06:47 -07:00
肖峰 0473b08dbb Fix gamenode3d parse failed error 
- Fix the parser issue
- Add GameNode3DReader to win8 universal project
- Add GameNode3d reader to Android & Linux project

Squashed from https://github.com/cocos2d/cocos2d-x/pull/13369
 2015-08-17 22:42:21 +08:00
pandamicro f1cbd00b30 Merge pull request #13414 from liamcindy/V3.8_reader 
fix code informal
 2015-08-17 17:21:01 +08:00
Liam b40ef51337 fix code informal 2015-08-17 17:16:26 +08:00
pandamicro d0580f09e8 Merge pull request #13383 from geron-cn/3.7.1 
add blendfunc cascade to its skin in BoneNode
 2015-08-17 17:12:04 +08:00
pandamicro 096410a31a Merge pull request #13406 from xiaofeng11/v3_reader_update 
Add BlendFrame supporting to Skeleton Animation
 2015-08-17 17:09:25 +08:00
pandamicro 66d99d392c Merge pull request #13409 from liamcindy/V3.8_reader 
fix userCamera flag error with old version files
 2015-08-17 17:01:59 +08:00
XiaoFeng 442669d6f1 Remove unused easing data processing in blend frame parsing 2015-08-17 16:19:29 +08:00
Liam e3ac9414f4 fix userCamera flag error with olg version files 2015-08-17 14:37:28 +08:00
geron-cn 008b06c01c set blendfunc cascade to its skin in BoneNode 2015-08-17 13:44:00 +08:00
XiaoFeng 72d21ff810 Update reader, add BlendFrame supporting to Skeleton Animation 
Update json parser to prepare compatible for both current version output json description file and future optimized version json description file.
 2015-08-17 13:05:29 +08:00
Liam 7aa36d14be fix the skybox display error from editor files 2015-08-17 13:04:25 +08:00
minggo bc964e8314 Merge pull request #13335 from pandamicro/v3 
Upgrade Spine runtime
 2015-08-12 18:46:59 +08:00
pandamicro cb143963ce Upgrade Spine runtime 2015-08-12 18:07:28 +08:00
andyque 82f597ce98 Merge branch 'v3.7.1' into v3 
# Conflicts:
#	cocos/scripting/lua-bindings/auto/api/CheckBox.lua
#	cocos/ui/UICheckBox.cpp
#	cocos/ui/UICheckBox.h
 2015-08-12 17:59:50 +08:00