pandamicro
|
e59bf5e742
|
Fix texture pixelWidth & pixelHeight property issue in JSB
|
2016-07-21 10:39:34 +08:00 |
|
pandamicro
|
e161341df9
|
Update JSB downloaders
|
2016-07-21 10:39:07 +08:00 |
|
pandamicro
|
b3540f3fad
|
Fix touch start point being updated issue
|
2016-07-21 10:38:33 +08:00 |
|
pandamicro
|
7420fca705
|
Disable webgl on android uc
|
2016-07-21 10:38:08 +08:00 |
|
pandamicro
|
72c3b62ce6
|
Merge pull request #926 from pandamicro/webgl
Fix Tilemap opacity not used issue
|
2016-07-19 16:16:12 +08:00 |
|
pandamicro
|
deddde866a
|
Fix webgl rendering issue and clipping issue of Tilemap
|
2016-07-19 15:46:40 +08:00 |
|
pandamicro
|
d7aa3a0480
|
Fix Tilemap opacity not used issue
|
2016-07-19 14:43:18 +08:00 |
|
Nan Wang
|
41afb088b8
|
update engine version
|
2016-07-19 12:21:18 +08:00 |
|
Nan Wang
|
1f7adb2c5c
|
merge v1.1 fixes
|
2016-07-19 10:04:06 +08:00 |
|
Wang Nan
|
d509433093
|
Merge pull request #922 from 2youyou2/preserveDrawingBuffer
remove preserveDrawingBuffer flag
|
2016-07-18 18:11:22 +08:00 |
|
Wang Nan
|
e6201c7ffc
|
Merge pull request #923 from zilongshanren/refactoring-layout-widget-label
refactoring layout and label update timing
|
2016-07-18 17:24:03 +08:00 |
|
zilongshanren
|
5f350544ac
|
refactoring layout and label update timing
|
2016-07-18 16:57:40 +08:00 |
|
Jare Guo
|
dbd1ff6e55
|
Merge pull request #921 from jareguo/v1.1
should not reset arrivalOrder of cc.Node
|
2016-07-18 16:19:46 +08:00 |
|
2youyouo2
|
f7270316c5
|
remove preserveDrawingBuffer flag
|
2016-07-18 15:56:20 +08:00 |
|
Jare Guo
|
ae11027272
|
should not reset arrivalOrder of cc.Node
|
2016-07-18 14:50:52 +08:00 |
|
pandamicro
|
d39b6f8972
|
Merge pull request #895 from zilongshanren/improve-editbox-robust
fix jsb ECS hirarchy not change issue
|
2016-07-18 13:54:22 +08:00 |
|
Nan Wang
|
4f67175e9e
|
update engine version
|
2016-07-18 11:25:23 +08:00 |
|
Wu Jie
|
ab4dd29d66
|
Merge pull request #919 from cocos-creator/inspector
New Inspector
|
2016-07-18 10:22:04 +08:00 |
|
Johnny Wu
|
b5b65faee5
|
fix tap can not be detected
|
2016-07-18 10:19:27 +08:00 |
|
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 |
|
Jare Guo
|
4d3792254f
|
Merge pull request #917 from jareguo/v1.1
should not destroy persistRootNode
|
2016-07-18 09:33:16 +08:00 |
|
pandamicro
|
0a21eca751
|
Merge pull request #918 from jareguo/temp
node._reorderChildDirty should not be serializable
|
2016-07-17 21:04:35 +08:00 |
|
Jare Guo
|
1b3dbc678f
|
node._reorderChildDirty should not be serializable
|
2016-07-16 17:38:10 +08:00 |
|
Wang Nan
|
88a2a7bd6a
|
Merge pull request #890 from 2youyou2/collision
add group-changed event
|
2016-07-16 17:01:22 +08:00 |
|
Jare Guo
|
768ac4d28c
|
should not destroy persistRootNode
|
2016-07-16 17:00:50 +08:00 |
|
Wang Nan
|
e863c83861
|
Merge pull request #899 from zilongshanren/improve-editbox-mobile-experience
improve mobile input keyboard display
|
2016-07-16 16:59:13 +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 |
|
Jare Guo
|
bae753f73a
|
Merge pull request #915 from zilongshanren/fix-button-interactive-issue
fix button change interactable in event callback
|
2016-07-15 15:16:29 +08:00 |
|
zilongshanren
|
511c643718
|
fix button change interactable in event callback
|
2016-07-15 15:14:41 +08:00 |
|
Jare Guo
|
d683b89dc1
|
Merge pull request #912 from zilongshanren/fix-scrollview-layout
only do layout when layout is active in scrollview
|
2016-07-15 14:20:21 +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 |
|
Jare Guo
|
abbc72eee3
|
Merge pull request #914 from knoxHuang/v1.1
fix playMusic API for CCAudio
|
2016-07-15 10:32:01 +08:00 |
|
knoxHuang
|
5ccece1765
|
fix playMusic API for CCAudio
|
2016-07-15 10:28:02 +08:00 |
|
pandamicro
|
7ef63a18df
|
Merge pull request #909 from knoxHuang/v1.1
remove dumpInfo log for configuration
|
2016-07-15 10:26:35 +08:00 |
|
Jare Guo
|
61e7e21141
|
Merge pull request #913 from jareguo/temp
fix unit test (cherry pick from master)
|
2016-07-15 09:59:01 +08:00 |
|
Jare Guo
|
1034e0c315
|
Merge pull request #911 from zilongshanren/fix-prefab-editbox-issue
fix dom element cleanup issue on Web
|
2016-07-15 09:57:10 +08:00 |
|
zilongshanren
|
8cc9291a53
|
remove unneeded if
|
2016-07-15 09:56:31 +08:00 |
|
Jare Guo
|
dea15aa33a
|
fix unit test (cherry pick from master)
|
2016-07-15 09:53:32 +08:00 |
|
Jare Guo
|
ab31b9136f
|
Merge pull request #907 from jareguo/v1.1
pasted component should ordered after its required
|
2016-07-15 09:39:33 +08:00 |
|
zilongshanren
|
45443cf365
|
only do layout when layout is active in scrollview
|
2016-07-15 09:39:27 +08:00 |
|
pandamicro
|
f970bfcbb9
|
Improve WebGL renderer
|
2016-07-14 19:53:59 +08:00 |
|
zilongshanren
|
e82de8066b
|
fix dom element cleanup issue on Web
Fixes issue: https://github.com/cocos-creator/fireball/issues/3590
|
2016-07-14 17:28:16 +08:00 |
|
Wang Nan
|
562b0eec64
|
Merge pull request #910 from zilongshanren/add-stop-autoscroll-api
add stopAutoScroll API for scrollview
|
2016-07-14 16:56:30 +08:00 |
|
zilongshanren
|
ea0dbacde5
|
add stopAutoScroll API for scrollview
Fixed: https://github.com/cocos-creator/fireball/issues/1829
|
2016-07-14 15:27:02 +08:00 |
|
knoxHuang
|
0fef6a40e2
|
remove dumpInfo log for configuration
|
2016-07-14 14:56:46 +08:00 |
|
pandamicro
|
fd811d51b1
|
Merge pull request #891 from jareguo/isAlignOnce
widget.isAlignOnce should be considered in animation mode
|
2016-07-14 14:49:14 +08:00 |
|