From 978b9049d057d2a0995758275f68da8641193201 Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Wed, 27 Jun 2012 14:21:27 -0700 Subject: Integrating Materials UI changes. Squashed commit of the following: commit 89ccb55130e67c4516e616ccc56d2a649a2b9160 Author: Nivesh Rajbhandari Date: Wed Jun 27 14:20:01 2012 -0700 Position Materials Editor popup and change buttons' text color. Signed-off-by: Nivesh Rajbhandari commit 89bca82adc781f4913f8d302a49a8baa907631c5 Author: Nivesh Rajbhandari Date: Wed Jun 27 12:00:51 2012 -0700 Support deleting and editing custom materials. Signed-off-by: Nivesh Rajbhandari commit 5be5160c4786beb70e8ad4d75562adb135718c6c Merge: 1d9d9f6 2ebf3e3 Author: Nivesh Rajbhandari Date: Wed Jun 27 11:11:37 2012 -0700 Merge branch 'refs/heads/ninja-internal' into WebGLMaterials Conflicts: js/data/panels-data.js Signed-off-by: Nivesh Rajbhandari commit 1d9d9f6e66ea7585f07ed461cebba99e71f65de0 Author: Nivesh Rajbhandari Date: Tue Jun 26 22:01:22 2012 -0700 "Save as" support to duplicate material with modified settings. Also removed Add button and disabled Reset button for now. Signed-off-by: Nivesh Rajbhandari commit bf1037508dbc686f2884765344832f906cbf06d0 Author: Nivesh Rajbhandari Date: Tue Jun 26 17:23:31 2012 -0700 Added UI for duplicating and deleting materials in the Materials Library. Signed-off-by: Nivesh Rajbhandari commit 54930792f9c417df5f739831164aa1f96a41d67a Author: Nivesh Rajbhandari Date: Tue Jun 26 14:29:17 2012 -0700 Added preview of material in materials editor popup and fixed some styling. Signed-off-by: Nivesh Rajbhandari Signed-off-by: Nivesh Rajbhandari --- js/panels/Materials/materials-data.json | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'js/panels/Materials/materials-data.json') diff --git a/js/panels/Materials/materials-data.json b/js/panels/Materials/materials-data.json index a5d8997b..fde82d3d 100644 --- a/js/panels/Materials/materials-data.json +++ b/js/panels/Materials/materials-data.json @@ -101,6 +101,11 @@ "id" : "Z-Invert" } ] + }, + { + "label": "Custom Materials", + "children": [ + ] } ] } \ No newline at end of file -- cgit v1.2.3 From d6613f1e883eaa318fcf2098477eb5eede3d34ba Mon Sep 17 00:00:00 2001 From: hwc487 Date: Tue, 10 Jul 2012 10:00:35 -0700 Subject: Removed the shaders that we do not have rights to. --- js/panels/Materials/materials-data.json | 52 --------------------------------- 1 file changed, 52 deletions(-) (limited to 'js/panels/Materials/materials-data.json') diff --git a/js/panels/Materials/materials-data.json b/js/panels/Materials/materials-data.json index fde82d3d..abdacbe1 100644 --- a/js/panels/Materials/materials-data.json +++ b/js/panels/Materials/materials-data.json @@ -8,34 +8,14 @@ "label": "Bump Metal", "id" : "Bump Metal" }, - { - "label": "Deform", - "id" : "Deform" - }, { "label": "Flag", "id" : "Flag" }, - { - "label": "Fly", - "id" : "Fly" - }, - { - "label": "Julia", - "id" : "Julia" - }, - { - "label": "Keleidoscope", - "id" : "Keleidoscope" - }, { "label": "Linear Gradient", "id" : "Linear Gradient" }, - { - "label": "Mandel", - "id" : "Mandel" - }, { "label": "Paris", "id" : "Paris" @@ -48,42 +28,14 @@ "label": "Pulse", "id" : "Pulse" }, - { - "label": "Radial Blur", - "id" : "Radial Blur" - }, { "label": "Radial Gradient", "id" : "Radial Gradient" }, - { - "label": "Raiders", - "id" : "Raiders" - }, - { - "label": "Relief Tunnel", - "id" : "Relief Tunnel" - }, - { - "label": "Square Tunnel", - "id" : "Square Tunnel" - }, - { - "label": "Star", - "id" : "Star" - }, { "label": "Taper", "id" : "Taper" }, - { - "label": "Tunnel", - "id" : "Tunnel" - }, - { - "label": "Twist", - "id" : "Twist" - }, { "label": "Twist Vertex", "id" : "Twist Vertex" @@ -95,10 +47,6 @@ { "label": "Water", "id" : "Water" - }, - { - "label": "Z-Invert", - "id" : "Z-Invert" } ] }, -- cgit v1.2.3