| Commit message (Collapse) | Author | Age |
|
|
|
|
|
| |
Fresh copy of ninja-internal/master with Timeline folder copied in to resolved merge issues.
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
|
|
|
|
|
| |
tool button
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
|\
| |
| | |
Integrating WebGL and canvas-2d drawing fixes. Fixed Materials Editor Popup to work with latest Montage framework. Also adding back WebGL materials.
|
| |
| |
| |
| |
| |
| | |
check for nj-skinned class instead of textfield class for styling.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| |
| |
| |
| | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| |
| |
| |
| | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| |\
| |/
|/| |
|
|\ \
| | |
| | | |
New tool icons
|
| | |
| | |
| | |
| | | |
Signed-off-by: Armen Kesablyan <armen@motorola.com>
|
| | |
| | |
| | |
| | | |
Signed-off-by: Armen Kesablyan <armen@motorola.com>
|
| |\ \
| |/ /
|/| | |
|
|\ \ \
| | | |
| | | | |
Fix for bug that keeps Ninja from launching over HTTP....
|
|/ / /
| | |
| | |
| | | |
extension specific code in an if (window.chrome.app.isInstalled) check.
|
| | |
| | |
| | |
| | | |
Signed-off-by: Armen Kesablyan <armen@motorola.com>
|
| | |
| | |
| | |
| | | |
Signed-off-by: Armen Kesablyan <armen@motorola.com>
|
| | |
| | |
| | |
| | | |
Signed-off-by: Armen Kesablyan <armen@motorola.com>
|
| | |
| | |
| | |
| | | |
Signed-off-by: Armen Kesablyan <armen@motorola.com>
|
| | |
| | |
| | |
| | | |
Signed-off-by: Armen Kesablyan <armen@motorola.com>
|
| | |
| | |
| | |
| | | |
Signed-off-by: Armen Kesablyan <armen@motorola.com>
|
| | |\ |
|
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | | |\
| |_|_|/
|/| | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
workaround having inconsistent color object.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
modify the stage's border; we only need the border-width.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
WebGL materials."
This reverts commit 96a0a8c916533eb5625816192ed38488f639326d.
|
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | |\ \
| |_|/ /
|/| | | |
|
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
into file-io
Conflicts:
js/controllers/document-controller.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | | | |
| | | | |
| | | | |
| | | | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | | | |
| | | | |
| | | | |
| | | | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | | | |
| | | | |
| | | | |
| | | | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | | | |
| | | | |
| | | | |
| | | | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Timeline selection code is now handled by the selection controller and current container change
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| |\ \ \ \ |
|
| |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | | |
nested-selection
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| |/ / / / /
| | | | | |
| | | | | |
| | | | | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
|\ \ \ \ \ \
| | | | | | |
| | | | | | | |
FileIO branch pull request
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
This reverts commit 3251315ecc22544dab50623ee5862e00dfe02302.
Conflicts:
js/controllers/document-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
| |\ \ \ \ \ \
| |/ / / / / /
|/| | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
js/controllers/document-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
|\ \ \ \ \ \ \
| | | | | | | |
| | | | | | | | |
Styles controller updates
|
| |\ \ \ \ \ \ \
| | | |_|/ / / /
| | |/| | | | | |
|
| | |\ \ \ \ \ \
| | | | | | | | |
| | | | | | | | | |
Cloud URL localStorage Fix
|