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, 31 deletions

diff --git a/assets/shaders/Star.frag.glsl b/assets/shaders/Star.frag.glsl
deleted file mode 100644
index f61f43c9..00000000
--- a/assets/shaders/Star.frag.glsl
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifdef GL_ES
-precision highp float;
-#endif
-
-uniform float u_time;
-uniform float u_speed;
-uniform vec2 u_resolution;
-uniform sampler2D u_tex0;
-
-void main(void)
-{
-    vec2 uv;
-
-        float time = u_time * u_speed;
-
-    vec2 p = -1.0 + 2.0 * gl_FragCoord.xy / u_resolution.xy;
-    float a = atan(p.y,p.x);
-    float r = sqrt(dot(p,p));
-    float s = r * (1.0+0.8*cos(time*1.0));
-
-    uv.x =          .02*p.y+.03*cos(-time+a*3.0)/s;
-    uv.y = .1*time +.02*p.x+.03*sin(-time+a*3.0)/s;
-
-    float w = .9 + pow(max(1.5-r,0.0),4.0);
-
-    w*=0.6+0.4*cos(time+3.0*a);
-
-    vec3 col =  texture2D(u_tex0,uv).xyz;
-
-    gl_FragColor = vec4(col*w,1.0);
-}
\ No newline at end of file