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

17237 Commits

Author SHA1 Message Date
Dhilan007 4905acfa0b label:fixed vertical alignment is incorrect. 2014-03-07 18:31:33 +08:00
CaiWenzhi e38fc52d15 Fixed crash 2014-03-07 18:24:40 +08:00
pandamicro e94cd2357d Issue #4294: Add override declaration 2014-03-07 18:11:37 +08:00
Huabing.Xu ad9c104cfd migrate saveToFile compatible with new renderer 2014-03-07 17:41:51 +08:00
minggo bf8506d687 Merge pull request #5615 from nutty898/develop_nutty_modify_framework_for315 
Develop nutty modify framework for315
 2014-03-07 17:37:15 +08:00
CaiWenzhi c81793b076 Modify projects 2014-03-07 16:47:51 +08:00
James Chen dd06b58865 Update CHANGELOG [ci skip] 2014-03-07 16:44:56 +08:00
CaiWenzhi 0c4bca9bb2 Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-07 16:42:38 +08:00
pandamicro a005fa1dce Issue #4294: Add unimplemented position getter/setter in MotionStreak 2014-03-07 16:32:00 +08:00
minggo 60b309ce8e Merge pull request #5621 from minggo/install 
use terminal to input for all platforms
 2014-03-07 16:17:01 +08:00
minggo 36180e07c5 use terminal to input for all platforms 2014-03-07 16:15:18 +08:00
minggo 07c0fac44f Merge pull request #5620 from Dhilan007/develop_label 
closed #4301:Label support vertical alignment and assign dimensions.
 2014-03-07 16:12:21 +08:00
Dhilan007 ac944cd42b fixed incorrect display when the size of label not enough to support display all text. 2014-03-07 15:58:49 +08:00
minggo 8fd245cae6 Merge pull request #5617 from lihex/develop 
fix the file path in template & update submodule
 2014-03-07 15:58:37 +08:00
minggo 4251bcf425 Merge pull request #5469 from natural-law/issue3991 
Add method to reload cached texture & update the nodes used the texture.
 2014-03-07 15:58:17 +08:00
CaiWenzhi 62dfe630c7 Add custom widget 2014-03-07 15:36:45 +08:00
heliclei 600c661acb remove script support 2014-03-07 15:12:46 +08:00
Dhilan007 c233b636cd closed #4301:Label support vertical alignment and assign dimensions. 2014-03-07 14:58:44 +08:00
CaiWenzhi 5ee35be0ad Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-07 14:41:32 +08:00
chuanweizhang2013 a0df56859e Merge pull request #12 from cocos2d/develop 
update coco2d-x
 2014-03-07 14:19:07 +08:00
James Chen 9b0c0ab44e Merge pull request #5616 from dumganhar/glview-refactor 
Refactoring GLView for desktop platforms, and adding protected method `updateDesignResolutionSize` for GLViewProtocol class.
 2014-03-07 14:15:20 +08:00
lihex d96c7b4424 update submodule 2014-03-07 14:14:13 +08:00
lihex c328624245 fix the file path in template 2014-03-07 14:14:02 +08:00
James Chen e0e9e1723c Merge pull request #5612 from Dhilan007/develop_label 
fixed #4300:fixed Label:draw location and BBOX is incorrect.
 2014-03-07 14:09:39 +08:00
James Chen 1cfd14f27d Tab -> 4 spaces, remove unused spaces for CCGLView.h 2014-03-07 14:03:57 +08:00
James Chen ae2f7a4a7d updateDesignResolution -> updateDesignResolutionSize. 2014-03-07 14:01:30 +08:00
James Chen d699f62193 Tab -> 4 spaces, remove unused spaces. 2014-03-07 13:59:56 +08:00
James Chen 49223fe50c Compilation error fixes for linux port (clang compiler). 2014-03-07 13:52:54 +08:00
James Chen 8b359dd90e Refactoring GLView for desktop platforms, and adding protected method `updateDesignResolutionSize` for GLViewProtocol class. 2014-03-07 13:51:12 +08:00
CaiWenzhi 58db7b5c75 Some widgets would be default enabled touch 2014-03-07 12:34:19 +08:00
CaiWenzhi 3cfa430f1b Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-07 12:07:53 +08:00
CaiWenzhi 1606671224 Fixed bug of Text 2014-03-07 12:05:33 +08:00
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