Johnny Wu
118f9fc2c8
Merge branch 'master' of github.com:cocos-creator/engine into inspector
2016-07-18 10:05:20 +08:00
Jare Guo
a66aee3f31
Merge pull request #896 from jareguo/attr
...
reimplement attribute system
2016-07-18 10:04:50 +08:00
Wang Nan
88a2a7bd6a
Merge pull request #890 from 2youyou2/collision
...
add group-changed event
2016-07-16 17:01:22 +08:00
Wang Nan
95de9426f9
Merge pull request #916 from pandamicro/webgl
...
Add culling for Sprite & Label
2016-07-16 16:57:30 +08:00
pandamicro
321e9d13ca
Add culling for Sprite & Label Canvas render command, fix issues
2016-07-15 15:50:55 +08:00
pandamicro
a06a9b7ff4
Merge pull request #900 from pandamicro/webgl
...
Upgrade WebGL Renderer with auto batching
2016-07-15 13:52:30 +08:00
pandamicro
13c66797ab
Use renderCmd _needDraw for culling in Scale9Sprite & Label
2016-07-15 13:50:43 +08:00
pandamicro
c12cdf75f8
Fix uv calculation issue when sprite frame is rotated
2016-07-15 13:48:30 +08:00
pandamicro
f970bfcbb9
Improve WebGL renderer
2016-07-14 19:53:59 +08:00
Johnny Wu
2d60ac2c2b
Merge branch 'master' of github.com:cocos-creator/engine into inspector
2016-07-14 14:37:33 +08:00
Jare Guo
7a7137c12b
deprecating js.addon
2016-07-13 15:51:43 +08:00
Jare Guo
ce8ee75ce7
reimplement attribute system
2016-07-13 15:39:53 +08:00
Jare Guo
fc9d7eec1f
Merge pull request #888 from jareguo/master
...
deferred load scene's raw asset
2016-07-13 14:52:22 +08:00
pandamicro
4ef771c043
Fix remained issues in new renderer
2016-07-13 14:04:25 +08:00
pandamicro
6f61fd0e8c
Revert defensive code in Node getComponent[s]
2016-07-13 14:04:25 +08:00
pandamicro
5184af585c
Fix Sprite Canvas render command
2016-07-12 18:29:56 +08:00
Johnny Wu
8230fdd797
Merge branch 'master' of github.com:cocos-creator/engine into inspector
2016-07-12 18:24:09 +08:00
Johnny Wu
a462ce79e4
change inspector url
2016-07-12 18:22:28 +08:00
pandamicro
b4e6234010
Issue fixes
2016-07-12 16:33:52 +08:00
pandamicro
07e592dced
Upgrade Scale9Sprite renderer & set index buffer dynamically
2016-07-12 16:33:52 +08:00
pandamicro
c532c09eff
Merge Cocos2d-html5 v3.12 webgl renderer
2016-07-12 16:33:51 +08:00
Jare Guo
6b21bb1400
fix unit test
2016-07-12 16:28:35 +08:00
Jare Guo
f335780ac9
fix unit tests
2016-07-11 15:06:30 +08:00
2youyouo2
de6a5998d5
refine code
2016-07-11 13:54:39 +08:00
2youyouo2
56ca0c3c5d
refine code
2016-07-11 11:59:03 +08:00
2youyouo2
4c2a62649d
refine code
2016-07-11 11:39:59 +08:00
2youyouo2
b328983cef
add group-changed event
2016-07-11 11:24:19 +08:00
Jare Guo
ef436d9da4
deferred load scene's raw asset
2016-07-08 17:15:57 +08:00
Jare Guo
3fce900878
Merge pull request #873 from jareguo/master
...
refactoring loadDepends
2016-07-08 17:10:30 +08:00
pandamicro
7c170b69d5
Merge pull request #866 from dabingnn/optimise_canvas_rendering
...
Optimise canvas rendering
2016-07-08 11:44:39 +08:00
Wang Nan
3b787c7e86
Merge pull request #883 from cocos-creator/v1.1
...
merge V1.1
2016-07-07 16:47:57 +08:00
Nan Wang
afa335e00d
fix api comment syntax error
2016-07-07 14:17:33 +08:00
Huabing.Xu
8a23b9a6ee
clean up code
2016-07-07 11:37:11 +08:00
2youyouo2
99ab711182
use new Float32Array(buffer, byteOffset, length) instead of Array.prototype.slice.call
2016-07-07 11:12:08 +08:00
Huabing.Xu
57e81b1211
particle works on dirty region
2016-07-07 09:43:42 +08:00
Jare Guo
4f44b1f3e6
Merge pull request #879 from zilongshanren/fix-scrollview-scroll-issues
...
stop scroll when scrollview is disabled
2016-07-07 09:36:03 +08:00
Jare Guo
dd9a2ec17d
fix runtime preload
2016-07-06 23:05:59 +08:00
zilongshanren
f3f121b6e2
stop scroll when scrollview is disabled
2016-07-06 18:51:46 +08:00
Wang Nan
1e181ddab4
Merge pull request #878 from zilongshanren/improve-label-shrink-algorithm
...
fix editbox can't be clicked on top of scrollview
2016-07-06 18:12:05 +08:00
zilongshanren
7bf63124d7
fix editbox can't be clicked on top of scrollview
2016-07-06 18:06:46 +08:00
Wang Nan
8c7383a462
Merge pull request #877 from zilongshanren/improve-label-shrink-algorithm
...
fix some bugs of shrink label and improve performance
2016-07-06 17:46:44 +08:00
zilongshanren
09c80402ba
fix some bugs of shrink label
...
it also improve the perfomance issue of shrinked label
calculate font size divide by 2
add font height cache
keep the label lineheight the same as before
2016-07-06 17:39:21 +08:00
knoxHuang
bc75b07c4b
fix setClearColor code for #fireball/issues/3535
2016-07-05 18:19:58 +08:00
Jare Guo
cf8922e70f
refactoring loadDepends
2016-07-05 18:11:40 +08:00
Huabing.Xu
7336c7f2ba
add comments for dirty region
2016-07-05 17:45:58 +08:00
Huabing.Xu
01d6e99a11
optimise region creation and releasing
2016-07-05 17:12:54 +08:00
Wang Nan
c8fe562a91
Merge pull request #872 from cocos-creator/v1.1
...
merge V1.1
2016-07-05 16:14:05 +08:00
Huabing.Xu
26e8d7fcdb
roll back scaleX scaleY
2016-07-05 15:41:08 +08:00
Huabing.Xu
176f900180
add debug dirty region variable
2016-07-05 15:22:19 +08:00
Nan Wang
90446d106c
move pipeline flowin before callback to prevent circular reference of prefab when loading scene.
2016-07-05 14:15:04 +08:00