| Commit message (Collapse) | Author | Age |
|
|
|
|
|
| |
- minor bug fixes
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
|
|
|
|
|
| |
- added switchDocument event for timeline
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
|\ |
|
| |\ |
|
| | |\
| | | |
| | | | |
Timeline : Fix for the split and element model error
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Timeline
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
|
| | |\ \ |
|
| | | | |
| | | | |
| | | | |
| | | | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| |\ \ \ \
| | | | | |
| | | | | | |
Integration
|
| | |\ \ \ \
| | | | |/ /
| | | |/| |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
integration
Conflicts:
js/helper-classes/RDGE/GLWorld.js
js/helper-classes/RDGE/Materials/PulseMaterial.js
js/helper-classes/RDGE/Materials/RadialBlurMaterial.js
js/helper-classes/RDGE/src/tools/rdge-compiled.js
js/preloader/Preloader.js
|
| | | | | | |
|
| | | | | | |
|
| | |\ \ \ \ |
|
| | |\ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | | |
integration
|
| | | | | | | | |
|
| | | | | | | | |
|
| | | | | | | | |
|
| | |\ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
integration
|
| |\ \ \ \ \ \ \ \
| | | |_|_|_|/ / /
| | |/| | | | | | |
|
| | |\ \ \ \ \ \ \
| | | |_|_|_|_|/ /
| | |/| | | | | | |
Fix to read back colors when re-opening files.
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| |\| | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Conflicts:
js/controllers/document-controller.js
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | |/ / / / / /
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | |\ \ \ \ \ \
| | | | | | | | |
| | | | | | | | | |
Timeline
|
| | | | |_|_|_|/
| | | |/| | | |
| | | | | | | |
| | | | | | | | |
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
TimelineTrack component.
Cherry pick commit from jreid/Timeline-jreid
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| | |/ / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Fresh copy of ninja-internal/master with Timeline folder copied in to resolved merge issues.
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| | | | | | | |
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
|\| | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
js/document/html-document.js
js/helper-classes/3D/snap-manager.js
Signed-off-by: Ananya Sen <Ananya.Sen@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.
|
| | |