diff options
| author | Nivesh Rajbhandari | 2012-06-27 14:21:27 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-06-27 14:21:27 -0700 |
| commit | 978b9049d057d2a0995758275f68da8641193201 (patch) | |
| tree | d26fadef6100d5eb87e871a68f8c71fac9ab27a6 /js/panels/objects | |
| parent | 8351c3685a6db703d1940817abc71f92ef4e1bd4 (diff) | |
| download | ninja-978b9049d057d2a0995758275f68da8641193201.tar.gz | |
Integrating Materials UI changes. Squashed commit of the following:
commit 89ccb55130e67c4516e616ccc56d2a649a2b9160
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Wed Jun 27 14:20:01 2012 -0700
Position Materials Editor popup and change buttons' text color.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
commit 89bca82adc781f4913f8d302a49a8baa907631c5
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Wed Jun 27 12:00:51 2012 -0700
Support deleting and editing custom materials.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
commit 5be5160c4786beb70e8ad4d75562adb135718c6c
Merge: 1d9d9f6 2ebf3e3
Author: Nivesh Rajbhandari <mqg734@motorola.com>
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 <mqg734@motorola.com>
commit 1d9d9f6e66ea7585f07ed461cebba99e71f65de0
Author: Nivesh Rajbhandari <mqg734@motorola.com>
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 <mqg734@motorola.com>
commit bf1037508dbc686f2884765344832f906cbf06d0
Author: Nivesh Rajbhandari <mqg734@motorola.com>
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 <mqg734@motorola.com>
commit 54930792f9c417df5f739831164aa1f96a41d67a
Author: Nivesh Rajbhandari <mqg734@motorola.com>
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 <mqg734@motorola.com>
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/panels/objects')
0 files changed, 0 insertions, 0 deletions