aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Collapse)AuthorAge
* 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.
* 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
| | * | Presets Panel - Re-add dbl-click activationEric Guzman2012-03-13
| | | |
| | * | Presets Panel - Adding single-click activationEric Guzman2012-03-13
| | | |
| | * | Presets Panel - Adding hover state to ninja-leafEric Guzman2012-03-13
| | | |
| * | | Deleting temp folderJose Antonio Marquez2012-03-13
| | | |
| * | | Renaming folderJose Antonio Marquez2012-03-13
| | | |
| * | | Merge pull request #109 from imix23ways/TimelineUberValerio Virgillito2012-03-13
| |\ \ \ | | | | | | | | | | Timeline uber
| * | | | Fixed element mediator, PI, and eye-dropper to handle different borders ↵Nivesh Rajbhandari2012-03-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sides and gradients. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | Adding gradientMode value in defaultGradient object.Nivesh Rajbhandari2012-03-09
| | |/ / | |/| | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | Temp Gradient FixJose Antonio Marquez2012-03-09
| | | | | | | | | | | | | | | | Temporary fix for getting gradient mode.
| * | | Merge pull request #102 from dhg637/PanelsValerio Virgillito2012-03-08
| |\ \ \ | | | | | | | | | | Fixed Some Calculation issues and bugs & appended disabled state when no documents exist
| | * | | Disabled state for panelsArmen Kesablyan2012-03-07
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | Reordering and resizing now worksArmen Kesablyan2012-03-07
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | Fixed: Collapsed panels would collapse panels belowArmen Kesablyan2012-03-07
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | Fixed Collapsing and resizing window with panelsArmen Kesablyan2012-03-07
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | Timeline Bug Fix: IKNINJA-1283Kruti Shah2012-03-07
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | | | Fix element delete causes keyframe addition failJonathan Duran2012-03-15
| |_|_|/ |/| | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | Optimize Tween component needsDraw callsJonathan Duran2012-03-14
| | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | Squashed commit of the following:Jonathan Duran2012-03-14
| |_|/ |/| | | | | | | | | | | | | | merge master into timeline Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | Fix unassigned track element on document switchJonathan Duran2012-03-13
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | Timeline : Fixing deleting the layers and hash table and removing while ↵Jonathan Duran2012-03-12
| | | | | | | | | | | | | | | | | | | | | loops replacing with for loops Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-localJon Reid2012-03-09
|\ \ \
| * | | Squashed commit of the following:Jonathan Duran2012-03-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |