Commit Graph

3234 Commits

Author SHA1 Message Date
Wang Nan 33705e72fc Merge pull request #1265 from pandamicro/v1.3
Forbid adding event listener with Component
2016-11-08 11:24:14 +08:00
pandamicro bf4bcf288f Fix indent 2016-11-07 15:37:27 +08:00
pandamicro dba5cf9960 Undo rebind removeListeners 2016-11-06 17:01:49 +08:00
pandamicro 30653200f0 Forbid adding event listener with Component 2016-11-06 16:50:57 +08:00
Jare Guo da12cc622c Merge pull request #1262 from VisualSJ/v1.3_stopAllEffects
setCurrentTime need audioId
2016-11-04 11:56:27 +08:00
VisualSJ 8e2b9e4903 setCurrentTime need audioId 2016-11-04 11:38:49 +08:00
Wang Nan 7add6c1eea Merge pull request #1261 from pandamicro/v1.3
Fix texture issue on Android browser by always set vertexAttribPointer
2016-11-04 11:12:17 +08:00
pandamicro b7af45a766 Fix texture issue on Android browser by always set vertexAttribPointer 2016-11-03 22:24:02 +08:00
pandamicro 72ce74a42a Revert previous solution for Android browser artifact 2016-11-03 22:15:31 +08:00
Jare Guo be03b7d35c Merge pull request #1260 from jareguo/v1.3
should not auto release in editor because scene.dependAssets is unavailable for dynamic scene
2016-11-03 20:53:37 +08:00
Jare Guo 86897c36f7 should not auto release in editor because scene.dependAssets is unabailable for dynamic scene 2016-11-03 20:48:27 +08:00
Wang Nan 3b9f8aacf6 Merge pull request #1259 from pandamicro/v1.3
Remove overwrite in webgl context object
2016-11-03 17:20:47 +08:00
pandamicro 8763920a33 Improve cc.gl state cache functions 2016-11-03 16:12:44 +08:00
pandamicro 369c8d87dc Remove overwrite in webgl context object 2016-11-03 14:59:07 +08:00
Jare Guo 8f0549b20c Merge pull request #1258 from zilongshanren/fix-toggle-group
make at least one toggle is checked
2016-11-03 14:00:11 +08:00
zilongshanren cffffca821 make at least one toggle is checked
when remove toggle from toggle group
2016-11-03 13:48:04 +08:00
Jare Guo c210c4a9a7 Merge pull request #1257 from zilongshanren/fix-toggle-group
fix toggle group initial state
2016-11-03 12:06:19 +08:00
zilongshanren aa5feed9d5 fix toggle group initial state 2016-11-03 12:01:07 +08:00
pandamicro 77b7496ec2 Merge pull request #1255 from pandamicro/v1.3
Fix JSB android acceleration x, y reversed issue
2016-11-01 22:57:07 +08:00
pandamicro 627425a61b Fix JSB android acceleration x, y reversed issue 2016-11-01 22:54:42 +08:00
Jare Guo ccb2dcf083 Merge pull request #1252 from VisualSJ/v1.3
平台判断错误
2016-10-31 14:08:16 +08:00
VisualSJ 44d0208538 review 2016-10-31 13:58:50 +08:00
VisualSJ 8e648a2040 Platform error 2016-10-31 11:59:00 +08:00
Wang Nan ff793505c8 Merge pull request #1250 from VisualSJ/v1.3_audio
audioEnging 排除后,会造成报错
2016-10-28 18:39:16 +08:00
VisualSJ d6543ea51c Merge branch 'v1.3' of github.com:cocos-creator/engine into v1.3 2016-10-28 18:27:37 +08:00
VisualSJ 261d1ecfb1 Fixed exclude audioEngine bug 2016-10-28 18:18:44 +08:00
Wang Nan ac84221c77 Merge pull request #1249 from pandamicro/v1.3
Rerun screen adaptation logic when set orientation
2016-10-28 17:18:38 +08:00
pandamicro dbb41b3633 Rerun screen adaptation logic when set orientation 2016-10-28 16:59:29 +08:00
Nan Wang 35f91d42b4 update version to 1.3.1 2016-10-28 16:54:39 +08:00
Nan Wang 4c3ddd2777 Merge branch 'v1.3' of github.com:cocos-creator/engine into v1.3 2016-10-28 16:06:17 +08:00
Jare Guo afa129a298 Merge pull request #1248 from zilongshanren/optimize-label-property-settings
optimize label same property settings
2016-10-28 14:39:23 +08:00
zilongshanren e947cf0592 optimize label same property settings 2016-10-28 14:11:06 +08:00
Nan Wang 5b0b846a0a Merge branch 'v1.3' of github.com:cocos-creator/engine into v1.3 2016-10-28 13:47:01 +08:00
Wang Nan f453689ca1 Merge pull request #1247 from pandamicro/v1.3
Notify root queue process in child queues for cc.loader.onProgress
2016-10-28 13:42:28 +08:00
pandamicro d1362638ac Notify root queue process in child queues for cc.loader.onProgress 2016-10-28 12:46:19 +08:00
Wang Nan afc5f792c9 Merge pull request #1246 from knoxHuang/v1.3
fix isScheduled bug for fireball/issues/4543
2016-10-28 10:13:54 +08:00
knoxHuang 96908669ac fix isScheduled bug for fireball/issues/4543 2016-10-27 21:48:55 +08:00
Jare Guo ba21305b6a Merge pull request #1245 from knoxHuang/v1.3
fix setSiblingIndex error for JSB for fireball/issues/4375
2016-10-27 15:09:02 +08:00
knoxHuang 3bd802f864 fix setSiblingIndex error for JSB for fireball/issues/4375 2016-10-27 15:00:24 +08:00
Jare Guo e14d19eaf4 Merge pull request #1243 from knoxHuang/v1.3
update CCSpriteFrame api  _refreshTexture and setTexture
2016-10-26 20:07:16 +08:00
knoxHuang 8cf32fe2c4 update CCSpriteFrame api _refreshTexture and setTexture 2016-10-26 18:47:38 +08:00
Nan Wang 8907ec734d Merge branch 'v1.3' of github.com:cocos-creator/engine into v1.3 2016-10-26 18:00:45 +08:00
Nan Wang e68afea422 update version to 1.3.0-beta.1 2016-10-26 17:58:46 +08:00
Jare Guo 9a9edff47d Merge pull request #1231 from pandamicro/v1.3
Auto release dependent resources in cc.loader.release
2016-10-26 17:54:33 +08:00
pandamicro 91a6fe639f Improve loader getDependsRecursively & release API 2016-10-26 17:51:30 +08:00
pandamicro 8295a1f5b1 Secure checkCircleReference usage 2016-10-26 17:02:14 +08:00
pandamicro 8ed0d92e58 Move Array.isArray to polyfill/array.js 2016-10-26 16:59:55 +08:00
Wang Nan 62fb5445f4 Merge pull request #1242 from VisualSJ/audio_example
setVolume example
2016-10-26 16:33:09 +08:00
VisualSJ 054e4b8fa0 setVolume example 2016-10-26 15:24:09 +08:00
Nan Wang a11a552730 update engine version to 1.3.0 2016-10-26 13:50:50 +08:00