aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Expand)AuthorAge
* Merge branch 'Fixes_071' of https://github.com/mqg734/ninjaValerio Virgillito2012-07-20
|\
| * Restrict materials popup to appear within our page.Nivesh Rajbhandari2012-07-19
* | Merge branch 'timeline-play' of https://github.com/mencio/ninjaValerio Virgillito2012-07-19
|\ \
| * | Timeline: updated livePreview to timeline play. Hide canvas and draw red outlineValerio Virgillito2012-07-19
| |/
* | Merge branch 'RadialBlur' of https://github.com/ericmueller/ninjaValerio Virgillito2012-07-19
|\ \ | |/ |/|
| * Renamed Raiders material to Dark Blur, and Paris to Blue Sky.hwc4872012-07-19
| * Re-added Radial Blur and Raiders materialshwc4872012-07-19
* | Squashed commit of the following:Nivesh Rajbhandari2012-07-19
|/
* fixing the copyrights on the timeline branch pull request.Valerio Virgillito2012-07-18
* Merge branch 'refs/heads/NINJA-master' into TimelineUberJonathan Duran2012-07-18
|\
| * Fix: IKNINJA-1935 - Chips handling alpha 0 valuesJose Antonio Marquez2012-07-17
* | Merge branch 'refs/heads/Timeline-local-kruti' into TimelineUberJonathan Duran2012-07-17
|\ \
| * | Multi Doc Zoom Slider HandlingKruti Shah2012-07-17
* | | Timeline: Possible fix for new file/new style crash problem.Jon Reid2012-07-17
|/ /
* | Timeline: Style zoom slider.Jon Reid2012-07-17
* | Timeline: Bug fix: Now able to add first keyframe to an element usingJon Reid2012-07-17
* | Merge branch 'refs/heads/NINJA-master' into TimelineUberJonathan Duran2012-07-17
|\|
| * Removed the shaders that we do not have rights to.hwc4872012-07-10
| * fixed incorrect capitalization for DOCTYPE htmlJohn Mayhew2012-07-09
| * Normalize HTML DOCTYPEKris Kowal2012-07-09
| * BSD LicenseKris Kowal2012-07-09
| * Merge branch 'normalize' of https://github.com/kriskowal/ninja-internalValerio Virgillito2012-07-09
| |\
| | * Normalize HTML doctypeKris Kowal2012-07-06
| | * Remove byte order markers (BOM)Kris Kowal2012-07-06
| | * Remove trailing spacesKris Kowal2012-07-06
| | * Remove trailing spacesKris Kowal2012-07-06
| | * Expand tabsKris Kowal2012-07-06
| * | Merge branch 'refs/heads/ninja-internal' into MaterialsUINivesh Rajbhandari2012-07-09
| |\|
| * | PI, drawing and editing fixes for shapes and materials.Nivesh Rajbhandari2012-07-09
| * | Merge branch 'refs/heads/ninja-internal' into MaterialsUINivesh Rajbhandari2012-07-02
| |\ \
| * | | Performance fix for WebGL materials playing even when the dialog/file is no l...Nivesh Rajbhandari2012-06-27
| * | | Integrating Materials UI changes. Squashed commit of the following:Nivesh Rajbhandari2012-06-27
* | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-07-16
|\ \ \ \
| * | | | Timeline: Ameliorate slowness when adding first keyframe to an element.Jon Reid2012-07-16
| * | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-07-16
| |\ \ \ \
| * | | | | Timeline: Disable drag-and-drop on subproperty keyframes. Better errorJon Reid2012-07-16
| * | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-07-11
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-07-09
| |\ \ \ \ \ \
| * | | | | | | Timeline: Delete unused file.Jon Reid2012-07-09
* | | | | | | | Styling of Zoom Slider + Grid Cut off limit taken care of + Hot text Bug (lef...Kruti Shah2012-07-16
| |_|_|/ / / / |/| | | | | |
* | | | | | | Zooming the tweensKruti Shah2012-07-12
* | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-07-11
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Fix layer arrayJonathan Duran2012-07-10
| * | | | | | Fix more missing charJonathan Duran2012-07-10
| * | | | | | Fix missing char and Temp fix missing imageJonathan Duran2012-07-10
| | |/ / / / | |/| | | |
* / | | | | Adding Zoom Control to Property TracksKruti Shah2012-07-10
|/ / / / /
* | | | | remove commas from var linesJonathan Duran2012-07-09
* | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-RefactorCodeKruti Shah2012-07-09
|\| | | |
| * | | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-07-09
| |\ \ \ \
| | * | | | Timeline: First pass at cleaning up TimelineTrack code. Changes propagatedJon Reid2012-07-03