aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-04-20
|\
| * Timeline: More bug fixes for selection with multiple documents opening andJon Reid2012-04-19
| * Timeline: Bug fix: check for uninitialized currentDocument in intializationJon Reid2012-04-19
| * Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-04-19
| |\
| * | Timeline: Bug fix: Maintain selection between document switching.Jon Reid2012-04-19
* | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-20
|\ \ \ | |_|/ |/| |
| * | cleanup unused code.Valerio Virgillito2012-04-19
* | | Merge branch 'timeline-local' of github.com:ntfx47/ninja-internal into Timeli...Jonathan Duran2012-04-19
|\ \ \ | |_|/ |/| |
| * | BreadCrumb Bug FixKruti Shah2012-04-19
* | | Remove more unneeded requiresJonathan Duran2012-04-19
* | | Remove unneeded requireJonathan Duran2012-04-19
* | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-19
|\ \ \ | | |/ | |/|
| * | Squashed commit of the following:Valerio Virgillito2012-04-18
* | | Remove TODOsJonathan Duran2012-04-18
* | | Add flag for abs/rel positionJonathan Duran2012-04-18
* | | FIX for layer selection when adding a keyframe in unselected layerJonathan Duran2012-04-18
* | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-04-18
|\ \ \ | | |/ | |/|
| * | Timeline: Bug fix: changing layer name didn't save in some circumstances.Jon Reid2012-04-17
| * | Timeline: Further fixes to new document/breadcrumb interactions.Jon Reid2012-04-17
* | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-18
|\ \ \ | |/ / |/| / | |/
| * Merge pull request #165 from mqg734/BoundsCalculationValerio Virgillito2012-04-17
| |\
| | * Drag and drop of images and components should not add 3d values by default.Nivesh Rajbhandari2012-04-16
| * | collapsing the history panel by default and commenting out the undo for the 3...Valerio Virgillito2012-04-13
| * | setAttribute added to the undo/redoValerio Virgillito2012-04-09
| * | adding a history panelValerio Virgillito2012-04-09
| |/
* | Fix tweens not updating keyframe rulesJonathan Duran2012-04-16
* | Timeline: Bug fixes for restoring tweens on new document and breadcrumb.Jon Reid2012-04-13
* | Timeline: Remove default style track.Jon Reid2012-04-13
* | Timeline: More bug fixes for document switching.Jon Reid2012-04-13
* | Timeline: More bug fixes.Jon Reid2012-04-12
* | Timeline: Bug fixes: Document switching between new documents now working.Jon Reid2012-04-12
* | Timeline: Fixing the animated ElementKruti Shah2012-04-12
* | Timeline : Replace Element Taken Care ofKruti Shah2012-04-12
* | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-04-12
|\ \
| * \ Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-04-11
| |\ \
| * | | Timeline: Change Master Layer configuration menu to be on click; bug fix:Jon Reid2012-04-11
* | | | Merge branch 'refs/heads/timeline-kruti-local' into TimelineUberJonathan Duran2012-04-12
|\ \ \ \ | |_|/ / |/| | |
| * | | Timeline:Changing function nameKruti Shah2012-04-12
* | | | More Absolute vs Relative changes and cleanupJonathan Duran2012-04-11
| |/ / |/| |
* | | Timeline: Bug fix: Drag and Drop now working again.Jon Reid2012-04-10
* | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-04-10
|\ \ \
| * | | Abs. vs. Rel. animation postion functionsJonathan Duran2012-04-10
| * | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-04-10
| |\ \ \
| * \ \ \ Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-10
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| | * | Merge pull request #159 from mqg734/WebGLMaterialsValerio Virgillito2012-04-09
| | |\ \
| | | * | Undoing bad auto-merge resize-composer.js.Nivesh Rajbhandari2012-04-05
| | | * | Undoing some minor spacing differences from auto-merge.Nivesh Rajbhandari2012-04-05
| | | * | Undoing mistakes from auto-merge.Nivesh Rajbhandari2012-04-05
| | | * | Merge branch 'refs/heads/ToolFixes' into WebGLMaterialsNivesh Rajbhandari2012-04-04
| | | |\ \
| | | | * \ Merge branch 'refs/heads/WebGLFileIO' into ToolFixesNivesh Rajbhandari2012-04-04
| | | | |\ \