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

17705 Commits

Author SHA1 Message Date
Dhilan007 f0119ef62f fixed horizontal kerning is incorrect. 2014-03-07 12:03:45 +08:00
CaiWenzhi 51a6eb6d64 Fixed bug of Action Manger Ex 2014-03-07 12:01:51 +08:00
Ricardo Quesada 030ac9a760 minor fixes in RELEASE_NOTES 
minor fixes in RELEASE_NOTES
 2014-03-06 19:59:53 -08:00
CaiWenzhi b4466fab12 Fixed bug of action manager 2014-03-07 11:58:54 +08:00
Ricardo Quesada 0856c9171a Merge pull request #5613 from ricardoquesada/changelog_toc 
new TOC for changelog
 2014-03-06 19:56:01 -08:00
Ricardo Quesada c8ea63e05d new TOC for changelog 2014-03-06 19:55:30 -08:00
CaiWenzhi 0602410958 Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-07 11:51:28 +08:00
Ricardo Quesada 3a2e1f4966 Merge pull request #5603 from ricardoquesada/release_notes_fixes 
Release notes fixes
 2014-03-06 19:50:21 -08:00
Ricardo Quesada e3b2535dc4 Improved release notes 2014-03-06 19:48:39 -08:00
Dhilan007 063bde51c3 fixed #4300:fixed Label:draw location and BBOX is incorrect. 2014-03-07 11:42:13 +08:00
minggo 69d445efca Merge pull request #5525 from andyque/bug3868 
fixed #3868. Add guard check to send method of HttpClient
 2014-03-07 11:31:32 +08:00
minggo 7a42d85674 Merge pull request #5609 from lmskater/add-linux-build 
[Jenkins] add linux build
 2014-03-07 11:30:08 +08:00
lm e01319a701 [Jenkins] add linux build 2014-03-07 11:25:35 +08:00
minggo 3d2bf5cc1a Merge pull request #5608 from lmskater/fix-android-build 
[Jenkins] fix android build
 2014-03-07 11:02:47 +08:00
CaiWenzhi f9ea39bf81 Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-07 10:54:38 +08:00
lm c49dc0a044 [Jenkins] fix android build 2014-03-07 10:51:17 +08:00
minggo 2928ef8c57 Merge pull request #5592 from shujunqiao/develop 
modify autotest.py
 2014-03-07 10:49:24 +08:00
James Chen 325df033e9 Merge pull request #5606 from CocosRobot/update_cocosfiles_1394159632 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-03-07 10:39:27 +08:00
CaiWenzhi 7cdfba088d Modify reader 2014-03-07 10:35:58 +08:00
CocosRobot 5f534016e7 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-07 02:33:52 +00:00
minggo 5999811028 Merge pull request #5547 from nutty898/develop_nutty_modify_framework_for315 
Fixd bugs for editor
 2014-03-07 10:30:55 +08:00
minggo 2f7f442c6c Merge pull request #5604 from dabingnn/develop_fix_node_transform_bug 
Develop fix node transform bug
 2014-03-07 10:30:40 +08:00
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