Merge branch 'refs/heads/NINJA-master' into TimelineUber

Conflicts:
	js/panels/Timeline/DragDrop.js
	js/panels/Timeline/Keyframe.reel/Keyframe.js
	js/panels/Timeline/Layer.reel/Layer.js
	js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
	js/panels/Timeline/Span.reel/Span.js
	js/panels/Timeline/Style.reel/Style.js
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
	js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
	js/panels/Timeline/Track.reel/Track.html
	js/panels/Timeline/Track.reel/Track.js
	js/panels/Timeline/Track.reel/css/Track.css
	js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html
	js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js
	js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css
	js/panels/Timeline/Tween.reel/Tween.js

Signed-off-by: Jonathan Duran <jduran@motorola.com>

1 files changed, 0 insertions, 38 deletions

diff --git a/assets/shaders/ReliefTunnel.frag.glsl b/assets/shaders/ReliefTunnel.frag.glsl
deleted file mode 100644
index 5bd727cf..00000000
--- a/assets/shaders/ReliefTunnel.frag.glsl
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifdef GL_ES
-precision highp float;
-#endif
-
-uniform vec2 u_resolution;
-uniform float u_time;
-uniform float u_speed;
-uniform sampler2D u_tex0;
-
-void main(void)
-{
-    vec2 p = -1.0 + 2.0 * gl_FragCoord.xy / u_resolution.xy;
-    vec2 uv;
-
-        float time = u_time * u_speed;
-
-    float r = sqrt( dot(p,p) );
-    float a = atan(p.y,p.x) + 0.5*sin(0.5*r-0.5*time);
-
-    float s = 0.5 + 0.5*cos(7.0*a);
-    s = smoothstep(0.0,1.0,s);
-    s = smoothstep(0.0,1.0,s);
-    s = smoothstep(0.0,1.0,s);
-    s = smoothstep(0.0,1.0,s);
-
-    uv.x = time + 1.0/( r + .2*s);
-    uv.y = 3.0*a/3.1416;
-
-    float w = (0.5 + 0.5*s)*r*r;
-
-    vec3 col = texture2D(u_tex0,uv).xyz;
-
-    float ao = 0.5 + 0.5*cos(7.0*a);
-    ao = smoothstep(0.0,0.4,ao)-smoothstep(0.4,0.7,ao);
-    ao = 1.0-0.5*ao*r;
-
-    gl_FragColor = vec4(col*w*ao,1.0);
-}