aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
* Performance fix for WebGL materials playing even when the dialog/file is no ↵Nivesh Rajbhandari2012-06-27
| | | | | | | | longer in view. Also pausing videos when switching documents. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Integrating Materials UI changes. Squashed commit of the following:Nivesh Rajbhandari2012-06-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Merge branch 'refs/heads/ninja-internal-master' into bugfix-masterAnanya Sen2012-06-27
|\
| * Styles Controller - Remove debuggerEric Guzman2012-06-26
| |
| * Styles Controller - Chrome 20 FixEric Guzman2012-06-26
| |
* | initialize auto code hinting flag with checkbox value, on switching between ↵Ananya Sen2012-06-27
| | | | | | | | | | | | documents Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | turning off autocompletion since it is interfering typingAnanya Sen2012-06-26
| | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | Merge branch 'refs/heads/ninja-internal-master' into bugfix-masterAnanya Sen2012-06-26
|\| | | | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * Merge pull request #323 from dhg637/bindingValerio Virgillito2012-06-26
| |\ | | | | | | Binding View - Binding Tool & Binding Panel
| | * Binding View - Removed DebuggerArmen Kesablyan2012-06-26
| | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * Binding View - Objects Replace existing source Object if it existsArmen Kesablyan2012-06-25
| | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * Can bind Multiple instanceArmen Kesablyan2012-06-25
| | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-25
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | | * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-25
| | | |\
| | * | | Binding Panel - Changing direction in edit mode doesn't apply dirty to the ↵Armen Kesablyan2012-06-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | edit form Check/Uncheck the Binding direction (Oneway) check box in the binding setting doesn't enable "SAVE" button. Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | Binding Panel - Can Now Edit and Delete BindingsArmen Kesablyan2012-06-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug Description: Binding Arguments that are passed in the edit form were being set to null after it was set. Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | Binding View: Fixed If Selected Div Erroring OutArmen Kesablyan2012-06-23
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | Removed Console LogsArmen Kesablyan2012-06-23
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | Text Tool Fix - Can Not Switch Document when Text Tool InitializedArmen Kesablyan2012-06-23
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | Binding View - Hide when in code viewEric Guzman2012-06-21
| | | | |
| | * | | Hintable - Remove overridden methodEric Guzman2012-06-21
| | | | |
| | * | | Binding View :Requested Changes for Pull RequestArmen Kesablyan2012-06-21
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-21
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/hintable.reel/hintable.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-21
| | | |\ \
| | * | \ \ Merge branch 'binding' of github.com:dhg637/ninja-internal into bindingEric Guzman2012-06-21
| | |\ \ \ \
| | | * | | | Binding View: Hud Scroll Limit Is now 8Armen Kesablyan2012-06-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | | * | | | Binding View - Minor Fixes to remove warningsArmen Kesablyan2012-06-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | | Binding HUD - CSS UpdateEric Guzman2012-06-21
| | |/ / / /
| | * | | | Binding Panel - Fixed Panel ButtonArmen Kesablyan2012-06-20
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | BindingView :Montage UpdatesArmen Kesablyan2012-06-20
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-20
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: node_modules/montage/ui/application.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | | * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-20
| | | |\ \ \
| | * | | | | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-20
| | |\| | | |
| | | * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-20
| | | |\ \ \ \
| | * | | | | | Binding-View : Polish stateArmen Kesablyan2012-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | | | Merge branch 'refs/heads/binding_eric' into bindingArmen Kesablyan2012-06-20
| | |\ \ \ \ \ \
| | | * | | | | | Binding HUD - Show hud for "off stage" objects in trayEric Guzman2012-06-20
| | | | | | | | |
| | | * | | | | | Objects Tray - Use label instead of identifier for object nameEric Guzman2012-06-20
| | | | | | | | |
| | | * | | | | | Objects Tray - Filter list of components for those without visual representationEric Guzman2012-06-20
| | | | | | | | |
| | | * | | | | | Merge branch 'binding' of github.com:dhg637/ninja-internal into bindingEric Guzman2012-06-20
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'binding' of github.com:dhg637/ninja-internal into bindingEric Guzman2012-06-20
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch 'binding' of github.com:dhg637/ninja-internal into bindingEric Guzman2012-06-19
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | Objects Tray - Show only "off stage" objectsEric Guzman2012-06-19
| | | | | | | | | | | |
| | * | | | | | | | | | binding-hud Scroll UpArmen Kesablyan2012-06-20
| | | |_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | | | | | | Binding View - Hover ScrollArmen Kesablyan2012-06-20
| | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | | | | | Showing Bound Items in hudArmen Kesablyan2012-06-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | | | | | Binding View - Added Line cap in drawing line & Fixed bug to not pop up on ↵Armen Kesablyan2012-06-19
| | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | current component Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | | | | Binding View - Mouse Over Element Pop up HudArmen Kesablyan2012-06-19
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | | | Merge branch 'binding' of github.com:dhg637/ninja-internal into bindingEric Guzman2012-06-19
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/stage/binding-view.reel/binding-view.js
| | | * | | | | | Bug: Text Tool Breaking canvas space.Armen Kesablyan2012-06-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |