| Commit message (Expand) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| | * | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-03-23 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | Fix layer order and selection on reopen | Jonathan Duran | 2012-03-16 | |
| | * | | | | | | | | | | | | | Merge branch 'refs/heads/Timeline-local' into TimelineDOM | Jonathan Duran | 2012-03-16 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'Timeline-local' into Timeline-local-2 | Jon Reid | 2012-03-16 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-local | Jon Reid | 2012-03-16 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | * | | | | | | | | | | | | | | Timeline: Hook up data binding for changes on subproperties. | Jon Reid | 2012-03-16 | |
| | | | * | | | | | | | | | | | | | | Timeline: remove comment. | Jon Reid | 2012-03-15 | |
| | | | * | | | | | | | | | | | | | | Timeline: Remove selection timer on add new layer method. | Jon Reid | 2012-03-15 | |
| | | | * | | | | | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-local | Jon Reid | 2012-03-15 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | * | | | | | | | | | | | | | | | Timeline: Fix for layer selection problems on file open and switch. | Jon Reid | 2012-03-15 | |
| | * | | | | | | | | | | | | | | | | | Consolidate conversion functions | Jonathan Duran | 2012-03-16 | |
| | * | | | | | | | | | | | | | | | | | Cleanup | Jonathan Duran | 2012-03-16 | |
| | |/ / / / / / / / / / / / / / / / | ||||
| | * | | | | | | | | | | | | | | | | Bug fix and cleanup | Jonathan Duran | 2012-03-16 | |
| | * | | | | | | | | | | | | | | | | Fix layer select on selection change | Jonathan Duran | 2012-03-16 | |
| | * | | | | | | | | | | | | | | | | Start enforcing one element per layer | Jonathan Duran | 2012-03-16 | |
| | | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | Update materials to the new texture model. | hwc487 | 2012-04-26 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterials | Nivesh Rajbhandari | 2012-04-25 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | Merge branch 'refs/heads/master' into stage-document-architecture | Valerio Virgillito | 2012-04-23 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | | | cleanup unused code. | Valerio Virgillito | 2012-04-19 | |
| | | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | Temporary fix for the PI and Stage when opening the new template. | Valerio Virgillito | 2012-04-23 | |
| | * | | | | | | | | | | | | | more backup fixes for the old stage | Valerio Virgillito | 2012-04-20 | |
| | * | | | | | | | | | | | | | reverting old template to current working status. New template work. | Valerio Virgillito | 2012-04-20 | |
| | * | | | | | | | | | | | | | initial stage web template | Valerio Virgillito | 2012-04-18 | |
| | |/ / / / / / / / / / / / | ||||
| | * | | | | | | | | | | / | Squashed commit of the following: | Valerio Virgillito | 2012-04-18 | |
| | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | ||||
| | * | | | | | | | | | | | Merge pull request #165 from mqg734/BoundsCalculation | Valerio Virgillito | 2012-04-17 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||
| | | * | | | | | | | | | | | Drag and drop of images and components should not add 3d values by default. | Nivesh Rajbhandari | 2012-04-16 | |
| | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | ||||
| | * | | | | | | | | | | | collapsing the history panel by default and commenting out the undo for the 3... | Valerio Virgillito | 2012-04-13 | |
| | * | | | | | | | | | | | setAttribute added to the undo/redo | Valerio Virgillito | 2012-04-09 | |
| | * | | | | | | | | | | | adding a history panel | Valerio Virgillito | 2012-04-09 | |
| | |/ / / / / / / / / / | ||||
| * / / / / / / / / / / | Fixed materials editor popup not refreshing correctly. | Nivesh Rajbhandari | 2012-04-16 | |
| |/ / / / / / / / / / | ||||
| * | | | | | | | | | | Merge pull request #159 from mqg734/WebGLMaterials | Valerio Virgillito | 2012-04-09 | |
| |\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | ||||
| | * | | | | | | | | | Undoing bad auto-merge resize-composer.js. | Nivesh Rajbhandari | 2012-04-05 | |
| | * | | | | | | | | | Undoing some minor spacing differences from auto-merge. | Nivesh Rajbhandari | 2012-04-05 | |
| | * | | | | | | | | | Undoing mistakes from auto-merge. | Nivesh Rajbhandari | 2012-04-05 | |
| | * | | | | | | | | | Merge branch 'refs/heads/ToolFixes' into WebGLMaterials | Nivesh Rajbhandari | 2012-04-04 | |
| | |\ \ \ \ \ \ \ \ \ | ||||
| | | * \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/WebGLFileIO' into ToolFixes | Nivesh Rajbhandari | 2012-04-04 | |
| | | |\ \ \ \ \ \ \ \ \ | ||||
| | | | * \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/EricSnapping' into WebGLFileIO | Nivesh Rajbhandari | 2012-04-04 | |
| | | | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / | | | |/| | | | | | | | | ||||
| | | | | * | | | | | | | | merge from main | hwc487 | 2012-03-29 | |
| | | | | | |_|_|_|/ / / | | | | |/| | | | | | | ||||
| | | * | | | | | | | | | Styling PI's Materials edit button. | Nivesh Rajbhandari | 2012-04-04 | |
| | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | ||||
| | * | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterials | Nivesh Rajbhandari | 2012-03-27 | |
| | |\ \ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | | Adding logic for flatten checkbox in PI. | Nivesh Rajbhandari | 2012-03-24 | |
| | * | | | | | | | | | | Tweaking some styles in the materials popup. | Nivesh Rajbhandari | 2012-03-23 | |
| | * | | | | | | | | | | IKNINJA-758 - The rotation value of the stage is not updated in the propertie... | Nivesh Rajbhandari | 2012-03-22 | |
| | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | ||||
| * | | | | | | | | | | fixing the number fields to not have units. | Valerio Virgillito | 2012-04-04 | |
| * | | | | | | | | | | Merge branch 'refs/heads/master' into components | Valerio Virgillito | 2012-04-04 | |
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | ||||
| | * | | | | | | | | | Merge pull request #149 from dhg637/BugFixes | Valerio Virgillito | 2012-04-04 | |
| | |\ \ \ \ \ \ \ \ \ | ||||
| | | * \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/master' into BugFixes | Armen Kesablyan | 2012-04-04 | |
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | | | ||||
| | | * | | | | | | | | | Resizing Bugs | Armen Kesablyan | 2012-03-29 | |
| | | * | | | | | | | | | Bug #1073: Panels interact with hottest drag drop | Armen Kesablyan | 2012-03-28 | |
| | | | |_|_|_|/ / / / | | |/| | | | | | | | ||||
| | * | | | | | | | | | Merge branch 'refs/heads/master' into PresetsPI | Eric Guzman | 2012-04-04 | |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | ||||