aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Expand)AuthorAge
...
| * | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-26
| |\| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-04-25
| | |\| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Fixed materials editor popup not refreshing correctly.Nivesh Rajbhandari2012-04-16
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | |
* | / | | | | | | | | | | | | | | | | | Timeline: Decouple Timeline and Breadcrumb. Remove most document changeJon Reid2012-04-26
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-04-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Timeline Bug Fix : 1541Kruti Shah2012-04-25
* | | | | | | | | | | | | | | | | | | | Timeline: Handling of multiselect of elements from stage.Jon Reid2012-04-25
* | | | | | | | | | | | | | | | | | | | Timeline: New tracking for multiple selected layers.Jon Reid2012-04-25
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/master' into stage-document-architectureValerio Virgillito2012-04-23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Temporary fix for the PI and Stage when opening the new template.Valerio Virgillito2012-04-23
| * | | | | | | | | | | | | | | | | | more backup fixes for the old stageValerio Virgillito2012-04-20
| * | | | | | | | | | | | | | | | | | reverting old template to current working status. New template work.Valerio Virgillito2012-04-20
| * | | | | | | | | | | | | | | | | | initial stage web templateValerio Virgillito2012-04-18
* | | | | | | | | | | | | | | | | | | Turn on width and height as tweenable propertiesJonathan Duran2012-04-24
* | | | | | | | | | | | | | | | | | | Change sublayer property names to match css property namesJonathan Duran2012-04-23
* | | | | | | | | | | | | | | | | | | Fix Select All bug and remove debuggersJonathan Duran2012-04-23
* | | | | | | | | | | | | | | | | | | Breadcrumb FixKruti Shah2012-04-20
* | | | | | | | | | | | | | | | | | | 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
| * | | | | |