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

21846 Commits

Author SHA1 Message Date
minggo c7473611b8 Merge pull request #7463 from Dhilan007/v3-320final 
Remove prompt box of connect controller[Nibiru].
 2014-07-16 15:26:24 +08:00
Dhilan007 7e76b7b9a1 Remove prompt box of connect controller[Nibiru]. 2014-07-16 14:48:22 +08:00
minggo e431d4f824 Merge pull request #7458 from MSOpenTech/wp8-v3-fix 
updated cpp template to support EVENT_RENDERER_RECREATED
 2014-07-15 23:02:28 +08:00
Dale Stammen d0c15bc1d8 updated cpp template to support EVENT_RENDERER_RECREATED 2014-07-15 07:23:40 -07:00
minggo 84d42d30f1 Merge pull request #7456 from chengstory/v3_FixWarningAndTriggerTestBug 
Cocos Studio Bugs
 2014-07-15 18:10:32 +08:00
zhangcheng 8bf4c8b6c9 1. Fixes CCTimeLine warning. 
2. Fixes CocoLoader warning.
3. Fixes TriggerTest Bug.
 2014-07-15 18:07:33 +08:00
minggo bf27428a28 Merge pull request #7454 from samuele3hu/v3_hot_fix 
Update bindings-generator config files and manual bindings files to fix the compile warning
 2014-07-15 17:43:24 +08:00
minggo 7cb0dc19ae Merge pull request #7453 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2014-07-15 17:41:08 +08:00
zhangbin 94ea6c40d6 Update the reference of submodule cocos2d-console. 2014-07-15 17:39:56 +08:00
samuele3hu 8394ce74d0 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix 2014-07-15 17:39:24 +08:00
samuele3hu a6c30bc495 Update bindings-generator config files and manual bindings files to fix the compile warning 2014-07-15 17:38:56 +08:00
minggo 16d5d6e9af Merge pull request #7451 from CocosRobot/update_cocosfiles_1405414701 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-07-15 17:16:48 +08:00
minggo 8f5906bf1e Merge pull request #7452 from CocosRobot/update_cocosfiles_1405415205 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-07-15 17:15:54 +08:00
CocosRobot c1bb801dc5 [AUTO][ci skip]: updating cocos2dx_files.json 2014-07-15 09:06:46 +00:00
minggo 52b2cd4b18 Merge pull request #7450 from andyque/fixLoadingBarTest 
fix loading bar switch loading method issue
 2014-07-15 17:00:48 +08:00
andyque 714048059c fix loading bar switch loading method issue 2014-07-15 17:03:35 +08:00
minggo f17817b9ac [ci skip] 2014-07-15 17:00:16 +08:00
CocosRobot 5dfb5807b3 [AUTO][ci skip]: updating cocos2dx_files.json 2014-07-15 08:58:22 +00:00
minggo a59a86df0a Merge pull request #7439 from boyu0/merge_arm64_lib_to_fat_lib 
merge iOS arm64 libs to fat libs, change the project setting.
 2014-07-15 16:57:10 +08:00
minggo 19da7e8075 [ci skip] 2014-07-15 16:24:06 +08:00
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
minggo b282970833 [ci skip] 2014-07-15 15:11:17 +08:00
minggo 415fcfd4ab [ci skip] 2014-07-15 15:09:40 +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
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
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