zilongshanren
a45d0f5772
add travis build status to develop branch
2016-05-06 16:22:28 +08:00
zilongshanren
d366a8d1bb
make travis working
2016-05-06 16:10:43 +08:00
zilongshanren
85530c17ff
use https instead of git protobol
2016-05-06 16:07:06 +08:00
zilongshanren
f55fbc20f3
update bindings-generator from creator org
2016-05-06 15:52:04 +08:00
zilongshanren
4f42d3a5ca
add travis scripts back.
...
1. it also fix generate cocos files and bindings code
2016-05-06 14:54:19 +08:00
Wang Nan
e2dc36bc15
Merge pull request #50 from 2youyouo2/ios
...
fixed xcode iOS project
2016-05-03 16:43:42 +08:00
Wang Nan
99e2712fb0
Merge pull request #52 from nantas/develop
...
add dll and script files to simulator generation task
2016-05-03 16:43:26 +08:00
Nan Wang
3c45af03d0
add copy dll task to simulator generation
2016-05-03 15:08:59 +08:00
Nan Wang
3d5af81716
update make-simulator task
2016-05-03 14:34:31 +08:00
2youyouo2
4a7b42fc3f
update simulator config.json
2016-05-03 14:33:33 +08:00
Nan Wang
b5c762b826
add update simulator script
2016-05-03 14:31:03 +08:00
2youyouo2
006a757287
fixed xcode iOS project
2016-05-03 11:56:28 +08:00
yinkaile
ac688a8b64
fixed jsb DrawNode ( #46 )
...
Fixed jsb DrawNode
2016-04-27 19:54:03 +08:00
Nan Wang
b3f41a6105
Add workflow to generate release package, prebuilt libs and simulator
2016-04-21 16:22:21 +08:00
Wenhai Lin
3a0182af2d
Merge pull request #37 from 2youyouo2/develop
...
sync master
2016-04-20 17:38:59 +08:00
2youyou2
68efc67897
fixed default-template release build on windows
2016-04-20 16:02:58 +08:00
Wenhai Lin
d4ceee3f97
Merge pull request #36 from WenhaiLin/master
...
Bug fix:
2016-04-19 16:35:35 +08:00
Wenhai Lin
e6e2d22724
Bug fix:
...
1.Downloader crash when storage path contains spaces on iOS
2.Memory leak when read empty file
3.Actions may not have been executed
4.TMXXMLParser::TMXObjectInfo support "id" key
2016-04-19 16:33:21 +08:00
Wenhai Lin
cb4b2d3287
Merge pull request #35 from WenhaiLin/master
...
Update the submodule `bindings-generator`
2016-04-19 14:52:04 +08:00
Wenhai Lin
0abea90927
Update the submodule bindings-generator
2016-04-19 14:50:46 +08:00
Wenhai Lin
bb34271106
Merge pull request #34 from WenhaiLin/master
...
Update JS bindings and support generate JS bindings by NDK r11+.
2016-04-19 14:39:40 +08:00
Wenhai Lin
7bf60cb53e
Update JS bindings and support generate JS bindings by NDK r11+.
2016-04-19 14:36:00 +08:00
Wenhai Lin
32212a9f6d
Merge pull request #33 from WenhaiLin/master-merge-develop
...
Merge 'develop' branch
2016-04-19 14:21:32 +08:00
Wenhai Lin
af590ad982
Add Image::setPNGPremultipliedAlphaEnabled
2016-04-19 14:15:01 +08:00
Wenhai Lin
822966e820
Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into md
2016-04-19 10:05:02 +08:00
Wenhai Lin
0020f322e3
Merge pull request #32 from WenhaiLin/master
...
Bug fix:1.Set music volume control as default 2.Fix calculation of base64Encode outLength
2016-04-19 09:45:16 +08:00
Wenhai Lin
19e9c085e0
Bug fix:1.Set music volume control as default 2.Fix calculation of base64Encode outLength
2016-04-18 23:49:35 +08:00
Wenhai Lin
6b6481a419
Merge pull request #31 from WenhaiLin/master
...
Fixed memory leak
2016-04-18 16:18:35 +08:00
Wenhai Lin
2c3bfd1cef
Fixed memory leak
2016-04-18 16:16:17 +08:00
Wenhai Lin
beab51da67
Merge pull request #30 from WenhaiLin/master
...
Fixed typo in UILayout using clipping rect x instead of y coordinate
2016-04-18 11:51:19 +08:00
Wenhai Lin
48dbfc4609
Fixed typo in UILayout using clipping rect x instead of y coordinate
2016-04-18 11:50:04 +08:00
Wenhai Lin
f39a4cdf6f
Merge pull request #29 from WenhaiLin/master
...
Fixed memory leak
2016-04-18 11:09:15 +08:00
Wenhai Lin
efc97073e3
Fixed memory leak
2016-04-18 11:06:14 +08:00
Wenhai Lin
b2de804fd6
Merge pull request #28 from 2youyouo2/develop
...
sync creator changes
2016-04-18 10:47:45 +08:00
2youyouo2
1402d72199
update cocos console
2016-04-18 10:03:20 +08:00
2youyouo2
d7c0d62048
fixed Scale9SpriteV2
2016-04-18 09:38:15 +08:00
2youyouo2
8bffa116e6
remove ccs files
2016-04-16 14:16:08 +08:00
2youyou2
27ca2402d6
Merge branch 'develop' of github.com:2youyouo2/cocos2d-x-lite into develop
2016-04-15 18:37:53 +08:00
2youyou2
c0c754169d
fixed win32
2016-04-15 18:37:13 +08:00
2youyouo2
38b01891bd
fixed binary template
2016-04-15 18:36:21 +08:00
2youyouo2
b2571ab431
register creator job
2016-04-15 11:15:55 +08:00
2youyouo2
fd876c82f9
fixed mac simulator
2016-04-15 10:36:44 +08:00
2youyouo2
389e91893b
Merge branch 'master' of github.com:cocos-creator/cocos2d-x-lite into develop
2016-04-15 10:33:12 +08:00
Wenhai Lin
780904fd53
Merge pull request #27 from WenhaiLin/master
...
Fixed crash on win32\mac
2016-04-15 10:27:48 +08:00
Wenhai Lin
4099c18dc3
Fixed crash on win32\mac
2016-04-15 10:25:32 +08:00
Wenhai Lin
6bd0eb769b
Merge pull request #26 from WenhaiLin/master
...
Fixed memory leak
2016-04-14 23:42:55 +08:00
Wenhai Lin
e572df8a55
Fixed memory leak
2016-04-14 23:41:46 +08:00
2youyou2
4cabfc4e45
update win32 project
2016-04-14 18:56:00 +08:00
2youyou2
836cc2608c
Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x-lite into develop
2016-04-14 15:44:35 +08:00
2youyou2
f0b4ece40d
update cocos2dx_files.json
2016-04-14 15:44:10 +08:00