| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge pull request #34 from ericmueller/integration | Jose Antonio Marquez Russo | 2012-03-15 |
| |\ | | | | | Integration | ||
| | * | Corrections for Uber shader IO | hwc487 | 2012-03-14 |
| | | | |||
| | * | Fixed BumpMetal material | hwc487 | 2012-03-13 |
| | | | |||
| | * | Merge pull request #5 from joseeight/FileIO-Integration | Eric | 2012-03-13 |
| | |\ | | | | | | | Clean-Up | ||
| | * | | Uber material changes for IO | hwc487 | 2012-03-12 |
| | | | | |||
| | * | | Merge branch 'integration' of github.com:ericmueller/ninja-internal into ↵ | hwc487 | 2012-03-12 |
| | |\ \ | | | | | | | | | | | | | integration | ||
| | | * \ | Merge pull request #4 from joseeight/FileIO-Integration | Eric | 2012-03-12 |
| | | |\ \ | | | | | | | | | | | File IO Updates | ||
| | * | | | | Merge branch 'integration' of github.com:ericmueller/ninja-internal into ↵ | hwc487 | 2012-03-09 |
| | |\| | | | | | | | | | | | | | | | | | | integration | ||
| | | * | | | Merge pull request #3 from joseeight/FileIO-Integration | Eric | 2012-03-09 |
| | | |\ \ \ | | | | | | | | | | | | | Integrated dynamic path to assets | ||
| | * | \ \ \ | Merge branch 'FileIO-Integration' of github.com:joseeight/ninja-internal ↵ | hwc487 | 2012-03-09 |
| | |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | into integration | ||
| * | | | | | | Merge pull request #116 from joseeight/Color | Valerio Virgillito | 2012-03-14 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Temp Fix for: IKNINJA-1078 | ||
| | * | | | | | | Temp Fix for: IKNINJA-1078 | Jose Antonio Marquez | 2012-03-13 |
| | | | | | | | | |||
| * | | | | | | | Removing the obsolete modalContainer div. | Valerio Virgillito | 2012-03-14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | | | Merge pull request #117 from mencio/layout-fix | Valerio Virgillito | 2012-03-14 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Layout Fixes and Canvas sized when panels are collapsed | ||
| | * | | | | | | | Fixing the layout to only draw one level and stage resize when the panels ↵ | Valerio Virgillito | 2012-03-13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | are collapsed. Fixing the following bugs: IKNINJA-1068 Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | | | Some code cleanup - removing unused assignments. | Valerio Virgillito | 2012-03-13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | | | | Merge pull request #114 from mqg734/ToolFixes | Valerio Virgillito | 2012-03-13 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | Fixed selection rectangle for multiple selection case. | ||
| | * | | | | | | | Fixed drawing of multiple selection bounds when in flat case. | Nivesh Rajbhandari | 2012-03-13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | | | | | | Fixing snapping bugs in Selection, translate and rotate tools. | Nivesh Rajbhandari | 2012-03-12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should show snap marker on mouse move for selection tool prior to mousing down as well. We should create drag plane parallel to the view and where the user moused down. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | | | | | | 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 - Ninja-leaf hover state | ||
| | * | | | | | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | Color folder rename | ||
| | * | | | | | | | | | | | 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 | ||
| | * | | | | | | | | | | Gradient stop logic | Jose Antonio Marquez | 2012-03-13 |
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Made logic changes to allow for a minimum number of gradients to remain at 2 at all times and not apply default colors. | ||
| * | | | | | | | | | | Merge pull request #109 from imix23ways/TimelineUber | Valerio Virgillito | 2012-03-13 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Timeline uber | ||
| | * | | | | | | | | | | Fix unassigned track element on document switch | Jonathan Duran | 2012-03-13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | | | | | | | | | | Timeline : Fixing deleting the layers and hash table and removing while ↵ | Jonathan Duran | 2012-03-12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | loops replacing with for loops Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | | | | | | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | |</ | |||