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

22599 Commits

Author SHA1 Message Date
minggo 920c3f905a Merge pull request #7449 from andyque/cleanupComments 
update UI module code comments
 2014-07-15 15:52:04 +08:00
andyque dae29e5678 update UI module code comments 2014-07-15 15:56:07 +08:00
chuanweizhang2013 d5da148f03 Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3luaruntime 2014-07-15 15:37:40 +08:00
joshuastray da9563f623 fix LabelAtlas constructor to CC_CONSTRUCTOR_ACCESS 2014-07-15 15:26:37 +08:00
chuanweizhang2013 9334863da6 Merge pull request #30 from cocos2d/v3 
update cocos2d-x
 2014-07-15 15:26:01 +08:00
cocoscodeide 3187e7647a Merge pull request #56 from cocos2d/v3 
update 2d-x
 2014-07-15 15:24:15 +08:00
cocoscodeide 68369ed2ea Merge pull request #55 from chuanweizhang2013/v3luaruntime 
fixed bug  scheduleUpdate
 2014-07-15 15:22:54 +08:00
Huabing.Xu ed690114d7 add CC_DLL for mesh, lua works now 2014-07-15 15:19:34 +08:00
minggo b282970833 [ci skip] 2014-07-15 15:11:17 +08:00
minggo 415fcfd4ab [ci skip] 2014-07-15 15:09:40 +08:00
chuanweizhang2013 0346fccbc3 fixed bug runtime 2014-07-15 15:07:01 +08:00
minggo 65f252785e [ci skip] 2014-07-15 15:02:23 +08:00
minggo 0dc89db97b Merge pull request #7426 from Mazyod/cceditbox-mac-fix 
CCEditBox SecureInput Mac Fixes
 2014-07-15 14:57:11 +08:00
minggo b5f9a45ee4 Merge pull request #7448 from andyque/fixTypo 
fix Layout typo
 2014-07-15 14:56:37 +08:00
andyque 1dc1df0827 fix Layout typo 2014-07-15 14:57:10 +08:00
minggo 35f5fa75b9 Merge pull request #7447 from minggo/update-release-note 
Update release note
 2014-07-15 14:49:55 +08:00
minggo c921926528 Update RELEASE_NOTES.md 2014-07-15 14:48:00 +08:00
minggo 7fab7cdd15 Update RELEASE_NOTES.md 2014-07-15 14:46:56 +08:00
minggo 4bf6c7dc5a update release note 2014-07-15 14:43:40 +08:00
minggo cd1a23c75a Merge pull request #7446 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2014-07-15 14:42:45 +08:00
minggo 60e8710fa5 Merge pull request #7445 from CocosRobot/update_cocosfiles_1405403210 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-07-15 14:37:33 +08:00
minggo d830580dc3 Merge pull request #7442 from pandamicro/ArmatureTrans 
Fixed #5724: Fix armature bone's transform issue
 2014-07-15 14:37:02 +08:00
zhangbin 28dd766159 Update the reference of submodule cocos2d-console. 2014-07-15 14:36:57 +08:00
boyu0 8400ce2e84 fix error. 2014-07-15 14:14:35 +08:00
boyu0 812ad7cd5b fix lua compile error in xcode6 beta3 2014-07-15 14:10:36 +08:00
Huabing.Xu dbd3fce0a5 windows dll version of cpp-tests works 2014-07-15 13:54:08 +08:00
CocosRobot d90effbe09 [AUTO][ci skip]: updating cocos2dx_files.json 2014-07-15 05:46:51 +00:00
minggo 642321d5a7 Merge pull request #7444 from samuele3hu/v3_hot_fix 
Add bit extend module and fix some bugs found in test
 2014-07-15 13:45:19 +08:00
samuele3hu 19cc5b9c4d Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix 2014-07-15 13:34:46 +08:00
samuele3hu 15a7ab8450 Update the TextureAsyncTest 2014-07-15 13:33:36 +08:00
Huabing.Xu 63de5f6acc add CC_DLL 2014-07-15 12:00:31 +08:00
minggo e2bbc3d54d [ci skip] 2014-07-15 11:48:55 +08:00
minggo fcaffb5b38 Merge pull request #7443 from andyque/fixTextLineWrap 
fix text line wrap issue
 2014-07-15 11:43:59 +08:00
andyque 52596dc97f fix Text line wrap issue 2014-07-15 11:46:53 +08:00
samuele3hu 55e77d8fd2 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix 2014-07-15 11:34:57 +08:00
samuele3hu 3ab7520667 Delete SceneEditorTest from ExtensionTest and add related binary loading to CocoStudioSceneTest 2014-07-15 11:34:24 +08:00
pandamicro 216af377d0 Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into ArmatureTrans 2014-07-15 11:32:12 +08:00
pandamicro db8f0ea3ab Fixed #5724: Use correct transform in CCSkin's updateTransform function 2014-07-15 11:31:10 +08:00
pandamicro 67c07f94f4 Issue #5724: Correction of property name in CCBone 2014-07-15 11:30:36 +08:00
Huabing.Xu 4b059689d3 add CC_DLL for functions 2014-07-15 11:18:05 +08:00
boyu0 6ed9b49ffb Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into merge_arm64_lib_to_fat_lib 2014-07-15 11:08:35 +08:00
Huabing.Xu 9db59c0046 add CC_DLL for Event and Physics 2014-07-15 10:55:40 +08:00
cocoscodeide be343ea73d Merge pull request #54 from chuanweizhang2013/v3luaruntime 
add window top
 2014-07-15 10:48:52 +08:00
chuanweizhang2013 03982a7f6e Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime 2014-07-15 10:34:00 +08:00
chuanweizhang2013 a4c4c14c3c remove change project fecture 2014-07-14 19:31:32 -07:00
chuanweizhang2013 6098531fd4 add set window top 2014-07-14 19:26:24 -07:00
Huabing.Xu cd9e42eb99 add CC_DLL for colorXXX 2014-07-15 10:04:24 +08:00
Huabing.Xu 60334e8b3e add CC_DLL for 3d 2014-07-15 09:45:43 +08:00
Ricardo Quesada 74df6eb95b Merge pull request #7441 from ricardoquesada/cpp-template-mac 
default OS Target for OS X is 10.7
 2014-07-14 18:41:07 -07:00
Ricardo Quesada cc0a27e83e default OS Target for OS X is 10.7 2014-07-14 18:39:36 -07:00