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 |
andyque
|
5a22636441
|
fix windows compile error
|
2014-07-29 17:51:34 +08:00 |
andyque
|
c5ca0dbf10
|
fix android and linux compile error
|
2014-07-29 16:24:27 +08:00 |
andyque
|
1daaea1410
|
remove extension::Scale9Sprite dependency
|
2014-07-29 16:24:27 +08:00 |
andyque
|
ebf05d1acc
|
add UIScale9Sprite tests
|
2014-07-29 16:24:27 +08:00 |
andyque
|
717f20571b
|
add UIScale9Sprite implementation
|
2014-07-29 16:24:27 +08:00 |
andyque
|
32ed796657
|
add UIScale9Sprite
|
2014-07-29 16:24:27 +08:00 |
minggo
|
ba567c05da
|
Merge pull request #7615 from CocosRobot/update_cocosfiles_1406621347
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-07-29 16:14:22 +08:00 |
minggo
|
4c2fd90286
|
Merge pull request #7614 from andyque/fixBindingGenerate
fix binding generator can nott regonize unsigned long arguments
|
2014-07-29 16:13:26 +08:00 |
CocosRobot
|
a743590ac5
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-07-29 08:09:10 +00:00 |
minggo
|
38240b64c5
|
Merge pull request #7612 from dabingnn/v3_copysqllitedll
add script to copy sqllite3.dll to output dir on windows
|
2014-07-29 16:07:27 +08:00 |
andyque
|
98ef180ca8
|
add default value to luaval_to_ulong
|
2014-07-29 15:59:49 +08:00 |
andyque
|
cfe7e57561
|
fix binding generator can nott regonize unsigned long arguments
|
2014-07-29 15:48:12 +08:00 |
Huabing.Xu
|
bca92772dd
|
remove unused windows localstorage project file
|
2014-07-29 15:23:07 +08:00 |
Huabing.Xu
|
ea802580a2
|
add script to copy sqllite3.dll to output dir on windows
|
2014-07-29 15:02:34 +08:00 |
minggo
|
08627dbbe2
|
Merge pull request #7611 from CocosRobot/update_cocosfiles_1406615438
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-07-29 14:31:22 +08:00 |
CocosRobot
|
3d7cced94e
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-07-29 06:30:39 +00:00 |
minggo
|
5d63ce17ad
|
Merge pull request #7610 from dabingnn/v3_windowChangeModule
V3 window change module
|
2014-07-29 14:29:01 +08:00 |
minggo
|
21ea77fb6f
|
[ci skip]
|
2014-07-29 14:04:36 +08:00 |
minggo
|
52dfb7224e
|
Merge pull request #7609 from boyu0/bug5762_setTotalParticles
Closed #5762: ParticleSystemQuad::setTotalParticles() can't set a value larger than the initialized value.
|
2014-07-29 13:55:33 +08:00 |
minggo
|
00346b5efb
|
Merge pull request #7607 from shinriyo/patch-1
typo function
|
2014-07-29 13:47:27 +08:00 |
Huabing.Xu
|
c722c0fcd0
|
libcocostudio for windows
|
2014-07-29 11:31:37 +08:00 |
boyu0
|
1b6cda488a
|
add ParticleResetTotalParticles test.
|
2014-07-29 11:21:11 +08:00 |
Huabing.Xu
|
d53ce4d664
|
libcocosbuilder rename for windows
|
2014-07-29 11:09:17 +08:00 |
Huabing.Xu
|
e91fa0e9fc
|
libcocosbuilder rename for windows
|
2014-07-29 11:09:02 +08:00 |
Huabing.Xu
|
6d0b8852d1
|
libSpine rename for windows
|
2014-07-29 10:53:39 +08:00 |
boyu0
|
c63d64e385
|
set emission rate when setTotalParticles()
|
2014-07-29 10:48:20 +08:00 |
Huabing.Xu
|
aaa65dcae4
|
Merge branch 'v3' into v3_windowChangeModule
|
2014-07-29 10:20:23 +08:00 |
Huabing.Xu
|
eacf003eed
|
change libExtensions for windows
|
2014-07-29 10:07:46 +08:00 |
Huabing.Xu
|
bf287252df
|
change libnetwork and libSpine
|
2014-07-29 09:31:52 +08:00 |
shinriyo
|
3da15a7f92
|
typo function
however it is not the dog.
squirrel....
|
2014-07-29 00:37:55 +09:00 |
Huabing.Xu
|
d6bc2f4998
|
liuGUI->libui for windows
|
2014-07-28 22:12:07 +08:00 |
Huabing.Xu
|
c6956504bf
|
change CocosDenshion to libcocosdenshion
|
2014-07-28 21:35:16 +08:00 |
Huabing.Xu
|
8f9ce2e282
|
change cocosbuilder to lowercase
|
2014-07-28 21:09:43 +08:00 |
Huabing.Xu
|
4a4f05c827
|
change cocos2d to libcocos2d for windows
|
2014-07-28 20:55:58 +08:00 |
minggo
|
ba3a467c3f
|
Merge pull request #7604 from minggo/xcode-project-fix
Xcode project fix
|
2014-07-28 16:17:48 +08:00 |
minggo
|
a5c8450a16
|
Merge pull request #7603 from heliclei/dailybuild-email
[ci skip]send email to report build result
|
2014-07-28 16:00:17 +08:00 |
minggo
|
98b0797c0e
|
add shared xcscheme
|
2014-07-28 15:41:33 +08:00 |
minggo
|
bf6e706ab9
|
fix xcode project setting
|
2014-07-28 15:37:00 +08:00 |
heliclei
|
5b4ca604c2
|
[ci skip]send email to report build result
|
2014-07-28 14:26:49 +08:00 |
minggo
|
cb68b00634
|
[ci skip]
|
2014-07-28 14:16:39 +08:00 |
minggo
|
4249311c0c
|
[ci skip]
|
2014-07-28 14:07:40 +08:00 |
minggo
|
b2e705acd8
|
Merge pull request #7567 from andyque/fixWidgetCallbackDeleteSelf
fix remove self in Widget touch callback issue
|
2014-07-28 14:04:20 +08:00 |
minggo
|
152a9a0464
|
[ci skip]
|
2014-07-28 14:02:16 +08:00 |