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

19321 Commits

Author SHA1 Message Date
andyque 1282252c25 closed #4861, refactor 2014-05-07 14:06:44 +08:00
James Chen b76a6a5dda updates travis-script. 2014-05-07 13:48:39 +08:00
James Chen 59051d2393 Updates .gitignore. 2014-05-07 13:48:35 +08:00
James Chen 7fbcf5cc67 Adds external/version.txt 2014-05-07 13:46:18 +08:00
James Chen 32b2b20a32 Re-adds box2d and chipmuck sources, we need to use prebuilt libraries for them too. 2014-05-07 13:40:39 +08:00
James Chen 014e515b8b Delete external submodule, please use 'download-deps.py' instead. 2014-05-07 13:38:17 +08:00
James Chen b49b9d673c download-deps.py will unzip the download zip file. 
Output more detail informations
 2014-05-07 13:36:08 +08:00
andyque 8baa88e2e1 closed #4861, fixed temparory variable issue 2014-05-07 11:55:00 +08:00
andyque 657720e509 Merge remote-tracking branch 'upstream/v3' into focus3861 2014-05-07 11:42:09 +08:00
andyque ef44b2687b closed #4861, finished focus 2014-05-07 11:40:01 +08:00
samuele3hu 1f2c08e87d Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix 2014-05-07 11:08:34 +08:00
samuele3hu 3fb53e39ea Update bindings-generator submodule 2014-05-07 11:06:58 +08:00
samuele3hu f122f3894c Update the bindings-generator 2014-05-07 10:52:49 +08:00
minggo b766c6bdb5 Merge pull request #6596 from natural-law/v3 
Export the `2d` include directory of engine on android.
 2014-05-07 10:46:14 +08:00
zhangbin 9966d83c02 Export the `2d` include directory of engine on android. 2014-05-07 10:43:42 +08:00
samuele3hu a0b60acf24 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix 2014-05-07 10:33:57 +08:00
andyque ef70c684de issue #4861, add requestFocus method and the layout current can get focus 2014-05-07 10:23:57 +08:00
samuele3hu 3c64f7cc44 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_lua_fix 2014-05-07 10:10:17 +08:00
samuele3hu fb60b9f65a issue #5032:A potential crash bug of Lua binding 2014-05-07 10:09:54 +08:00
andyque 62a66872aa issue #4861, fixed some boundary conditions 2014-05-07 10:05:20 +08:00
James Chen a4ce0687f4 Merge pull request #6591 from CocosRobot/update_cocosfiles_1399375244 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-05-06 20:35:32 +08:00
CocosRobot 12ba2b178e [AUTO][ci skip]: updating cocos2dx_files.json 2014-05-06 11:20:46 +00:00
James Chen 706b33f9dd Merge pull request #6590 from dumganhar/v3 
Re-adds download-deps.py, comments unzip functionality, please help to test the download functionality. Thanks.
 2014-05-06 19:18:49 +08:00
James Chen dab2eed48a Speed calculate fix 2014-05-06 19:13:05 +08:00
James Chen 85d545cc30 Percent number fix 2014-05-06 18:36:37 +08:00
James Chen cafe263883 Re-adds download-deps.py, comments unzip functionality, please help to 
test the download functionality. Thanks.
 2014-05-06 18:33:52 +08:00
andyque 9d71ae29b9 issue #4861. fixed all widget focus diabled bug 2014-05-06 17:28:12 +08:00
andyque 51a704dcc8 issue #4861, refactor improve nested focus test 2014-05-06 15:11:55 +08:00
James Chen ac7fd0069b Merge pull request #6559 from shujunqiao/cocos-console-hang 
fixed one-hang-bug in cocos-console-test.py. [ci skip]
 2014-05-06 15:11:07 +08:00
andyque 29c57568bf issue #4861, add nested focus test 2014-05-06 14:38:45 +08:00
andyque e52370e1c2 issue #4861, refactor UIFocusTest, simplify code 2014-05-06 14:20:01 +08:00
andyque ad4e1f1e2c issue #4861, improve UIFocusTest, add click event to ImageView 2014-05-06 14:14:22 +08:00
samuele3hu 3017c776e1 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix 2014-05-06 13:59:44 +08:00
samuele3hu 0ce2a38f17 Update bindings-generator and `MAX_SUB_TEST_NUMS` for SpritePerformance Test 2014-05-06 13:59:16 +08:00
andyque a15dd55baa closed #3861, fixed some typo and indent problem 2014-05-06 12:04:52 +08:00
minggo 1caa7ece9a [ci skip] 2014-05-06 11:56:00 +08:00
minggo 07df728919 [ci skip] 2014-05-06 11:51:34 +08:00
minggo 9634da6ce7 [ci skip] 2014-05-06 11:47:53 +08:00
andyque bcd2d3ccb3 issue #3861, fix layout contentSize caculation 2014-05-06 11:46:28 +08:00
minggo 7830818fc0 Merge pull request #6553 from Dhilan007/v3_labelhotfixed 
[hot fixed]closed issue#4999:fixed label is unsharp if it's created by smaller font.
 2014-05-06 11:41:24 +08:00
Dhilan007 989b3830aa fixed indent 2014-05-06 11:22:23 +08:00
Dhilan007 e412f91103 [hot fixed]closed issue#4999:fixed label is unsharp if it's created by smaller font. 2014-05-06 10:36:55 +08:00
minggo 302ec843e7 Merge pull request #6577 from MSOpenTech/v3-wp8-fix 
V3 wp8 fix
 2014-05-06 10:26:19 +08:00
andyque e65b144ee6 issue #3861, fixs windows compile error 2014-05-06 10:17:10 +08:00
Ricardo Quesada e1b90c19f1 Merge pull request #6586 from dabingnn/v3_unify_ZERO_ONE 
V3 unify zero one
 2014-05-05 19:06:48 -07:00
andyque 16ebe8d41c issue #3861, fix linux compile error 2014-05-06 09:40:50 +08:00
Huabing.Xu c581f74142 Merge branch 'v3' into v3.1_unify_ZERO_ONE 2014-05-05 18:10:13 -07:00
Huabing.Xu 32f9a8ffc6 comment out warning code in quaternion.cpp 
unify ZERO, ONE, UNIT_X/Y/Z/W into a consistent convention
 2014-05-05 18:07:58 -07:00
James Chen c91f94fa5c Merge pull request #6585 from CocosRobot/update_lua_bindings_1399337119 
[AUTO]: updating luabinding automatically
 2014-05-06 08:51:56 +08:00
CocosRobot db99518c80 [AUTO]: updating luabinding automatically 2014-05-06 00:46:16 +00:00