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

25052 Commits

Author SHA1 Message Date
Huabing.Xu c1a71453d5 Merge branch 'v3_renderPrimitive' into v3 2014-08-11 14:39:16 +08:00
Huabing.Xu 031efaf242 Merge branch 'v3_renderPrimitive' of github.com:dabingnn/cocos2d-x into v3 2014-08-11 14:37:43 +08:00
Huabing.Xu 6aff707eab windows work now for renderPrimitive 2014-08-11 14:18:07 +08:00
yangxiao fd314261b7 Merge branch 'newcode' into obb 2014-08-11 13:21:44 +08:00
samuele3hu 3c3c05204f Split files in lua-bindings/script into different module and adjust related project 2014-08-11 12:54:30 +08:00
Huabing.Xu 2a28744dc5 Merge branch 'v3' into v3_renderPrimitive 2014-08-11 12:48:23 +08:00
yangxiao 6d15c26a61 move create default camera to Scene::initWithSize 2014-08-11 10:55:14 +08:00
lvlong c592ac4248 for pull request modify!! 2014-08-11 10:40:34 +08:00
minggo e4faa4f9b1 [ci skip] 2014-08-11 10:37:23 +08:00
minggo 0f942d3417 Merge pull request #7719 from boyu0/physics_bitmask_fix 
fix PhysicsBody bitmask bug.
 2014-08-11 10:35:06 +08:00
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
yangxiao 2576622778 move create camera to Scene::initWithSize 2014-08-11 10:07:23 +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
yangxiao 933439c6ca fix linux 2014-08-09 09:27:48 +08:00
yangxiao 754a78bd26 can not export aabb obb ray 2014-08-09 00:03:11 +08:00
yangxiao 53c143c679 remove normalize 2014-08-09 00:02:40 +08:00
yangxiao 73a0b7701d remove normalize 2014-08-09 00:02:19 +08:00
yangxiao1 014b6d06e4 Merge branch 'obb' of https://github.com/super626/cocos2d-x into obb 2014-08-08 18:26:34 +08:00
yangxiao1 e904ee646a windows work 2014-08-08 18:25:36 +08:00
yangxiao 6d5b63ec6a Merge branch 'obb' of https://github.com/super626/cocos2d-x into obb 2014-08-08 18:15:01 +08:00
yangxiao 504ef32b97 linux 2014-08-08 18:14:41 +08:00
XiaoYang df21587718 Merge pull request #78 from lvlonggame/obb 
1. move drawnode3d to Sprite3DTest
 2014-08-08 18:08:14 +08:00
Huabing.Xu 7e1adeb3e9 add new test case 2014-08-08 18:01:36 +08:00
lvlong 8101e2ff1a 1. move drawnode3d to Sprite3DTest 
2. add getAABB to sprite3D and mesh
 2014-08-08 17:54:39 +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
yangxiao c71df09072 not export getCameras 2014-08-08 16:30:17 +08:00
yangxiao ceb6549ec8 merge cocos2d 2014-08-08 16:25:52 +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