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

22357 Commits

Author SHA1 Message Date
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
yinkaile f278c49c37 Merge pull request #10 from pipu/v3_kaile 
V3 kaile
 2014-06-13 16:35:39 +08:00
bofeng-song bca578c2f8 fix can`t debug vs project normally 2014-06-13 16:34: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
vision 0b8e6a6a83 The filename should be converted to lower case before comparing. 2014-06-13 15:32:49 +08:00
vision 33fb1dd050 Make the API more extendable 2014-06-13 15:27:59 +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
samuele3hu 9b3b6c0e53 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_keypad_fix 2014-06-13 14:39:11 +08:00
elsanide 4b7b32e81e BUG FIX : #5553 
Texture2dTest.cpp typo in #ifdef
Notice the W in CC_PLATFORM_WINRT is missing.
 2014-06-13 15:24:37 +09: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
cocoscodeide 2d4297d14e Merge pull request #34 from cocos2d/v3 
merge from cocos2d-x
 2014-06-13 14:14:25 +08:00
samuele3hu 5b6330d59b Add more conversion functions and manual binding functions 2014-06-13 14:10:08 +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