Huabing.Xu
|
02c61af9fd
|
add cocosStudio cocosBuilder cocosGUI iOS target
|
2014-07-17 12:06:20 +08:00 |
Huabing.Xu
|
4c609e11f0
|
add cocosSpin iOS target
|
2014-07-17 10:44:13 +08:00 |
Huabing.Xu
|
d030c8aed3
|
add cocosNetwork ios target
|
2014-07-17 10:06:23 +08:00 |
Huabing.Xu
|
add4caca5a
|
add cocosNetwork target for mac
|
2014-07-16 18:21:21 +08:00 |
Huabing.Xu
|
ab76be8d47
|
add cocosSpine target for mac
|
2014-07-16 17:51:42 +08:00 |
Huabing.Xu
|
778f1983b1
|
add cocosStudio target for mac
|
2014-07-16 17:35:35 +08:00 |
Huabing.Xu
|
b7f6ba84c6
|
add cocosGUI and cocosBuilder target for mac
|
2014-07-16 16:37:29 +08:00 |
Huabing.Xu
|
a0be6d9ac7
|
remove Storage project, merge code into cocos2d
|
2014-07-16 14:49:05 +08:00 |
Huabing.Xu
|
0350186589
|
Merge branch 'v3' into v3_dll
|
2014-07-16 11:15:16 +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 |
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 |
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 |