minggo
|
a77b8e7320
|
Merge pull request #7608 from andyque/fixTextFieldUtf8Issue
add utf8 support for TextField widget
|
2014-07-31 13:41:57 +08:00 |
minggo
|
f6985058b7
|
Merge pull request #7628 from dabingnn/v3_removeConstructAccessMacro
remove CC_CONSTUCTOR_ACCESS fow win32 release
|
2014-07-31 13:35:32 +08:00 |
minggo
|
5f34c14938
|
Merge pull request #7629 from heliclei/fix-ios-code-sign
fix ios build code sign
|
2014-07-31 13:34:54 +08:00 |
yangxiao
|
407412e68b
|
remove .xcscheme
|
2014-07-31 11:54:44 +08:00 |
yangxiao
|
f6ad1df092
|
android work
|
2014-07-31 11:47:47 +08:00 |
yangxiao
|
cd379ab412
|
add axe model
|
2014-07-31 11:26:27 +08:00 |
andyque
|
1de2b78d61
|
refactor, optimize Scale9Sprite
|
2014-07-31 11:07:20 +08:00 |
yangxiao
|
38c86f7697
|
skeleton retain
|
2014-07-31 10:57:19 +08:00 |
yangxiao
|
2c29560514
|
add CC_DLL
|
2014-07-31 10:28:39 +08:00 |
yangxiao
|
44c501ca2a
|
merge cocos2d
|
2014-07-31 09:56:23 +08:00 |
maltium
|
3d44439e2a
|
added 3D rotation support to the RotateTo action
|
2014-07-30 21:42:47 +02:00 |
huangshiwu
|
ef69faf3ba
|
GLView Hook
|
2014-07-31 00:53:04 +08:00 |
heliclei
|
26cf4321d2
|
fix ios build code sign
|
2014-07-30 23:59:19 +08:00 |
yangxiao
|
9f1cfbfca5
|
add skeleton and refactor skin
|
2014-07-30 18:32:34 +08:00 |
andyque
|
03368d42f2
|
refactor, improve imageView stability
|
2014-07-30 17:29:22 +08:00 |
andyque
|
e6b85fbd77
|
fix minor bugs of UISlider and remove unused header include in ListView
|
2014-07-30 16:55:16 +08:00 |
Huabing.Xu
|
65775f2d30
|
remove CC_CONSTUCTOR_ACCESS fow win32 release
|
2014-07-30 16:39:21 +08:00 |
andyque
|
83298171d9
|
refactor Layout
|
2014-07-30 16:33:37 +08:00 |
Ningyu
|
d53cdc39df
|
tab to spaces
|
2014-07-30 16:20:58 +08:00 |
Ningyu
|
52ca596b3d
|
code tidy
|
2014-07-30 16:19:05 +08:00 |
minggo
|
7bd68c35d0
|
Merge pull request #7626 from heliclei/jenkins-pull-request-builder
fix a typo:V3->v3
|
2014-07-30 16:11:39 +08:00 |
heliclei
|
add9e3a63e
|
fix typo:V3->v3
|
2014-07-30 16:11:07 +08:00 |
andyque
|
7bcb31f225
|
refactor loadingBar
|
2014-07-30 16:08:29 +08:00 |
andyque
|
c5d2585049
|
refactor Slider control
|
2014-07-30 15:52:27 +08:00 |
minggo
|
e640450104
|
Merge pull request #7625 from CocosRobot/update_cocosfiles_1406706675
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-07-30 15:52:18 +08:00 |
CocosRobot
|
6dd02ade69
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-07-30 07:51:17 +00:00 |
minggo
|
8fe5ea390d
|
Merge pull request #7624 from natural-law/gen-prebuilt-script
Add tools to generate prebuilt engine for Cocos Engine.
|
2014-07-30 15:49:27 +08:00 |
zhangbin
|
5ea318a7df
|
Merge branch 'v3' into gen-prebuilt-script
|
2014-07-30 15:46:14 +08:00 |
zhangbin
|
f8a7e70000
|
Add tools to generate prebuilt engine for Cocos Engine.
|
2014-07-30 15:44:15 +08:00 |
andyque
|
6492167974
|
refactor ImageView
|
2014-07-30 15:27:18 +08:00 |
andyque
|
a6e376f93c
|
refactor UIButton
|
2014-07-30 15:19:39 +08:00 |
Huabing.Xu
|
428e9b1b1a
|
Merge branch 'v3' into v3_buildAllTarget
|
2014-07-30 14:12:28 +08:00 |
Ningyu
|
61a87e7e8b
|
fix LabelTTF::getBoundingBox() position error
|
2014-07-30 14:00:01 +08:00 |
andyque
|
f2b0528cc9
|
refactor
|
2014-07-30 10:45:35 +08:00 |
andyque
|
e7da7b3e42
|
change unsigned long to size_type
|
2014-07-30 10:34:37 +08:00 |
andyque
|
7abea5dc58
|
add utf8 support for UITextField
|
2014-07-30 10:34:37 +08:00 |
andyque
|
955da5d3cc
|
move utf8_substr to ui::helper class.
|
2014-07-30 10:34:37 +08:00 |
andyque
|
4a40604955
|
refactor getScale9Enabled to isScale9Enabled
|
2014-07-30 10:31:40 +08:00 |
minggo
|
57859beb68
|
[ci skip]
|
2014-07-30 09:51:18 +08:00 |
minggo
|
b3c2e45da7
|
Merge pull request #7621 from CocosRobot/update_cocosfiles_1406683706
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-07-30 09:48:20 +08:00 |
minggo
|
e99879467d
|
Merge pull request #7620 from heliclei/jenkins-ios-build
remove xcode shared scheme from code base
|
2014-07-30 09:48:02 +08:00 |
CocosRobot
|
06d43ed2fd
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-07-30 01:28:27 +00:00 |
minggo
|
d56052074b
|
Merge pull request #7619 from andyque/addUIScale9Sprite
Add ui scale9 sprite
|
2014-07-30 09:27:17 +08:00 |
heliclei
|
9c76c59e6f
|
resolve conflits
|
2014-07-29 18:48:57 +08:00 |
heliclei
|
77a8d96f37
|
remove xcode shared scheme from code base
|
2014-07-29 18:39:16 +08:00 |
Huabing.Xu
|
d86cc0a811
|
decouple libcocos2d and cocosdenshion
|
2014-07-29 18:08:40 +08:00 |
andyque
|
5a22636441
|
fix windows compile error
|
2014-07-29 17:51:34 +08:00 |
Ningyu
|
aebe8317bd
|
spaces
|
2014-07-29 17:22:13 +08:00 |
Ningyu
|
d5242ef4fa
|
add
SpriteFrameCache::addSpriteFramesWithFileContent()
SpriteFrameCache::removeSpriteFramesFromFileContent()
|
2014-07-29 17:06:43 +08:00 |
Ningyu
|
23e0ed3767
|
add
SpriteFrameCache::addSpriteFramesWithFileContent()
SpriteFrameCache::removeSpriteFramesFromFileContent()
|
2014-07-29 16:58:33 +08:00 |