Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
| | * | | | | | | | | | | Merge pull request #5 from joseeight/FileIO-Integration | Eric | 2012-03-13 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | | | Uber material changes for IO | hwc487 | 2012-03-12 | |
| | * | | | | | | | | | | | Merge branch 'integration' of github.com:ericmueller/ninja-internal into inte... | hwc487 | 2012-03-12 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||
| | | * \ \ \ \ \ \ \ \ \ \ | Merge pull request #4 from joseeight/FileIO-Integration | Eric | 2012-03-12 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | | | | | Merge branch 'integration' of github.com:ericmueller/ninja-internal into inte... | hwc487 | 2012-03-09 | |
| | |\| | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | | Merge pull request #3 from joseeight/FileIO-Integration | Eric | 2012-03-09 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * | \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'FileIO-Integration' of github.com:joseeight/ninja-internal into... | hwc487 | 2012-03-09 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | ||||
* | / | | | | | | | | | | | | | | Adding Temp drag-drop I/O support | Jose Antonio Marquez | 2012-03-15 | |
|/ / / / / / / / / / / / / / / | ||||
* | | | | | | | | | | | | | | | Merge pull request #116 from joseeight/Color | Valerio Virgillito | 2012-03-14 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | Temp Fix for: IKNINJA-1078 | Jose Antonio Marquez | 2012-03-13 | |
* | | | | | | | | | | | | | | | Removing the obsolete modalContainer div. | Valerio Virgillito | 2012-03-14 | |
* | | | | | | | | | | | | | | | Merge pull request #117 from mencio/layout-fix | Valerio Virgillito | 2012-03-14 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | Fixing the layout to only draw one level and stage resize when the panels are... | Valerio Virgillito | 2012-03-13 | |
| * | | | | | | | | | | | | | | | Some code cleanup - removing unused assignments. | Valerio Virgillito | 2012-03-13 | |
* | | | | | | | | | | | | | | | | Merge pull request #114 from mqg734/ToolFixes | Valerio Virgillito | 2012-03-13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | Fixed drawing of multiple selection bounds when in flat case. | Nivesh Rajbhandari | 2012-03-13 | |
| * | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into ToolFixes | Nivesh Rajbhandari | 2012-03-13 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/ninja-internal' into ToolFixes | Nivesh Rajbhandari | 2012-03-13 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | Fixing selection tool when moving multiple selection in 3d mode. | Nivesh Rajbhandari | 2012-03-12 | |
| * | | | | | | | | | | | | | | | | Fixing snapping bugs in Selection, translate and rotate tools. | Nivesh Rajbhandari | 2012-03-12 | |
| * | | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into ToolFixes | Nivesh Rajbhandari | 2012-03-12 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into ToolFixes | Nivesh Rajbhandari | 2012-03-02 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #112 from ericguzman/PresetsPanel | Valerio Virgillito | 2012-03-13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | | Presets Panel - Re-add dbl-click activation | Eric Guzman | 2012-03-13 | |
| * | | | | | | | | | | | | | | | | | Presets Panel - Remove :active pseudo class from ninja-leaf | Eric Guzman | 2012-03-13 | |
| * | | | | | | | | | | | | | | | | | Presets Panel - Add :active pseudo class for ninja-tree | Eric Guzman | 2012-03-13 | |
| * | | | | | | | | | | | | | | | | | Presets Panel - Adding single-click activation | Eric Guzman | 2012-03-13 | |
| * | | | | | | | | | | | | | | | | | Presets Panel - Adding hover state to ninja-leaf | Eric Guzman | 2012-03-13 | |
| | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | | | Merge pull request #115 from joseeight/Color | Valerio Virgillito | 2012-03-13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | Deleting temp folder | Jose Antonio Marquez | 2012-03-13 | |
| * | | | | | | | | | | | | | | | | Renaming folder | Jose Antonio Marquez | 2012-03-13 | |
* | | | | | | | | | | | | | | | | | Merge pull request #113 from joseeight/Color | Valerio Virgillito | 2012-03-13 | |
|\| | | | | | | | | | | | | | | | | |_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | Gradient stop logic | Jose Antonio Marquez | 2012-03-13 | |
|/ / / / / / / / / / / / / / / | ||||
| | | | | | | | | | | | | * | | Merge branch 'refs/heads/ninja-internal' into WebGLFixes | Nivesh Rajbhandari | 2012-03-13 | |
| | | | | | | | | | | | | |\ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | Merge pull request #109 from imix23ways/TimelineUber | Valerio Virgillito | 2012-03-13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | Fix unassigned track element on document switch | Jonathan Duran | 2012-03-13 | |
| * | | | | | | | | | | | | | | Timeline : Fixing deleting the layers and hash table and removing while loops... | Jonathan Duran | 2012-03-12 | |
| * | | | | | | | | | | | | | | Merge branch 'refs/heads/Timeline-local' into TimelineUber | Jonathan Duran | 2012-03-12 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-local | Jon Reid | 2012-03-09 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | | | | | | | Timeline: new enablePanel() method on TimelinePanel class. | Jon Reid | 2012-03-09 | |
| * | | | | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-03-12 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / | |/| | / / / / / / / / / / / / / | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | Squashed commit of the following: | Jonathan Duran | 2012-03-09 | |
| * | | | | | | | | | | | | | | | Merge branch 'refs/heads/Timeline-local' into TimelineUber | Jonathan Duran | 2012-03-09 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / |