chuanweizhang2013
|
f55b9422f6
|
fixed living code bug
|
2014-07-16 18:19:33 +08:00 |
Naoyuki Totani
|
cd025158f6
|
fix enabled to interval
|
2014-07-16 19:10:05 +09: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 |
samuele3hu
|
1b2d389011
|
Update ListViewEventType for Lua
|
2014-07-16 17:18:01 +08:00 |
Huabing.Xu
|
b7f6ba84c6
|
add cocosGUI and cocosBuilder target for mac
|
2014-07-16 16:37:29 +08:00 |
andyque
|
46aafeecc6
|
remove unused functions
|
2014-07-16 16:28:01 +08:00 |
zhangcheng
|
1530ba4a90
|
1、fixes Trigger condition value can't be export.
|
2014-07-16 16:12:55 +08:00 |
Dhilan007
|
0bf4af1175
|
fixed crash in setup.py script.
|
2014-07-16 15:36:50 +08:00 |
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 |
zhangcheng
|
80de57be39
|
1、 fixes lua TriggerTest bug.
|
2014-07-16 14:50:35 +08:00 |
Huabing.Xu
|
a0be6d9ac7
|
remove Storage project, merge code into cocos2d
|
2014-07-16 14:49:05 +08:00 |
Dhilan007
|
7e76b7b9a1
|
Remove prompt box of connect controller[Nibiru].
|
2014-07-16 14:48:22 +08:00 |
zhangbin
|
7e7c3a1e55
|
Merge branch 'v3' into android-dependencies
|
2014-07-16 13:49:20 +08:00 |
zhangbin
|
14f3d6f230
|
Adjust the dependencies of extensions & cocostudio on android.
|
2014-07-16 13:47:57 +08:00 |
joshuastray
|
190460018f
|
use CC_CONSTRUCTOR_ACCESS in ParallaxNode
|
2014-07-16 11:40:09 +08:00 |
Huabing.Xu
|
0350186589
|
Merge branch 'v3' into v3_dll
|
2014-07-16 11:15:16 +08:00 |
andyque
|
70ae3bf980
|
modify widget class comments
|
2014-07-16 10:12:13 +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 |
cocoscodeide
|
684a78144c
|
Merge pull request #58 from cocos2d/v3
update cocos2d-x
|
2014-07-15 20:02:54 +08: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 |
cocoscodeide
|
f543be4c6b
|
Merge pull request #57 from chuanweizhang2013/v3luaruntime
add support x86
|
2014-07-15 17:55:37 +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 |
chuanweizhang2013
|
53fde9d7c6
|
add support x86 atomicops_internals_x86_gcc
|
2014-07-15 17:40:43 +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 |
chuanweizhang2013
|
445409c1aa
|
remove comment
|
2014-07-15 15:56:31 +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 |
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 |