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

701 Commits

Author SHA1 Message Date
andyque d4122d616a fix text reader binray version setFontName 2014-07-11 13:58:08 +08:00
andyque 43255e2b96 Merge branch 'v3' into addStudio1.4 
Conflicts:
	cocos/editor-support/cocostudio/WidgetReader/TextReader/TextReader.cpp
 2014-07-11 13:55:13 +08:00
minggo d1d84e0d1f Merge pull request #7386 from chengstory/v3_fixesLoaddTTFError 
1. fixes TextReader load default font error.
 2014-07-11 13:40:16 +08:00
andyque 646f7c7e3f Merge branch 'v3' into addStudio1.4 2014-07-11 13:39:34 +08:00
minggo 4895e6d54a Merge pull request #7362 from geron-cn/chukongv3 
Chukongv3
 2014-07-10 21:17:19 +08:00
zhangcheng a0ecae21c3 1. fixes TextReader load default font error. 2014-07-10 19:29:39 +08:00
geron-cn 1c4cb78745 deal with null in string 2014-07-10 18:24:11 +08:00
kaile.yin 04c63cc370 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-07-10 17:51:02 +08:00
kaile.yin 42f2302866 fixed call Bone::setRotation has no effect 2014-07-10 17:50:38 +08:00
andyque f76f71eb5d fix win32 & win8 compile error 2014-07-10 16:37:15 +08:00
andyque 41ccd5e465 add v1.4 tests 2014-07-10 16:37:15 +08:00
Dhilan007 6cff8cb564 fixed warn and replace NULL with nullptr. 2014-07-10 00:45:27 +08:00
minggo 7d74be3158 Merge pull request #7356 from 2youyouo2/v3 
fixed Armature blend func effect
 2014-07-09 18:37:15 +08:00
kaile.yin c53cb42e83 fixed Armature blend func effect 2014-07-09 14:25:51 +08:00
zhangcheng af0613cf32 1、fixes warning. 2014-07-09 00:09:35 +08:00
kaile.yin f01b249880 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-07-08 10:21:00 +08:00
kaile.yin d5a79f17ab fixed set color to parent, it will effect its children 2014-07-08 10:13:15 +08:00
Dale Stammen fa62f4273f fixed missing zlib.h header path 2014-07-07 10:14:57 -07:00
andyque 037a7dc882 fix TextReader TTF font Reader issue 2014-07-07 15:22:14 +08:00
andyque 0483c64286 fix widget ignoreContentSize issue 2014-07-07 15:21:14 +08:00
minggo a942aae84f Merge pull request #7316 from cocoscodeide/v3 
lua runtime template 1.2
 2014-07-04 18:33:36 +08:00
chuanweizhang2013 39b03de8a9 revert Android.mk 2014-07-04 15:39:07 +08:00
andyque c8165bb2d9 fix indent problems 2014-07-04 11:53:06 +08:00
andyque a429182765 fix windows compile and running error 2014-07-04 11:22:36 +08:00
minggo eb97b9ad45 Merge pull request #7305 from andyque/fixLayoutReader 
fix layout background image default color & opacity
 2014-07-03 17:16:56 +08:00
andyque f82e96daf0 fix layout background image default color & opacity 2014-07-03 16:56:05 +08:00
minggo 0be6d27271 Merge pull request #7295 from minggo/support-regular-expression 
Support regular expression
 2014-07-03 15:20:06 +08:00
andyque 32724e559d fix container default color issue 2014-07-03 14:38:45 +08:00
minggo fffdfb3711 Merge pull request #7290 from chengstory/v3_OpBinaryParse 
V3 op binary parse
 2014-07-03 14:00:01 +08:00
minggo 2cfea323b0 Merge pull request #7300 from 2youyouo2/v3 
fixed add relative data bug
 2014-07-03 13:56:04 +08:00
minggo 6cc600ccce fix compiling warnings 2014-07-03 11:43:56 +08:00
zhangcheng d1db470cf2 Merge branch 'macLoader' into v3_OpBinaryParse 2014-07-02 16:11:02 +08:00
zhangcheng 2b1ef55ea9 1. fixes scene parse crash. 2014-07-02 15:58:42 +08:00
zhangcheng 9204ac28df 1. merge v3 2014-07-02 15:37:15 +08:00
zhangcheng cf9b049926 1. fixes same name warning. 2014-07-02 10:53:35 +08:00
minggo 5b282e338f Merge pull request #7279 from andyque/fixTextReader 
fix Text reader font name
 2014-07-02 10:04:00 +08:00
andyque fb3e499d9d fix Text reader font name 2014-07-02 10:08:04 +08:00
minggo d9a1f76755 fix effect of spine 2014-07-02 09:58:07 +08:00
andyque 7d2685ba02 fix content Size 2014-07-01 21:02:37 +08:00
geron-cn 17c320f1e2 fix 2014-07-01 19:06:51 +08:00
geron-cn c561f4e2f4 fix win can not compile 2014-07-01 18:55:09 +08:00
zhangcheng 02c7c93e43 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into OpBinaryParse 2014-07-01 16:36:37 +08:00
zhangcheng 4b8f818a1d 1、Update binary parse lib. 2014-07-01 16:31:17 +08:00
geron-cn dfdc4f6b66 fix bug: did not addarmature to the relativedata 2014-07-01 16:24:59 +08:00
andyque fefdc70af9 add default value to widget reader 2014-07-01 14:01:27 +08:00
minggo 80204e3048 Merge pull request #7201 from chengstory/cleanupBinaryLoader_AddSceneBinaryParse 
Cleanup binary loader add scene binary parse
 2014-07-01 13:47:35 +08:00
andyque b9a968680f add default value to widgets reader 2014-07-01 10:57:12 +08:00
andyque 4e63a3da7d modify nodeReader to support LabelAtlas and LabelBMFont 2014-07-01 10:11:36 +08:00
minggo 40e88ab6eb Merge pull request #7251 from 2youyouo2/v3_current_frame_index 
add gotoFrameAndPlay and setCurrentFrame interface
 2014-06-30 17:32:24 +08:00
zhangcheng a3fcddde39 1. NULL->nullptr. 
2. bRet->ret.
 2014-06-30 17:15:55 +08:00