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

20628 Commits

Author SHA1 Message Date
2youyou2 0ce51162af support Label widget 2014-06-19 14:11:37 +08:00
2youyou2 b323f5772e optimize frame 2014-06-18 14:21:33 +08:00
2youyou2 719fdb712d add frame event test 2014-06-18 11:22:38 +08:00
2youyou2 806d74b6f9 add change play section test 2014-06-17 15:57:30 +08:00
2youyou2 c221a59954 fixed frame's value not right when enter frame 2014-06-17 15:57:06 +08:00
2youyou2 d2a6782a9e fixed start frame not right 2014-06-17 11:45:57 +08:00
2youyou2 7ee90b4114 add performance test 2014-06-17 11:13:46 +08:00
2youyou2 02363c2ae4 read visible property 2014-06-16 17:20:59 +08:00
2youyou2 f9a817a2bf read flip property 2014-06-16 15:19:58 +08:00
2youyou2 7bb188f15a fixed not read zorder 2014-06-16 15:03:53 +08:00
2youyou2 fda54a21f1 change test title 2014-06-16 09:45:44 +08:00
2youyou2 c5fe56ef21 update CMakeLists.txt 2014-06-16 09:44:14 +08:00
2youyou2 414aab8553 update CMakeLists.txt 2014-06-16 09:40:27 +08:00
2youyou2 71f74f0825 fixed android compile failed 2014-06-15 13:10:44 +08:00
2youyou2 81574825c0 Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3 2014-06-13 19:53:19 +08:00
2youyou2 d9f34a1412 change texture to textureName 2014-06-13 19:52:53 +08:00
yinkaile b289106eda add cpp to mac project 2014-06-13 19:41:08 +08:00
2youyou2 5bce6b87ea change ActionTimeline to cocostudio ActionTimeline folder 2014-06-13 18:51:32 +08:00
2youyou2 c60e424ef2 Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3 2014-06-13 18:01:17 +08:00
2youyou2 57fe37f9f1 add const word 2014-06-13 18:00:46 +08:00
2youyou2 369ed3e6d3 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-06-13 18:00:01 +08:00
yinkaile f278c49c37 Merge pull request #10 from pipu/v3_kaile 
V3 kaile
 2014-06-13 16:35:39 +08:00
pipu cb213183bc adjust project.pbxproj and files associated with ActionTimeLine 2014-06-13 16:33:07 +08:00
2youyou2 2031e0e92d change TimelineAction to ActionTimeline 2014-06-13 16:03:03 +08:00
minggo 7c789e6a36 Merge pull request #7049 from dabingnn/v3_fixDeleteTexture 
fix bug for deleteTexture
 2014-06-13 15:26:16 +08:00
minggo 405186a415 Merge pull request #7055 from pandamicro/origin_v3 
Fixed #5554: Define __NodeRGBA's constructor as CC_CONSTRUCTOR_ACCESS for JSB usage
 2014-06-13 15:21:20 +08:00
2youyou2 b181eaf802 modify mk file 2014-06-13 14:43:53 +08:00
2youyou2 c37e2a6e4a Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3 2014-06-13 14:41:52 +08:00
2youyou2 1c5d9ba212 remove resource to use armature resource 2014-06-13 14:41:28 +08:00
minggo fbae2e96f1 Merge pull request #7058 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2014-06-13 14:22:56 +08:00
zhangbin 60c08dcb47 Update the reference of submodule cocos2d-console. 2014-06-13 14:15:17 +08:00
yinkaile 3340d48c63 Merge pull request #9 from pipu/v3_kaile 
V3 kaile
 2014-06-13 13:54:19 +08:00
pipu 320f04f79f adjust files associated with TimeLineAction 2014-06-13 13:46:13 +08:00
minggo 19fa4733c5 Merge pull request #7029 from samuele3hu/v3_lua_ui_fix 
Update `LuaStack::executeScriptFile` to support template project loading lua or luac files
 2014-06-13 13:41:52 +08:00
2youyou2 e0f6ae9db4 change TimelineAction to cocos/2d folder 2014-06-13 13:36:01 +08:00
yinkaile 75ff67c0ec Merge pull request #8 from pipu/v3_kaile 
V3 kaile
 2014-06-13 10:52:48 +08:00
pipu 65c2a5e3e1 add parse actionTag in loadWidget method of CCNodeReader 2014-06-13 10:49:57 +08:00
pandamicro 7ccff325b6 Issue #5554: Define __NodeRGBA's constructor as CC_CONSTRUCTOR_ACCESS for JSB usage 2014-06-13 10:29:40 +08:00
2youyou2 f09b1863a9 fixed read sprite 2014-06-12 20:16:39 +08:00
yinkaile 8174481575 Merge pull request #7 from pipu/v3_kaile 
update TimelineAction
 2014-06-12 19:57:55 +08:00
pipu c0170d23c7 fixed warnings 2014-06-12 19:56:15 +08:00
pipu 1cb7dd58ec add CCNodeReader into project 2014-06-12 19:40:58 +08:00
2youyou2 b36741865c add hd resource 2014-06-12 19:38:08 +08:00
2youyou2 f63939945d change NodeCache to NodeReader 2014-06-12 19:34:22 +08:00
2youyou2 b2c5334de1 change NodeCache to NodeReader 2014-06-12 19:24:27 +08:00
2youyou2 eb2e973e07 change read name 2014-06-12 19:12:05 +08:00
2youyou2 ea7e24ba24 add TimelineActionData 2014-06-12 18:50:37 +08:00
minggo 1b24af95f1 [ci skip] 2014-06-12 18:23:31 +08:00
minggo cf7c603d79 Merge pull request #7036 from visiblelight/new_blur_shader 
New shader for the blur effect
 2014-06-12 18:20:38 +08:00
2youyou2 e4f1ac6126 add hd resource 2014-06-12 17:38:26 +08:00