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

21726 Commits

Author SHA1 Message Date
lvlong 32cc5b12d6 ready 2014-06-16 19:30:45 +08:00
yangxiao 36808abb72 simplify shader 2014-06-16 19:23:51 +08:00
yangxiao 531f8998a1 skincache 2014-06-16 19:17:07 +08:00
lvlong 4b7f6a6185 static Sprite3D is ok 2014-06-16 19:08:43 +08:00
yangxiao 2c6f7b63d1 avoid reopen file 2014-06-16 18:46:58 +08:00
yangxiao 0c07b05e1d remove unused code 2014-06-16 18:36:30 +08:00
bofeng-song 5e03cab7cc Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3 2014-06-16 18:31:43 +08:00
yangxiao c00cdd0ae3 use bone dirtyflag 2014-06-16 18:22:32 +08:00
yangxiao 927d29f334 bug on Repeat when diff bigger than duration 2014-06-16 18:21:47 +08:00
cocoscodeide b00e7a3b86 Merge pull request #36 from cocos2d/v3 
merge from cocos2d-x
 2014-06-16 17:50:28 +08:00
2youyou2 02363c2ae4 read visible property 2014-06-16 17:20:59 +08:00
yangxiao bc31d6b082 merge lv 2014-06-16 16:45:43 +08:00
lvlong 920b358764 new girl.c3t 2014-06-16 16:23:24 +08:00
yangxiao 58a6adca02 construct BoneBlendState 2014-06-16 15:45:58 +08:00
lvlong a4ee8b8dc2 Merge branch 'lv' of https://github.com/super626/cocos2d-x into v3 2014-06-16 15:39:05 +08:00
lvlong 2282c98f2e do some test 2014-06-16 15:38:03 +08:00
Huabing.Xu a0ba6775c6 adjust animation logic 2014-06-16 15:22:00 +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
bofeng-song 64f517a1b8 redirect function: setSearchPaths 2014-06-16 14:47:14 +08:00
minggo c4d4d6b34e Merge pull request #7075 from CocosRobot/update_lua_bindings_1402886913 
[AUTO]: updating luabinding automatically
 2014-06-16 14:12:53 +08:00
lvlong 2840409933 for tony test 2014-06-16 14:09:41 +08:00
pandamicro d00c9fe70a Fixed #5563: Add sendNodeEventToJSExtended function to fix issues and remove lua event send (unnecessary) 2014-06-16 12:50:35 +08:00
CocosRobot 30c91729eb [AUTO]: updating luabinding automatically 2014-06-16 02:49:38 +00:00
minggo ed40e48607 [ci skip] 2014-06-16 10:46:16 +08:00
minggo 111e08062f Merge pull request #7056 from visiblelight/render_texture 
Use RGBA when saving a file from render texture
 2014-06-16 10:44:30 +08:00
bofeng-song b3fe030b90 Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3 2014-06-16 10:07:24 +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
lvlong 0fa4e921f0 delete girl - 副本.c3t 2014-06-16 09:25:12 +08:00
yangxiao 79d2de3b67 make character up 2014-06-16 00:31:31 +08:00
yangxiao 7b621c5c93 aa 2014-06-16 00:26:31 +08:00
yangxiao dd8f66ce57 merge loader 2014-06-16 00:01:38 +08:00
yangxiao 9dd7241176 load c3t animation work 90% 2014-06-15 22:45:56 +08:00
minggo 6c6d07cb67 [ci skip] 2014-06-15 17:31:51 +08:00
andyque 1d01fe8bbc refactor 2014-06-15 16:12:24 +08:00
kyokomi 7d710f6aed Fix UIButton.cpp added TTFFont. 2014-06-15 16:58:05 +09:00
2youyou2 71f74f0825 fixed android compile failed 2014-06-15 13:10:44 +08:00
kyokomi d7199204bd Fix bug for TextReader #setFontName. 2014-06-14 23:56:12 +09: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
lvlong 4ae01d148f 11 2014-06-13 19:26:46 +08:00
yangxiao ff6ef1140d two animate3d the same time 2014-06-13 19:20:19 +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
pandamicro d524ba1013 Fixed #5563: Wrap override onEnter function by script call detection code to solve bugs in JSB 2014-06-13 17:59:23 +08:00