From 6a47f6b338523811b7279ba6a78269ec7dce7fcb Mon Sep 17 00:00:00 2001
From: "Aaron C. Meadows" <shdwjk@gmail.com>
Date: Tue, 5 May 2015 08:02:44 -0500
Subject: [PATCH] Squashed 'Torch/' changes from ad61293..66ef346

66ef346 prod-Torch: Updated prod version of Torch at version 0.8.3.

git-subtree-dir: Torch
git-subtree-split: 66ef34663561700144c1f6f1a5d8e84aa2e74f6f
---
 Runic/.DS_Store      | Bin 0 -> 8196 bytes
 Runic/imgs/.DS_Store | Bin 0 -> 10244 bytes
 Torch.js             |   6 +++---
 package.json         |   2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 Runic/.DS_Store
 create mode 100644 Runic/imgs/.DS_Store

diff --git a/Runic/.DS_Store b/Runic/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..3e2fbc97850501da33099df09bb2d18125b5c2e6
GIT binary patch
literal 8196
zcmeI0TWl0n7{|Y_lrlTqPHBN@p}1jb1gubL5h}Oswh9EWOSjM#3d`)yw2aKotTVG)
zE>@cuyx}b|UgG6JQ4pStiP2{Xh8Hy|i4vpn*~ExXUY`8Unc3aa%c~lh+06OQ`Of#9
znf;&No|&@%fQf>34}byy5}n+#xl~MZ@P2+yIjRCr4Oygo*x8$GEx4XT?dmDfp(9iv
zR3KC!R3KC!RN%j$06nw$A<gjI_j|)KR3KE~wp4(x4^cX~jR$tzw_@p_LTmxZmS6X&
z&M1WEL<1WS?6_~KhYs{p$@-}nY%$PJCx0}EiwAbxw|+Wcu=&8?${6fWP+XnHkBV@>
zxNpNUR3KDfsseoPUJVB1U<BM-_U{jZN?v_pe`eIpXG}XozCSa0({R1k)*Dzgt9o|L
z94R8t<sVinA4wgzM^m2a72JgC92PA@(=$Omsd~pt^*-A+%XKw#(9lQItiH>(Jk_vt
zXF}>wzhP<iXu>X7nmd&8$LlvV?|7OmPC9y#Qj@BsA2eJeW0;0_N{aALnki?_blltC
z5^Za3A8U!8Y2Ub^CAxW2+t?U;N|KhX+1R;nFhBOpJLlhh@506RuUz#t!eE_&I=@{m
zKciY%Fe6(G1i=d>L4KSd$h`Rr7P8t!b@hvvEL9pB8<(e9T}I8G7;*U5=(0`QNtgxw
z@Q7n*sl1vstdRjvKk226(|VdMniSfrYey@tzEgRMsjoQ1a627cx5Rio!^5ub4NRyH
z4!JZjyFER(+ZwiMe6Cqf-ZN~=J*Yb_*+JEDRBJ>}oH}Bv8Qtu$61L~rxiniSa<jG-
zXgy$1o!@6{$4y_HSbR^ZvO1`gx)@ZV{4Ri4sUk7#v(%g(iNxZ`z$rm9Y=NDSBmg})
z2d~0;_yDfLm+%Ap3V$G?jCHsiSKyu4iXC_#ZpBVaV3(g?Rhqq~(nWlWd&!n(&vc7P
zALpw5rP=!qD>y5i^>SDFdrp<0KWm$XoaLrjZB{k21yl9(PSfO~xaDa)<l2r$Q$vAi
z#tN?9t5cj&)VnE~Qm2`OSiIH0-N@y6iyK$OR^Pp0)7I-8C3%rt-(Tc}oBDxK4*#I)
zW_3#=a1PN=!t#t^Lw6#z_)<h@dYvs;IG@;)hcvp}K3n7c8v96!h@NFj73DDR>2h=`
zHAxcgJEDr*=hD|;Y7n@pS(f`w&@Yg=5kGa!T3I<D7-3q(Pg}QMR{D!RNNi8wY-^X5
zfvla&(apKF*b=xmcPPqHe&xNY>-FSyi|*=LaQSU?SA)E-Q`7i8NwIhURD|*Oga%j%
z?XZ>L7z7PQ;aPYYUV*paGJFW1z^Cvzd;wp<*YGX;1iuh2H{mz<3u|x=N?40aP{9Ul
z#2Bu|wRjh{;6~hn+i*MXz+ITcUQA&h9>HNW@F6^b9zKp|@d<nqU&Pn(4SW;d!V7rO
zpP@2n-F~}N;w7q01T9!5s`{q`t?7aJa^hbF?M7v#3V7=*PnrN}A|(P1f9?enr8%E8
zpSK`)T`Yjh<fa1zk$!SAyd|jF93PQ}rOFaHDz6kIGZ5LUnwy$f6|pOc=9;xlGMgm`
z<zo|kO>DMckv9oDnN<r~d2@3I_0|X|d2`!#8cGtt@n)i#hC+H;R6v^%vr7co$8ZI%
z5oF)M_wY0PjzDnDBd}Irl(1Tb&A1NN;|6Raw6<fMuS?jC`>+T13%rK#C>}!<GlW+T
zZOr4tcp4wUNAWQn$EWceK8Mfa3;0?ExJkI}DuL!(fnyoBV#={h+Zv(1(mHr+c+i^V
zTZQlc@1Obq|7mkWXQ)7^!2d%5tnN;AC+NG(v|8}Jc9hOzbn=78jr&%lP$9PCWW{!z
oY_J^{u~7=;Iq|@b`<6U({NsNFgwOx-+kWLmGkpHvZqNU}0sP^-ng9R*

literal 0
HcmV?d00001

diff --git a/Runic/imgs/.DS_Store b/Runic/imgs/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..7475668353cdb7aae0696670910a91b483179556
GIT binary patch
literal 10244
zcmeI1J#G_G6h_~(9Wa6-C8f($DB&lB&WZwp78)u<{F6{b2~8wQmn?xLWC<)G1q;X$
zSOQ(R-<=UC_&YTSy(i6FXFMm?xub8M-?)@g_s<tQrA$gG<JeR;@5Rmxy{~O;4EiIl
zqt@Wd*?e|#HjBSD*UoJRS_fJOS_fJOS_fJO{*4aAoUJjw+ts#j9cUeB9r)D&-5(~g
zsZRU4>T2FPVwX#RsG~TXBVOm1|ELokh&t`-s;hA%M(xn39a{S(M(x)QwZr56X@CBz
zs~uiyescVu{*!CJLaF`IqfYYlQm0*Q`__Thf%Oh(?LI8WWm!&No!nTzzle9Xu5%=I
zr<|9avRe+zc6m@fmeX?l2k{Mw9Zyt!y8n!aKwKg5$P<HiNIdpLk@**E{sah_dt%oU
zY3_-qK*-z^d!9&hPdxL4%<I^i9|95PK+HTLb0FqGggFokPskjIr6<z-lQlmALgtQ`
zQ9jb#6O<2`djj&2=AM9jr1^JaJ}Z<DnR^2Ak>;MDe8}7rkdHL?1mr{JgSXb4@)71h
zKt5y+1mz>lfq;C-90<rqnqOLT%7@H70r^OCN6axFGWP`JBh5Vl`H=Z=&zR2(<s;02
zfPBat2+Bv80|EJvIS`PKG{3Osln<GE0`igOo}hfl+!K(GH1`DLL*}FV)|~PY=0HF`
zWDW%7Bg`$apnS+22*^j8e>UceLiv!nCm<hb?g`3=%sm15NOMm>KGOV$HK%;Y+!K(G
zH1`DML*|}<e5AQ2ARjW{_+ZT`A7Ksz<U{5_P(H#O2*`)bEwQA0r1_OGU&guxS1cQz
zfPAF6Cnz5>_XOl4%{>A6kom2b)|~PY*Bl7Qhs=SXe1tg=kPn#y0r^PtuhyLMA#+ba
zKGNJ1ln<GE0`igOo`8JF{PvbHKf-*3`3+(iE6NxXJ^z2szyIe+ZPz-`I`DsXppFjS
z9PEc%|7?BDQqS5avAvH?L+7o!nn>*OaeUN#93Ow^ar{<nI(J)DBVJGYy6S2iiSZYH
z4A9R6aR-HUGt5sV?w~-x{G_=92$-L0%pE|${G_=92$-MJ{L;)Fvv>}S-;@TPfcYuS
f9nseRYfsK~&0#eU-`{l2fq?ICy5_@+-`D&noro0h

literal 0
HcmV?d00001

diff --git a/Torch.js b/Torch.js
index 150f455e5d..19673bd7d7 100644
--- a/Torch.js
+++ b/Torch.js
@@ -5,8 +5,8 @@
 var Torch = Torch || (function() {
     'use strict';
 
-    var version = '0.8.2',
-        lastUpdate = 1430666803,
+    var version = '0.8.3',
+        lastUpdate = 1430829710,
         schemaVersion = 0.1,
 		flickerURL = 'https://s3.amazonaws.com/files.d20.io/images/4277467/iQYjFOsYC5JsuOPUCI9RGA/thumb.png?1401938659',
 		flickerPeriod = 400,
@@ -427,7 +427,7 @@ var Torch = Torch || (function() {
 							top: o.get('top')+dy,
 							left: o.get('left')+dx,
 							light_radius: fdata.light_radius+dr,
-							light_angle: (360 === fdata.light_angle ? 360 : Math.min(360,Math.max(fdata.light_angle+da,0)))
+							light_angle: (360 === fdata.light_angle ? 360 : Math.min(360,Math.max(fdata.light_angle+da,0))) || 360
 						});
 					}
 				}
diff --git a/package.json b/package.json
index 677df8e5ee..00818d7d2a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "Torch",
-    "version": "0.8.2",
+    "version": "0.8.3",
     "description": "A simple script for giving lights to tokens and turning off and on dynamic lighting.",
     "authors": "The Aaron",
     "roll20userid": "104025",