2youyouo2
|
034aa113cf
|
fixed mac templates
|
2016-08-03 14:11:15 +08:00 |
|
zhangbin
|
7116026244
|
Support show the object group in TiledMap.
|
2016-08-02 11:42:50 +08:00 |
|
CocosRobot
|
88fec60ea0
|
[ci skip][AUTO]: updating jsbinding automatically
|
2016-08-01 03:40:13 +00:00 |
|
zhangbin
|
dc6a6d67b2
|
Add interface for set the tiles opacity of TiledLayer.
|
2016-08-01 11:26:26 +08:00 |
|
Wang Nan
|
2937626b52
|
Merge pull request #261 from hylthink/develop
update cocos2d-console commit:fault-tolerant for cocos package
|
2016-07-30 09:45:35 +08:00 |
|
yanli.huang
|
4f08f963e5
|
update cocos2d-console commit
1.add mode param when call cocos package encrypt
2.fault-tolerant. call encrypt if and only if used cocos package to import plugin
|
2016-07-29 18:40:58 +08:00 |
|
Wang Nan
|
5c9aacdc41
|
Merge pull request #260 from CocosRobot/update_js_bindings_1469780871
[ci skip][AUTO]: updating jsbinding automatically
|
2016-07-29 16:32:40 +08:00 |
|
CocosRobot
|
2679a2dd4e
|
[ci skip][AUTO]: updating jsbinding automatically
|
2016-07-29 08:32:12 +00:00 |
|
CocosRobot
|
62f4151c05
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2016-07-29 08:24:50 +00:00 |
|
Nan Wang
|
b154e2c69f
|
update travis tracking branch
|
2016-07-29 16:23:45 +08:00 |
|
Wang Nan
|
1d50ce81bc
|
Merge pull request #257 from hylthink/develop
fix: proj.android-studio compiled failed
|
2016-07-29 10:53:19 +08:00 |
|
yanli.huang
|
af7ff67577
|
fix: proj.android-studio compiled failed
|
2016-07-28 22:18:18 +08:00 |
|
Huabing.Xu
|
133dbd15a2
|
Merge branch 'develop' into add_image_lib_ios
# Conflicts:
# external/config.json
|
2016-07-28 18:43:55 +08:00 |
|
Huabing.Xu
|
8deb220332
|
update external version
|
2016-07-28 18:39:52 +08:00 |
|
Huabing.Xu
|
18fc27ced1
|
add image lib file back
|
2016-07-28 18:37:40 +08:00 |
|
yanli.huang
|
44796089f7
|
Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into develop
|
2016-07-28 13:57:19 +08:00 |
|
yanli.huang
|
4fb94eef21
|
strip anysdk from template.add anysdk by copy way
|
2016-07-28 13:56:06 +08:00 |
|
Nan Wang
|
6afe3f0b5d
|
revert websocket change to support ipv6 network.
|
2016-07-27 18:12:19 +08:00 |
|
Wang Nan
|
79879abbc7
|
Merge pull request #253 from natural-law/develop
Modify the build tools version config in libcocos2dx android studio project.
|
2016-07-27 16:48:03 +08:00 |
|
zhangbin
|
b322f91111
|
Modify the build tools version config in libcocos2dx android studio project.
|
2016-07-27 16:38:29 +08:00 |
|
2youyouo2
|
b90fa73948
|
upload missed files
|
2016-07-27 16:26:10 +08:00 |
|
Wang Nan
|
1f39de9c61
|
Merge pull request #249 from zilongshanren/add-webview-support
Add webview support https support
|
2016-07-27 10:08:49 +08:00 |
|
Wang Nan
|
eb907fb74d
|
Merge pull request #250 from natural-law/issue3722
Solve the error when compiling android with API Level 23.
|
2016-07-27 10:06:29 +08:00 |
|
Wang Nan
|
cdfc02a5fe
|
Merge pull request #251 from hylthink/develop
update cocos2d-console commit:
|
2016-07-27 10:04:55 +08:00 |
|
yanli.huang
|
1931d6e2e1
|
update cocos2d-console commit:
fix: Interrupt to compile when cocos package prompted user to update
|
2016-07-26 18:30:41 +08:00 |
|
zhangbin
|
23636a25b0
|
Solve the error when compiling android with API Level 23.
|
2016-07-26 13:50:01 +08:00 |
|
zilongshanren
|
2da7f90163
|
fix webview load https URL
|
2016-07-25 17:48:08 +08:00 |
|
zilongshanren
|
b9533c134c
|
change webview EventType type
|
2016-07-25 16:04:34 +08:00 |
|
Wang Nan
|
00cfa433ed
|
Merge pull request #247 from hylthink/develop
update coco2d-console commit
|
2016-07-22 18:05:00 +08:00 |
|
yanli.huang
|
ed3f9618ee
|
update coco2d-console commit
|
2016-07-22 17:42:42 +08:00 |
|
2youyouo2
|
bd6ab8f06c
|
fixed typo
|
2016-07-22 15:20:49 +08:00 |
|
yanli.huang
|
1b0f781b81
|
add extensions/anysdk/js-bindings
remove anysdk js-binding files
|
2016-07-22 14:09:56 +08:00 |
|
yanli.huang
|
063bd27a6a
|
Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into develop
|
2016-07-22 11:37:04 +08:00 |
|
yanli.huang
|
c2427763e9
|
update console commit
|
2016-07-22 11:35:23 +08:00 |
|
Wang Nan
|
74d4a58456
|
Merge pull request #243 from hylthink/develop
add anysdk to templates
|
2016-07-22 11:24:59 +08:00 |
|
pandamicro
|
52fba54022
|
Merge pull request #242 from dabingnn/fix_s9Sprite_texel_strech
fix texel strech in scale9 sprite
|
2016-07-22 10:56:22 +08:00 |
|
yanli.huang
|
4791b1e16b
|
Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into develop
|
2016-07-21 18:26:55 +08:00 |
|
yanli.huang
|
129ff49e0c
|
update external version
|
2016-07-21 18:25:39 +08:00 |
|
yanli.huang
|
d0d6066166
|
allow to copy proj.android/libs in js-template-binary
|
2016-07-21 18:25:17 +08:00 |
|
Huabing.Xu
|
3c45d2fc48
|
fix texel strech in scale9 sprite
|
2016-07-21 16:59:54 +08:00 |
|
yanli.huang
|
9f916841fe
|
Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into develop
Conflicts:
templates/js-template-binary/frameworks/runtime-src/Classes/AppDelegate.cpp
templates/js-template-binary/frameworks/runtime-src/proj.android/jni/Android.mk
templates/js-template-binary/frameworks/runtime-src/proj.android/jni/hellojavascript/main.cpp
templates/js-template-binary/frameworks/runtime-src/proj.android/src/org/cocos2dx/javascript/AppActivity.java
templates/js-template-binary/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
|
2016-07-21 16:11:50 +08:00 |
|
Nan Wang
|
d4ea8e046d
|
fix editbox win32 return callback function
|
2016-07-21 15:50:52 +08:00 |
|
pandamicro
|
92bfe3931d
|
Merge pull request #240 from natural-law/issue3622
Solve the error content size of hex tiled map.
|
2016-07-21 13:59:25 +08:00 |
|
Wang Nan
|
b1845e70c3
|
Merge pull request #239 from knoxHuang/develop
add schedule jsb_binding for #fireball/issues/3669
|
2016-07-21 12:23:11 +08:00 |
|
zhangbin
|
ea873c0347
|
Solve the error content size of hex tiled map.
|
2016-07-21 09:47:31 +08:00 |
|
knoxHuang
|
8ff7482dfb
|
add schedule jsb_binding for #fireball/issues/3669
1. pauseAllTargets
2. pauseAllTargetsWithMinPriority
3. resumeTargets
|
2016-07-20 20:39:07 +08:00 |
|
Wang Nan
|
bcfd480808
|
Merge pull request #233 from 2youyou2/graphics
fixed graphics crash on windows
|
2016-07-20 18:57:10 +08:00 |
|
子龙山人
|
cc6397768c
|
Merge pull request #234 from zilongshanren/add-return-key-event-editbox
add return key event
|
2016-07-20 17:48:12 +08:00 |
|
yanli.huang
|
cdc643a22c
|
remove local information
|
2016-07-20 11:43:35 +08:00 |
|
minggo
|
835acc20c8
|
fix crash
|
2016-07-20 10:40:09 +08:00 |
|