zilongshanren
|
ca07275bb4
|
add eslint
|
2016-07-27 12:01:19 +08:00 |
|
zilongshanren
|
2036a6e99b
|
simplify webview event handler
|
2016-07-26 18:29:19 +08:00 |
|
zilongshanren
|
269cf15fb0
|
add tooltip and fix api docs
|
2016-07-26 18:11:03 +08:00 |
|
Jare Guo
|
b2038d1513
|
Merge pull request #948 from zilongshanren/add-webview-support
Add webview support
|
2016-07-26 15:52:07 +08:00 |
|
pandamicro
|
0ee15a7037
|
Merge pull request #954 from jareguo/master
set max download concurrent for all platforms
|
2016-07-26 14:43:26 +08:00 |
|
Jare Guo
|
7d903a1f93
|
set max download concurrent for all platforms
|
2016-07-26 12:57:24 +08:00 |
|
pandamicro
|
a51dc0bb6d
|
Merge pull request #950 from pandamicro/master
Improve Scale9Sprite calculation performance
|
2016-07-26 12:22:15 +08:00 |
|
pandamicro
|
e73e54f5ff
|
Reverse changes to instantiateProps
|
2016-07-26 12:17:58 +08:00 |
|
pandamicro
|
9c2aff5e59
|
Fix scale 9 sprite unit test
|
2016-07-26 12:17:58 +08:00 |
|
pandamicro
|
786aae553e
|
Slightly improve instantiateProps
|
2016-07-26 12:17:57 +08:00 |
|
pandamicro
|
69b6032686
|
Improve Scale9Sprite calculation performance
|
2016-07-26 12:17:57 +08:00 |
|
pandamicro
|
4e9e7ec860
|
Merge pull request #949 from dabingnn/fix_dirtyRegion
fix scale9sprite not draw when dirty region is enabled
|
2016-07-26 12:10:42 +08:00 |
|
Jare Guo
|
ac1cd0a13b
|
Merge pull request #953 from VisualSJ/master
clear .cache
|
2016-07-26 12:01:34 +08:00 |
|
Jare Guo
|
db91018c7b
|
Merge pull request #952 from 2youyou2/math
add math polyfill
|
2016-07-26 11:58:24 +08:00 |
|
VisualSJ
|
7bd018aa94
|
clear .cache
|
2016-07-26 11:51:31 +08:00 |
|
2youyouo2
|
ba64d5ac7a
|
add math polypill
|
2016-07-26 11:42:20 +08:00 |
|
zilongshanren
|
628e6c2962
|
refine webview
|
2016-07-26 11:40:17 +08:00 |
|
Huabing.Xu
|
a9c123ef5e
|
fix scale9sprite not draw when dirty region is enabled
|
2016-07-25 18:04:40 +08:00 |
|
zilongshanren
|
bf082642ff
|
fix web enum on Mac and Windows
1. add more events to webview
|
2016-07-25 17:55:13 +08:00 |
|
Jare Guo
|
09ba6baff0
|
Merge pull request #947 from 2youyou2/animatingInEditMode
fixed animatingInEditMode
|
2016-07-25 17:22:19 +08:00 |
|
2youyouo2
|
2162042202
|
refine code
|
2016-07-25 17:18:06 +08:00 |
|
2youyouo2
|
2dd8112de1
|
fixed animatingInEditMode
|
2016-07-25 16:27:29 +08:00 |
|
zilongshanren
|
f738204e1b
|
fix a few webview related issues
|
2016-07-25 15:46:26 +08:00 |
|
Nan Wang
|
380bc05666
|
update engine version
|
2016-07-25 10:52:01 +08:00 |
|
zilongshanren
|
bcb269cfa4
|
Merge remote-tracking branch 'fireball/master' into add-webview-support
|
2016-07-25 10:49:34 +08:00 |
|
zilongshanren
|
a5deddc3b3
|
improve webivew
|
2016-07-25 10:49:17 +08:00 |
|
Jare Guo
|
d328bb1419
|
Merge pull request #943 from zilongshanren/fix-editbox-ios-popup
fix editbox window popup issue on iOS9
|
2016-07-22 17:53:44 +08:00 |
|
Wang Nan
|
638a529c81
|
Merge pull request #939 from 2youyou2/animation
support animation callback
|
2016-07-22 16:25:47 +08:00 |
|
Wang Nan
|
f8e723c4c9
|
Merge pull request #944 from VisualSJ/master
添加视频事件的说明描述
|
2016-07-22 15:32:09 +08:00 |
|
2youyouo2
|
fd7daf3440
|
should not auto play default animation if it is disabled
|
2016-07-22 15:11:08 +08:00 |
|
2youyouo2
|
ceadbdbfa3
|
support animation callback
|
2016-07-22 15:10:14 +08:00 |
|
pandamicro
|
a2eefba043
|
Merge pull request #945 from pandamicro/master
Fix some issues
|
2016-07-22 15:00:32 +08:00 |
|
pandamicro
|
3454b5506a
|
Fix culling for tile sprite
|
2016-07-22 14:52:28 +08:00 |
|
pandamicro
|
fa0cd9081f
|
Fix scale9sprite unit test
|
2016-07-22 14:51:10 +08:00 |
|
pandamicro
|
bfd3e854d4
|
Fix tile map black border in canvas render mode too
|
2016-07-22 14:50:05 +08:00 |
|
zilongshanren
|
befac0ef1b
|
fix webview initialize size
|
2016-07-22 14:41:43 +08:00 |
|
VisualSJ
|
7595644bfd
|
video event
|
2016-07-22 14:38:28 +08:00 |
|
zilongshanren
|
98ebc6762c
|
move CCWebView to components directory
|
2016-07-22 14:16:24 +08:00 |
|
VisualSJ
|
7f35eaaaab
|
video event
|
2016-07-22 14:15:36 +08:00 |
|
pandamicro
|
f40c73ab96
|
Merge pull request #942 from knoxHuang/master
fix update opacity for fireball/issues/2578
|
2016-07-22 14:11:26 +08:00 |
|
VisualSJ
|
c27dd8f280
|
Add video event description
|
2016-07-22 14:05:38 +08:00 |
|
zilongshanren
|
5ffe28b04b
|
Merge branch 'master_webview' of https://github.com/VisualSJ/engine-1 into add-webview-support
|
2016-07-22 14:01:51 +08:00 |
|
knoxHuang
|
abd2d5aea5
|
fix update opacity for fireball/issues/2578
|
2016-07-22 14:00:06 +08:00 |
|
zilongshanren
|
24690d9b3d
|
fix editbox window popup issue on iOS9
|
2016-07-22 13:54:39 +08:00 |
|
pandamicro
|
728128ce2a
|
Merge pull request #940 from knoxHuang/master
fix schedule bug for #fireball/issues/3686
|
2016-07-22 13:48:45 +08:00 |
|
Jare Guo
|
5bf2537313
|
Merge pull request #941 from jareguo/master
remove cc.isEditor, use CC_EDITOR instead to reduce engine size
|
2016-07-22 12:15:35 +08:00 |
|
Jare Guo
|
bbbb38dc80
|
try to fix unit test
|
2016-07-22 11:54:58 +08:00 |
|
Jare Guo
|
51c4a0756d
|
remove cc.isEditor, use CC_EDITOR instead to reduce engine size
|
2016-07-22 11:44:26 +08:00 |
|
knoxHuang
|
9cb440197c
|
fix schedule bug for #fireball/issues/3686
|
2016-07-22 11:33:02 +08:00 |
|
Jare Guo
|
b521d61650
|
avoid reference error about _Scene.AssetsWatcher
|
2016-07-22 01:09:26 +08:00 |
|