diff options
89 files changed, 5050 insertions, 5679 deletions
@@ -25,13 +25,13 @@ If you're already familiar with using Git, GitHub, you can clone master branch o | |||
25 | - Browse to HKEY_CURRENT_USER/Software/Motorola Mobility/Ninja Local Cloud/Options. | 25 | - Browse to HKEY_CURRENT_USER/Software/Motorola Mobility/Ninja Local Cloud/Options. |
26 | - Right click and select New > String value. | 26 | - Right click and select New > String value. |
27 | - Type 'Local Ninja Origin' no quotes. | 27 | - Type 'Local Ninja Origin' no quotes. |
28 | - Double click on Local Ninja Origin and paste in the Ninja app ID copied in step 6 from the Chrome extensions page in the Value data field. | 28 | - Double click on Local Ninja Origin and paste in the Ninja app ID copied in step 6 from the Chrome extensions page in the Value data field. To have multiple builds of Ninja installed but not running simultaneously as this is not supported, multiple app IDs can be added separated by comma and no space. |
29 | - Close Registry Editor. | 29 | - Close Registry Editor. |
30 | 8. On Mac: | 30 | 8. On Mac: |
31 | - Launch Finder. | 31 | - Launch Finder. |
32 | - Double click on /Users/\<user\>/Library/Preferences/com.MotorolaMobility.Ninja-Local-Cloud.plist. Note: on Lion (10.7), user library folder is hidden by default. To browse to it, in Finder choose Go > Go to Folder and type ~/Library, or select Go menu with Alt (Option) key down to see Library listed in Go menu or make the user library folder permanently visible by running the following command in Terminal: chflags nohidden ~/Library | 32 | - Double click on /Users/\<user\>/Library/Preferences/com.MotorolaMobility.Ninja-Local-Cloud.plist. Note: on Lion (10.7), user library folder is hidden by default. To browse to it, in Finder choose Go > Go to Folder and type ~/Library, or select Go menu with Alt (Option) key down to see Library listed in Go menu or make the user library folder permanently visible by running the following command in Terminal: chflags nohidden ~/Library |
33 | - Click on Add Child Type 'Local Ninja Origin' no quotes. | 33 | - Click on Add Child Type 'Local Ninja Origin' no quotes. |
34 | - For value, paste in the Ninja app ID copied in step 6 from the Chrome extensions page. | 34 | - For value, paste in the Ninja app ID copied in step 6 from the Chrome extensions page. To have multiple builds of Ninja installed but not running simultaneously as this is not supported, multiple app IDs can be added separated by comma and no space. |
35 | - Save (File > Save or Cmd S). | 35 | - Save (File > Save or Cmd S). |
36 | - Close Property List Editor. | 36 | - Close Property List Editor. |
37 | 9. Quit Ninja Local Cloud | 37 | 9. Quit Ninja Local Cloud |
diff --git a/assets/canvas-runtime.js b/assets/canvas-runtime.js index 4ab377c6..4181dd89 100644 --- a/assets/canvas-runtime.js +++ b/assets/canvas-runtime.js | |||
@@ -635,11 +635,11 @@ NinjaCvsRt.RuntimeGeomObj = Object.create(Object.prototype, { | |||
635 | case "plasma": mat = Object.create(NinjaCvsRt.RuntimePlasmaMaterial, {}); break; | 635 | case "plasma": mat = Object.create(NinjaCvsRt.RuntimePlasmaMaterial, {}); break; |
636 | case "taper": mat = Object.create(NinjaCvsRt.RuntimeTaperMaterial, {}); break; | 636 | case "taper": mat = Object.create(NinjaCvsRt.RuntimeTaperMaterial, {}); break; |
637 | 637 | ||
638 | case "paris": | 638 | case "blueSky": |
639 | case "water": mat = Object.create(NinjaCvsRt.RuntimeWaterMaterial, {}); break; | 639 | case "water": mat = Object.create(NinjaCvsRt.RuntimeWaterMaterial, {}); break; |
640 | 640 | ||
641 | case "deform": | 641 | case "deform": |
642 | case "raiders": | 642 | case "darkBlur": |
643 | case "tunnel": | 643 | case "tunnel": |
644 | case "reliefTunnel": | 644 | case "reliefTunnel": |
645 | case "squareTunnel": | 645 | case "squareTunnel": |
diff --git a/assets/descriptor.json b/assets/descriptor.json index d9d74e6b..db824387 100644 --- a/assets/descriptor.json +++ b/assets/descriptor.json | |||
@@ -20,9 +20,9 @@ | |||
20 | "images/cubelight.png", | 20 | "images/cubelight.png", |
21 | "images/random_normal.png", | 21 | "images/random_normal.png", |
22 | "images/white.png", | 22 | "images/white.png", |
23 | "images/paris.png", | 23 | "images/bluesky.png", |
24 | "images/powderblue.png", | 24 | "images/powderblue.png", |
25 | "images/raiders.png", | 25 | "images/darkblur.png", |
26 | "images/us_flag.png", | 26 | "images/us_flag.png", |
27 | "shaders/Basic.frag.glsl", | 27 | "shaders/Basic.frag.glsl", |
28 | "shaders/TwistVert.vert.glsl", | 28 | "shaders/TwistVert.vert.glsl", |
@@ -34,9 +34,9 @@ | |||
34 | "shaders/linearGradient.frag.glsl", | 34 | "shaders/linearGradient.frag.glsl", |
35 | "shaders/linearGradient.vert.glsl", | 35 | "shaders/linearGradient.vert.glsl", |
36 | "shaders/plasma.frag.glsl", | 36 | "shaders/plasma.frag.glsl", |
37 | "shaders/Paris.frag.glsl", | ||
38 | "shaders/plasma.vert.glsl", |