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

17233 Commits

Author SHA1 Message Date
minggo b875e4d209 Merge pull request #5605 from minggo/install 
support setting android sdk root
 2014-03-07 10:22:22 +08:00
minggo a7b24e8c29 fix conflict 2014-03-07 10:21:02 +08:00
minggo 4cb6dd4833 set ANDROID_SDK_ROOT 2014-03-07 10:19:24 +08:00
Huabing.Xu 5c1be5f2ef Merge branch 'develop' into develop_fix_node_transform_bug 
* develop:
  Improved documentation
  better doctrings
  fixes for linux
  small setup.py fixes
  Update CHANGELOG [ci skip]
  closed #4291：open CCEditBox as modal dialog
  Fixes 'schedule test/issue#2268' crashes
  closed #4150:  fix physics position/rotation tag bug.
 2014-03-07 10:07:19 +08:00
Huabing.Xu 9fc6177570 fix bug for outdated transform status 2014-03-07 10:03:34 +08:00
Ricardo Quesada 3fcaae783c Release Notes improvements 2014-03-06 17:24:55 -08:00
Ricardo Quesada 3aff7f9f65 fixes in the release notes 2014-03-06 16:37:33 -08:00
Ricardo Quesada 808a874fac Merge pull request #5602 from ricardoquesada/node_fixes 
Fixes docstrings
 2014-03-06 16:15:06 -08:00
Ricardo Quesada 57b6478de7 Improved documentation 2014-03-06 16:14:06 -08:00
Ricardo Quesada 77d19e9bc2 better doctrings 
improved documentation for Node
 2014-03-06 14:04:19 -08:00
Ricardo Quesada 640482e38c Merge pull request #5600 from ricardoquesada/setup_fixes 
fixes for linux
 2014-03-06 13:09:13 -08:00
Ricardo Quesada e43dd90149 fixes for linux 2014-03-06 13:07:58 -08:00
Ricardo Quesada 1cf7c78183 Merge pull request #5599 from ricardoquesada/setup_fixe 
small setup.py fixes
 2014-03-06 10:58:45 -08:00
Ricardo Quesada 8abafd5b5c small setup.py fixes 2014-03-06 10:58:17 -08:00
James Chen 91cae278e0 Merge pull request #5595 from dumganhar/schedule-test-crash 
Fix of  'schedule test/issue#2268' crashes
 2014-03-06 23:14:35 +08:00
James Chen 186a53a683 Update CHANGELOG [ci skip] 2014-03-06 23:12:10 +08:00
CaiWenzhi 943a636747 Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-06 22:31:31 +08:00
CaiWenzhi 1d867d770b Modify Windows project 2014-03-06 22:27:57 +08:00
James Chen 9f31ecde07 Merge pull request #5597 from koowolf/editbox_dialog 
closed #4291：open CCEditBox as dialogbox
 2014-03-06 22:22:09 +08:00
koowolf 0aaa1dc0db closed #4291：open CCEditBox as modal dialog 2014-03-06 22:17:20 +08:00
CaiWenzhi 94339312ba Modify text filed size control 2014-03-06 21:58:45 +08:00
CaiWenzhi fea75444a7 Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-06 21:43:33 +08:00
James Chen d1e7842545 Merge pull request #5593 from boyu0/iss4159_physics_position_rotation_bug 
closed #4159:  fix physics position/rotation tag bug.
 2014-03-06 21:05:49 +08:00
CaiWenzhi 8b7a5c3141 Add RichText sample 2014-03-06 20:52:29 +08:00
James Chen d7774c29ca Fixes 'schedule test/issue#2268' crashes 2014-03-06 17:41:58 +08:00
zhangbin 56a46892fe closed #3991, Remove the method CCTextureCache::updateTexture(). 2014-03-06 17:38:18 +08:00
zhangbin ed97658549 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into issue3991 2014-03-06 17:29:01 +08:00
zhangbin 822ef8d588 Merge branch 'develop' into issue3991 2014-03-06 17:28:20 +08:00
CaiWenzhi 03f5be47da Modify for editor 2014-03-06 17:21:09 +08:00
minggo 0bc0bbce01 Merge pull request #5594 from minggo/install 
check validation of ndk_root
 2014-03-06 17:20:40 +08:00
minggo 8f7a4ba64a check validation of ndk_root 2014-03-06 17:18:12 +08:00
minggo 461cfeb702 Merge pull request #5589 from natural-law/develop 
Solve the crash in WebSocketTest when the network in disconnected.
 2014-03-06 17:15:25 +08:00
boyu0 b926e4efad closed #4150: fix physics position/rotation tag bug. 2014-03-06 17:04:54 +08:00
qiaofeng00oo f44773b5df modify autotest.py 2014-03-06 16:52:34 +08:00
zhangbin 7588a12f98 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-03-06 16:50:07 +08:00
zhangbin 99b2c5453e Solve the crash in WebSocketTest when the network in disconnected. 2014-03-06 16:49:51 +08:00
CaiWenzhi b02ed6fb1e Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-06 16:17:35 +08:00
CaiWenzhi bd5c11b5ee Modify mk file and solve warnings 2014-03-06 16:15:03 +08:00
minggo 62a121a54f Merge pull request #5573 from natural-law/develop 
Solve the crash in CocoStudioComponentsTest.
 2014-03-06 15:46:25 +08:00
CaiWenzhi dc7abd07c0 Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-06 15:44:18 +08:00
James Chen 88cdbeed63 Merge pull request #5587 from CocosRobot/update_cocosfiles_1394089188 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-03-06 15:02:29 +08:00
CocosRobot e95ce5ab3d [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-06 06:59:49 +00:00
James Chen 57563b5973 Merge pull request #5586 from dumganhar/develop 
Uses 'generate-tempate-files.py' to generate cocos2dx_files.json
 2014-03-06 14:58:03 +08:00
James Chen c2cd349da5 Uses 'generate-tempate-files.py' to generate cocos2dx_files.json 2014-03-06 14:56:46 +08:00
minggo 08913b95a8 Merge pull request #5585 from minggo/develop 
update readme and release note
 2014-03-06 14:47:13 +08:00
minggo 56ceb4b6d5 update readme and release note 2014-03-06 14:44:33 +08:00
CaiWenzhi 0525320945 Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-06 14:33:16 +08:00
James Chen 58553d67f5 Merge pull request #5583 from dumganhar/develop 
[travis ci] Updates generate-cocosfiles.sh.
 2014-03-06 14:16:21 +08:00
James Chen 5ca25d854f [travis ci] Updates generate-cocosfiles.sh. 2014-03-06 14:10:50 +08:00
James Chen 1edf6d5aae Merge pull request #5582 from CocosRobot/update_cocosfiles_1394086147 
[AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json
 2014-03-06 14:10:09 +08:00