aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Runtime canvas & WebGL fixes.hwc4872012-03-20
|
* Bug Fixes for Canvas & WebGL File IOhwc4872012-03-20
|
* removing dead codehwc4872012-03-16
|
* Supporting new and old GL data formats.hwc4872012-03-16
|
* Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-03-16
|\ | | | | | | integration
| * Merge pull request #122 from ananyasen/IO-patch-ninja-internal-master-ananyaValerio Virgillito2012-03-16
| |\ | | | | | | IKNINJA-1305 : fixed the check for stopVideos() method's existence
| | * IKNINJA-1305 : fixed the check for stopVideos() method's existenceAnanya Sen2012-03-16
| |/ | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * 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 drag and drop images to the pasteboardValerio Virgillito2012-03-16
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Temp fix applied to all elementsJose Antonio Marquez2012-03-15
| | | | | | | | | | | | This should be moved to 'makeNJElement' to account for the element to be loaded.
| * | Merge branch 'refs/heads/FileIO' into FileIO-Build-CandidateJose Antonio Marquez2012-03-15
| |\ \
| | * \ Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-15
| | |\ \
| | | * \ 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>
| | | * | | | Merge pull request #120 from imix23ways/TimelineUberValerio Virgillito2012-03-15
| | | |\ \ \ \ | | | | |_|/ / | | | |/| | | Timeline uber
| | | | * | | 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>
| | | | * | | revert spaceJonathan 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>
| | | | * | | 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>
| * | | | | | Merge branch 'refs/heads/FileIO' into FileIO-Build-CandidateJose Antonio Marquez2012-03-15
| |\| | | | |
| | * | | | | Temp fix for element dimensions (SVG)Jose Antonio Marquez2012-03-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a temp fix to allow for a redraw of an SVG on load.
| | * | | | | Fixing offset bug for drag-and-dropJose Antonio Marquez2012-03-15
| | | | | | |
| | * | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-15
| | |\| | | |
| * | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO-Build-CandidateJose Antonio Marquez2012-03-15
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-03-15
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Removing the backup-delete folder and the RDGE tools directory.Valerio Virgillito2012-03-15
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | Merge branch 'refs/heads/FileIO-Integration' into FileIO-Build-CandidateJose Antonio Marquez2012-03-15
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Merge pull request #34 from ericmueller/integrationJose Antonio Marquez Russo2012-03-15
| | |\ \ \ \ | | | |_|/ / | | |/| | | Integration
| * / | | | Adding Temp drag-drop I/O supportJose Antonio Marquez2012-03-15
| |/ / / / | | | | | | | | | | | | | | | Added methods to get data from dropped file while document is opened and save as a file. Currently only supporting images and SVGs, no error handling, which will have to be done.
| * | | | Merge pull request #116 from joseeight/ColorValerio Virgillito2012-03-14
| |\ \ \ \ | | |_|/ / | |/| | | Temp Fix for: IKNINJA-1078
| | * | | Temp Fix for: IKNINJA-1078Jose Antonio Marquez2012-03-13
| | | | |
| * | | | Removing the obsolete modalContainer div.Valerio Virgillito2012-03-14
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | Merge pull request #117 from mencio/layout-fixValerio Virgillito2012-03-14
| |\ \ \ \ | | | | | | | | | | | | Layout Fixes and Canvas sized when panels are collapsed
| | * | | | 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>
| | * | | | Some code cleanup - removing unused assignments.Valerio Virgillito2012-03-13
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | Merge pull request #114 from mqg734/ToolFixesValerio Virgillito2012-03-13
| |\ \ \ \ \ | | |/ / / / | |/| | | | Fixed selection rectangle for multiple selection case.
| | * | | | Fixed drawing of multiple selection bounds when in flat case.Nivesh Rajbhandari2012-03-13
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari