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

32305 Commits

Author SHA1 Message Date
XiaoFeng bca6934786 Normalization function names 2015-07-28 14:05:56 +08:00
pandamicro ca54340982 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2015-07-28 13:00:10 +08:00
CocosRobot efd718ae7b [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-28 03:44:49 +00:00
Vincent Yang b92733c402 Add items as protected children. 2015-07-28 11:38:21 +08:00
子龙山人 3a58668d71 Merge pull request #12744 from fusijie/fix_pageturndown 
Fix PageTurn3D
 2015-07-28 11:35:15 +08:00
Vincent Yang 14145e29a8 Fixed #9400 : Widget::setHighlighted does not work after setBright 2015-07-28 11:09:21 +08:00
jianglong0156 439bc8a99f add conversion cpp file into iOS project 2015-07-28 10:48:18 +08:00
jianglong0156 948628b800 add file in project file with android, linux wp8.1 2015-07-28 10:26:45 +08:00
jianglong0156 ec4d53fcf7 add 3d conversion 2015-07-28 10:08:58 +08:00
jianglong0156 d5a6522a37 Merge branch 'v3' into constructedWith3D#12404 2015-07-28 09:59:35 +08:00
子龙山人 96007b2793 Merge pull request #13044 from fusijie/fix_10763 
set minimum display length to 1.
 2015-07-28 09:52:45 +08:00
pandamicro b9968a9dca Merge pull request #13038 from ZhangMenghe/shaderTestCase 
Fix OpenGL testcase 'center' uniform error
 2015-07-28 09:34:09 +08:00
Damien 7fb4dabcb7 Fixed a compile error when CC_SPRITE_DEBUG_DRAW is on 2015-07-27 14:46:15 -07:00
XiaoFeng 09d9fcf4d6 Fix lua binding 2015-07-27 21:24:52 +08:00
jianglong0156 6d83a3cea4 add Physics3DWorld support new 2015-07-27 18:22:56 +08:00
jianglong0156 cb2b427eed add Physics3DRigidBodyDes support new , add new file jsb_cocos2dx_3d_conversions.h and jsb_cocos2dx_3d_conversions.cpp 2015-07-27 18:19:10 +08:00
fusijie 651d877e28 set minimum display length to 1. 2015-07-27 17:55:32 +08:00
XiaoFeng e0aef73306 Fix lua binding 2015-07-27 17:31:09 +08:00
Vincent Yang 19b3822d87 Fixed #9507 : logic error in isMaxLengthEnabled handling in UITextField::setString 2015-07-27 17:25:48 +08:00
Vincent Yang 2f996b24ef Fixed #10386 : ui::TextField hitTest not working as expected. 2015-07-27 16:59:35 +08:00
XiaoFeng 63f8b941c9 Fix setting file 2015-07-27 16:03:05 +08:00
jianglong0156 9c6b5730d0 add Physics3DPointToPointConstraint support new 2015-07-27 16:02:13 +08:00
Zhang Menghe a96ea2342a Update OpenGLTest.js 2015-07-27 15:53:48 +08:00
pandamicro 3cc039b063 Merge pull request #13036 from fusijie/fix_12505 
fix shader-basic testcase 'center' uniform error.
 2015-07-27 15:40:44 +08:00
XiaoFeng 8421ff7149 Disable new function bind to lua to avoid compile error 2015-07-27 15:09:34 +08:00
ZhangMenghe 232f738bf7 Fix OpenGL testcase 'center' uniform error 2015-07-27 15:08:07 +08:00
jianglong0156 1be5981d6a add Physics3DComponent support new 2015-07-27 14:26:50 +08:00
fusijie f8de67a0c4 fix shader-basic testcase 'center' uniform error. 2015-07-27 14:18:17 +08:00
pandamicro 3fb45f28f5 Merge pull request #13033 from CocosRobot/update_cocosfiles_1437975533 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-07-27 13:41:41 +08:00
CocosRobot f751234b7f [AUTO][ci skip]: updating cocos2dx_files.json 2015-07-27 05:38:54 +00:00
子龙山人 7f383f961a Merge pull request #13026 from fusijie/fix_13025 
fix 13025 wild pointer.
 2015-07-27 13:38:38 +08:00
子龙山人 ce06f148a5 Merge pull request #13031 from natural-law/remove-unused-files 
Remove the unused files in tools/gen-prebuilt.
 2015-07-27 13:37:07 +08:00
pandamicro bb15225ff7 Merge pull request #13028 from CocosRobot/update_lua_bindings_1437966796 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-27 12:04:22 +08:00
XiaoFeng f410fcd737 Fix issue https://github.com/cocos2d/cocos2d-x/issues/12968 2015-07-27 11:55:18 +08:00
dualface 6d16d1674d Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3.7.1 2015-07-27 11:50:14 +08:00
zhangbin e73fc94345 Remove the unused files in tools/gen-prebuilt. 2015-07-27 11:38:41 +08:00
pandamicro 8ac75f6c6c Merge pull request #13029 from pandamicro/v3.7.1 
[ci skip] Update web ref
 2015-07-27 11:19:17 +08:00
jianglong0156 4005ef6588 add skybox support new 2015-07-27 11:19:17 +08:00
pandamicro 6ed325afe8 Update web ref 2015-07-27 11:18:16 +08:00
CocosRobot d9b5ce8d28 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-27 03:17:29 +00:00
pandamicro bd6e385d87 Merge pull request #13027 from CocosRobot/update_lua_bindings_1437966576 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-27 11:16:41 +08:00
CocosRobot e986aac617 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-27 03:14:03 +00:00
子龙山人 bd0bdae530 Merge pull request #12993 from WenhaiLin/v3.8-label-layout-refine 
Label:refine the implementation about text layout and support debug draw.
 2015-07-27 11:10:31 +08:00
pandamicro aa21cd5937 Merge pull request #13024 from pandamicro/v3.7.1 
[LUA] Gen bindings for BoneNode and SkeletonNode
 2015-07-27 11:06:42 +08:00
jianglong0156 48147ff08a add the Animate3D and Animation3D js implements 2015-07-27 10:53:34 +08:00
jianglong0156 d51f0b1f05 add animate support new 2015-07-27 10:51:53 +08:00
fusijie f2f425d19c fix 13025 wild pointer. 2015-07-27 10:39:31 +08:00
jianglong0156 e25c4f88ae add animation3d support new to create 2015-07-27 10:31:35 +08:00
pandamicro 632b36fa43 Fix bindings generator for Lua 2015-07-27 10:21:18 +08:00
dualface affca12a0e Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3.7.1 2015-07-27 10:18:14 +08:00