aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhwc4872012-06-15 11:36:35 -0700
committerhwc4872012-06-15 11:36:35 -0700
commit043ab3f0aa5099f88a32dc377e9de1011b79611f (patch)
treed61bdd023c6bfe7ae4130db70d37ffba31b932d0
parent2779b48197effabe1a975c8139c497631238f8f1 (diff)
downloadninja-043ab3f0aa5099f88a32dc377e9de1011b79611f.tar.gz
Re-added Raiders material
-rw-r--r--js/lib/rdge/materials/radial-blur-material.js2
-rw-r--r--js/panels/Materials/materials-data.json4
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.js1
3 files changed, 6 insertions, 1 deletions
diff --git a/js/lib/rdge/materials/radial-blur-material.js b/js/lib/rdge/materials/radial-blur-material.js
index c130544f..68a92b0f 100644
--- a/js/lib/rdge/materials/radial-blur-material.js
+++ b/js/lib/rdge/materials/radial-blur-material.js
@@ -146,7 +146,7 @@ var RaidersMaterial = function RaidersMaterial() {
146 this.inheritedFrom = RadialBlurMaterial; 146 this.inheritedFrom = RadialBlurMaterial;
147 this.inheritedFrom(); 147 this.inheritedFrom();
148 148
149 this._name = "Raiders Material"; 149 this._name = "Raiders";
150 this._shaderName = "raiders"; 150 this._shaderName = "raiders";
151 151
152 this._texMap = 'assets/images/raiders.png'; 152 this._texMap = 'assets/images/raiders.png';
diff --git a/js/panels/Materials/materials-data.json b/js/panels/Materials/materials-data.json
index 221fdd2b..8df9e600 100644
--- a/js/panels/Materials/materials-data.json
+++ b/js/panels/Materials/materials-data.json
@@ -61,6 +61,10 @@
61 "id" : "Radial Gradient" 61 "id" : "Radial Gradient"
62 }, 62 },
63 { 63 {
64 "label": "Raiders",
65 "id" : "Raiders"
66 },
67 {
64 "label": "Relief Tunnel", 68 "label": "Relief Tunnel",
65 "id" : "Relief Tunnel" 69 "id" : "Relief Tunnel"
66 }, 70 },
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.js b/js/panels/Materials/materials-popup.reel/materials-popup.js
index 8240c746..40f07509 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.js
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.js
@@ -350,6 +350,7 @@ exports.MaterialsPopup = Montage.create(Component, {
350 (materialID === "Pulse") || 350 (materialID === "Pulse") ||
351 (materialID === "Radial Blur") || 351 (materialID === "Radial Blur") ||
352 (materialID === "Radial Gradient") || 352 (materialID === "Radial Gradient") ||
353 (materialID === "Raiders") ||
353 (materialID === "Relief Tunnel") || 354 (materialID === "Relief Tunnel") ||
354 (materialID === "Square Tunnel") || 355 (materialID === "Square Tunnel") ||
355 (materialID === "Star") || 356 (materialID === "Star") ||