Skip to content

Commit

Permalink
Squashed 'Torch/' changes from fa46e0f..ad61293
Browse files Browse the repository at this point in the history
ad61293 prod-Torch: Updated prod version of Torch at version 0.8.2.

git-subtree-dir: Torch
git-subtree-split: ad61293cae8125db50229fced38f03d9b150d6d5
  • Loading branch information
shdwjk committed May 3, 2015
1 parent a44494a commit 5a47170
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions Torch.js
Expand Up @@ -5,8 +5,8 @@
var Torch = Torch || (function() {
'use strict';

var version = '0.8.1',
lastUpdate = 1430601526,
var version = '0.8.2',
lastUpdate = 1430666803,
schemaVersion = 0.1,
flickerURL = 'https://s3.amazonaws.com/files.d20.io/images/4277467/iQYjFOsYC5JsuOPUCI9RGA/thumb.png?1401938659',
flickerPeriod = 400,
Expand Down Expand Up @@ -234,9 +234,9 @@ var Torch = Torch || (function() {
.rest(4)
.uniq()
.filter(function(a){
var angle=a.match(/^--(\d+)$/)[1];
var angle=a.match(/^--(\d+)$/);
if(angle){
arc_angle=(Math.min(360,Math.max(0,angle)));
arc_angle=(Math.min(360,Math.max(0,angle[1])));
return false;
}
return true;
Expand Down Expand Up @@ -356,9 +356,9 @@ var Torch = Torch || (function() {
.rest(4)
.uniq()
.filter(function(a){
var angle=a.match(/^--(\d+)$/)[1];
var angle=a.match(/^--(\d+)$/);
if(angle){
arc_angle=(Math.min(360,Math.max(0,angle)));
arc_angle=(Math.min(360,Math.max(0,angle[1])));
return false;
}
return true;
Expand Down
2 changes: 1 addition & 1 deletion package.json
@@ -1,6 +1,6 @@
{
"name": "Torch",
"version": "0.8.1",
"version": "0.8.2",
"description": "A simple script for giving lights to tokens and turning off and on dynamic lighting.",
"authors": "The Aaron",
"roll20userid": "104025",
Expand Down

0 comments on commit 5a47170

Please sign in to comment.