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

22866 Commits

Author SHA1 Message Date
samuele3hu 47c034af5d Rename experimentalConstants.lua to experimentalUIConstantslua and modify related project configure 2014-08-11 10:25:40 +08:00
minggo d413acc1b7 Merge pull request #7721 from heliclei/libsize-tracking 
[ci skip][jenkins]Add script to track android built libs size
 2014-08-11 10:16:34 +08:00
minggo 63ec1f894b [ci skip] 2014-08-11 09:50:46 +08:00
minggo 437257e7e6 Merge pull request #7683 from andyque/fixWidgetDefaultCascadColorAndOpacity 
Let Widget class don't support cascaded opacity and cascaded color on default.
 2014-08-11 09:37:51 +08:00
minggo afe41bcf44 Merge pull request #7727 from CocosRobot/update_cocosfiles_1407720774 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-08-11 09:36:06 +08:00
CocosRobot 076a2f9d1a [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-11 01:32:55 +00:00
minggo 3222d89524 Merge pull request #7726 from CocosRobot/update_lua_bindings_1407720566 
[AUTO]: updating luabinding automatically
 2014-08-11 09:31:54 +08:00
CocosRobot 3d222ab73a [AUTO]: updating luabinding automatically 2014-08-11 01:31:04 +00:00
minggo 00165f5fa1 Merge pull request #7723 from jimmystar/patch-3 
Update CCScene.cpp
 2014-08-11 09:26:48 +08:00
cpascal 5e1570e36e Fix a correct onGLFWCharCallback 2014-08-10 01:42:21 +09:00
jimmystar 63c9780c49 Update CCScene.cpp 
in line 157, here need to create  and add camera, if not ,in the function createWithPhysics, will show black screen.
 2014-08-09 17:37:18 +08:00
Huabing.Xu 7e1adeb3e9 add new test case 2014-08-08 18:01:36 +08:00
heliclei 4fd2d2082a [ci skip][jenkins]Add script to track android built libs size 2014-08-08 17:28:44 +08:00
samuele3hu 2dacbf6f26 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module 2014-08-08 16:59:33 +08:00
bo yu 517b26e343 fix typo 2014-08-08 16:56:48 +08:00
samuele3hu 2ffc0e2e53 Modify the mechanism that files copy to lua-empty-test and lua-template 2014-08-08 16:56:22 +08:00
boyu0 ee3a8da13c fix PhysicsBody bitmask bug. 2014-08-08 16:38:20 +08:00
samuele3hu 4fe1b2e6bc Fix the target dependencies error of lua-runtime-template 2014-08-08 16:10:31 +08:00
samuele3hu 8919ebc011 Add build all lualibs target for iOS and Mac 2014-08-08 16:08:24 +08:00
minggo ddde741d86 Merge pull request #7716 from CocosRobot/update_cocosfiles_1407484704 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-08-08 15:59:06 +08:00
CocosRobot 1b4cd7e58e [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-08 07:58:25 +00:00
minggo 3031b17ba8 [ci skip] 2014-08-08 15:57:18 +08:00
minggo 213f2f5a6c Merge pull request #7702 from super626/v3_merge 
Camera and Camera test
 2014-08-08 15:56:38 +08:00
yangxiao1 61eaa082a2 fix windows 2014-08-08 15:33:30 +08:00
samuele3hu 6aa667c912 Add CC_DLL for FontFNT 2014-08-08 15:22:43 +08:00
samuele3hu 00865c8abb Modify the mechanism that files copy to lua-empty-test and lua-template 2014-08-08 15:22:12 +08:00
zhangbin c897fa4c50 Modify the gen-prebuilt tools for the lua-bindings modules. 2014-08-08 15:21:24 +08:00
yangxiao 97edd303b5 remove DrawNode3D 2014-08-08 15:06:45 +08:00
yangxiao 7408250113 add drawline 2014-08-08 15:01:24 +08:00
minggo eaac80b900 [ci skip] 2014-08-08 14:08:43 +08:00
minggo f677210746 [ci skip] 2014-08-08 14:07:49 +08:00
minggo 6f99fab13a Merge pull request #7715 from minggo/fix-video-player 
Fix video player
 2014-08-08 14:05:31 +08:00
minggo c5851f988b fix conflict 2014-08-08 14:04:38 +08:00
Huabing.Xu be4bcf7c36 add init value for flag 2014-08-08 13:47:50 +08:00
yangxiao 1eeb4fa105 not export getCameras 2014-08-08 13:31:05 +08:00
minggo 29888b9d74 Merge pull request #7705 from zii/patch-1 
让replaceScene更安全
 2014-08-08 12:03:48 +08:00
minggo 49ea910d94 [ci skip] 2014-08-08 11:59:39 +08:00
minggo 3ccce066b0 Merge pull request #7712 from andyque/testLoadingBar 
fixed loadingBar change direction affect position issue
 2014-08-08 11:57:28 +08:00
minggo ad9eb7ca8d Merge pull request #7714 from CocosRobot/update_cocosfiles_1407469867 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-08-08 11:56:31 +08:00
minggo 92a4a8c42c [ci skip] 2014-08-08 11:55:26 +08:00
minggo dcb1a1001c [ci skip] 2014-08-08 11:53:12 +08:00
yangxiao 911144b720 wrong parameter for visit 2014-08-08 11:52:40 +08:00
CocosRobot 75bd97b82e [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-08 03:51:09 +00:00
yangxiao 4dce59582b visiting camera 2014-08-08 11:49:59 +08:00
minggo 800ab18457 Merge pull request #7700 from GavinThornton/patch-1 
Update CCSpriteBatchNode.cpp
 2014-08-08 11:49:39 +08:00
minggo 2a7e3dced8 Merge pull request #7711 from CocosRobot/update_lua_bindings_1407466030 
[AUTO]: updating luabinding automatically
 2014-08-08 11:49:14 +08:00
minggo b9e84370f6 Merge pull request #7699 from huangshiwu/v3_wp8fix 
V3 wp8fix
 2014-08-08 11:49:02 +08:00
minggo 83a204a720 [ci skip] 2014-08-08 11:48:06 +08:00
zhangbin 5e85990f0e Merge branch 'v3' into gen-prebuilt-script 2014-08-08 11:45:26 +08:00
andyque d00e3349a3 fixed loadingBar change direction affect position issue 2014-08-08 11:17:17 +08:00