aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Collapse)AuthorAge
* Timeline : Adding Zoom SliderKruti Shah2012-03-26
| | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* Timeline : Bug Fix : IKNINJA 1374Jonathan Duran2012-03-23
| | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Merge branch 'refs/heads/Timeline-local' into TimelineUberJonathan Duran2012-03-23
|\
| * Timeline: First integration of drag and drop of layers.Jon Reid2012-03-21
| |
| * Timeline: Bug fix: style collapsers not staying in synch. Also, removed ↵Jon Reid2012-03-21
| | | | | | | | console.log calls in hintable component.
| * Fix: Change click handler to mousedown for better responsiveness in layer ↵Jon Reid2012-03-21
| | | | | | | | selection UI.
| * Timeline: fix layer and style select problems.Jon Reid2012-03-20
| |
| * Timeline: Re-enable adding/removing styles to layers. New methods in ↵Jon Reid2012-03-19
| | | | | | | | TimelinePanel for creating new styles on document load.
* | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-03-23
|\ \ | |/ |/|
| * Button's enabled property binding should be oneway only.Nivesh Rajbhandari2012-03-20
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Deleting unused Materials.xml file since we converted to JSON.Nivesh Rajbhandari2012-03-20
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Support button control in Properties Panel and use them for edit fill and ↵Nivesh Rajbhandari2012-03-20
| | | | | | | | | | | | stroke material. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Use new tree control in Materials panel.Nivesh Rajbhandari2012-03-19
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Merge pull request #126 from ericguzman/AddAnimationsLibraryValerio Virgillito2012-03-19
| |\ | | | | | | Presets Panel - Change Tab labels, Add Un-3d preset
| | * Presets Panel - Fix conflict with default transition presetsEric Guzman2012-03-17
| | |
| | * Merge branch 'refs/heads/master' into AddAnimationsLibraryEric Guzman2012-03-17
| | |\ | | | | | | | | | | | | | | | | Conflicts: js/panels/presets/default-transition-presets.js
| | * | Presets Panel - Change Tab labels, Add Un-3d presetEric Guzman2012-03-16
| | | |
| * | | Replacing old button component with montage button component in our UI.Nivesh Rajbhandari2012-03-19
| | |/ | |/| | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Merge pull request #124 from ericguzman/AddAnimationsLibraryValerio Virgillito2012-03-16
| |\| | | | | | | Presets Panel - Adding Animations Tab
| | * Presets Panel - Adding Animations TabEric Guzman2012-03-16
| | |
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-03-16
| |\ \
| | * \ Merge pull request #121 from dhg637/SomethingValerio Virgillito2012-03-16
| | |\ \ | | | | | | | | | | Presets Panel: Added Scale Up and Down to transitions list. According to
| | | * | Presets Panel: Added Scale Up and Down to transitions list. According to eric G.Armen Kesablyan2012-03-15
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | fixing the components drag and drop.Valerio Virgillito2012-03-16
| |/ / / | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | Merge pull request #118 from mencio/pi-fixesValerio Virgillito2012-03-15
| |\ \ \ | | | | | | | | | | Fixed issues with Properties panel, focus and grid redraw
| | * | | Merge branch 'refs/heads/master' into pi-fixesValerio Virgillito2012-03-15
| | |\| |
| | * | | Fixing the splitter resize canvas bug by getting the size when a document is ↵Valerio Virgillito2012-03-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | opened. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | adding a focus manager to handle panel bugs where blur was not getting ↵Valerio Virgillito2012-03-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | called when clicking on the canvas. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | Removing the name attribute from the PI. Fixing the ID and Class attribute ↵Valerio Virgillito2012-03-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from the PI Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | Fix layer order and selection on reopenJonathan Duran2012-03-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Layer order should be in the same order as created. Nothing should be selected with opening a doc. Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | Merge branch 'refs/heads/Timeline-local' into TimelineDOMJonathan Duran2012-03-16
|\ \ \ \ \
| * \ \ \ \ Merge branch 'Timeline-local' into Timeline-local-2Jon Reid2012-03-16
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
| | * | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-localJon Reid2012-03-16
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
| | * | | | | Timeline: Hook up data binding for changes on subproperties.Jon Reid2012-03-16
| | | | | | |
| | * | | | | Timeline: remove comment.Jon Reid2012-03-15
| | | | | | |
| | * | | | | Timeline: Remove selection timer on add new layer method.Jon Reid2012-03-15
| | | | | | |
| | * | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-localJon Reid2012-03-15
| | |\ \ \ \ \
| | * | | | | | Timeline: Fix for layer selection problems on file open and switch.Jon Reid2012-03-15
| | | | | | | |
* | | | | | | | Consolidate conversion functionsJonathan Duran2012-03-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | | | | CleanupJonathan Duran2012-03-16
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | | | Bug fix and cleanupJonathan Duran2012-03-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleaning up unneeded code for one element per layer support and fixing some bugs with selection and layer sync. Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | | | Fix layer select on selection changeJonathan Duran2012-03-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | | | Start enforcing one element per layerJonathan Duran2012-03-16
| |_|/ / / / |/| | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | | Timeline: remove comment.Jonathan Duran2012-03-15
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | | Timeline: Fix for layer selection problems on file open and switch.Jonathan Duran2012-03-15
| |/ / / / |/| | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-03-15
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/selection-controller.js js/helper-classes/RDGE/src/tools/rdge-compiled.js js/helper-classes/backup-delete/GLBrushStroke.js js/helper-classes/backup-delete/GLCircle.js js/helper-classes/backup-delete/GLGeomObj.js js/helper-classes/backup-delete/GLRectangle.js js/helper-classes/backup-delete/GLSubpath.js js/helper-classes/backup-delete/GLWorld.js js/helper-classes/backup-delete/Materials/BumpMetalMaterial.js js/helper-classes/backup-delete/Materials/DeformMaterial.js js/helper-classes/backup-delete/Materials/FlatMaterial.js js/helper-classes/backup-delete/Materials/FlyMaterial.js js/helper-classes/backup-delete/Materials/JuliaMaterial.js js/helper-classes/backup-delete/Materials/KeleidoscopeMaterial.js js/helper-classes/backup-delete/Materials/LinearGradientMaterial.js js/helper-classes/backup-delete/Materials/MandelMaterial.js js/helper-classes/backup-delete/Materials/PlasmaMaterial.js js/helper-classes/backup-delete/Materials/PulseMaterial.js js/helper-classes/backup-delete/Materials/RadialBlurMaterial.js js/helper-classes/backup-delete/Materials/RadialGradientMaterial.js js/helper-classes/backup-delete/Materials/ReliefTunnelMaterial.js js/helper-classes/backup-delete/Materials/SquareTunnelMaterial.js js/helper-classes/backup-delete/Materials/StarMaterial.js js/helper-classes/backup-delete/Materials/TaperMaterial.js js/helper-classes/backup-delete/Materials/TunnelMaterial.js js/helper-classes/backup-delete/Materials/TwistMaterial.js js/helper-classes/backup-delete/Materials/TwistVertMaterial.js js/helper-classes/backup-delete/Materials/UberMaterial.js js/helper-classes/backup-delete/Materials/WaterMaterial.js js/helper-classes/backup-delete/Materials/ZInvertMaterial.js js/lib/drawing/world.js js/preloader/Preloader.js js/stage/layout.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | Merge pull request #116 from joseeight/ColorValerio Virgillito2012-03-14
| |\ \ \ \ | | |_|/ / | |/| | | Temp Fix for: IKNINJA-1078
| | * | | Temp Fix for: IKNINJA-1078Jose Antonio Marquez2012-03-13
| | | | |
| * | | | Fixing the layout to only draw one level and stage resize when the panels ↵Valerio Virgillito2012-03-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | are collapsed. Fixing the following bugs: IKNINJA-1068 Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | Merge pull request #112 from ericguzman/PresetsPanelValerio Virgillito2012-03-13
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/| Presets panel - Ninja-leaf hover state
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-29 23:18:42 +0000