| Commit message (Expand) | Author | Age |
... | |
* | | | Merge remote-tracking branch 'ninja-internal/master' into Timeline-local | Jon Reid | 2012-02-23 |
|\| | |
|
| * | | Merge pull request #67 from ntfx47/PullRequest-Timeline | Valerio Virgillito | 2012-02-23 |
| |\ \ |
|
| | * | | Timeline : Fix for the split and element model error | Kruti Shah | 2012-02-23 |
| * | | | Fix to read back colors when re-opening files. | Nivesh Rajbhandari | 2012-02-23 |
* | | | | Timeline: Add hottext fields to layers and serialize them throughout. | Jon Reid | 2012-02-23 |
* | | | | add back layer selection | Jonathan Duran | 2012-02-23 |
* | | | | Remove unneeded selection code | Jonathan Duran | 2012-02-23 |
* | | | | Move element selection to click handler | Jonathan Duran | 2012-02-23 |
|/ / / |
|
* / / | Remove selection calls from timelinepanel.js | Jonathan Duran | 2012-02-23 |
|/ / |
|
* | | Fix for tween repetition arrays getting overwritten on file open | Jonathan Duran | 2012-02-23 |
* | | Timeline: Reopen Doc Restore TimeLine | Jonathan Duran | 2012-02-23 |
* | | New Doc | Jonathan Duran | 2012-02-23 |
* | | Timeline Track Open doc | Jonathan Duran | 2012-02-23 |
* | | Timeline:Open Doc in TimelinePanel.js | Jonathan Duran | 2012-02-23 |
* | | Timeline: Create new PropertyTrack subcomponent, and use it in the TimelineTr... | Jonathan Duran | 2012-02-23 |
* | | Unterminated lines | Jonathan Duran | 2012-02-23 |
* | | Redo timeline resize code | Jonathan Duran | 2012-02-23 |
* | | Timeline Reset to clean Master branch. Code scrub. | Jonathan Duran | 2012-02-23 |
* | | Integrating canvas-2d and WebGL drawing fixes. Also adding back WebGL materials. | Nivesh Rajbhandari | 2012-02-22 |
* | | Revert "Integrating canvas-2d drawing and WebGL fixes, including adding back ... | Nivesh Rajbhandari | 2012-02-22 |
* | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterials | Nivesh Rajbhandari | 2012-02-22 |
|\| |
|
| * | Removing the timeline selection code. | Valerio Virgillito | 2012-02-20 |
* | | Integrating canvas-2d drawing and WebGL fixes, including adding back WebGL ma... | Nivesh Rajbhandari | 2012-02-22 |
* | | Updated Materials Library and Materials Editor Popup to work with latest vers... | mqg734 | 2012-02-21 |
|/ |
|
* | Fixing the selectInput and finishing the textinput | Valerio Virgillito | 2012-02-16 |
* | Merge branch 'refs/heads/master' into components | Valerio Virgillito | 2012-02-16 |
|\ |
|
| * | Presets Panel - Move to bottom, add to menu | Eric Guzman | 2012-02-16 |
| * | Presets - Minor CSS text-shadow work-around for Windows Chrome | Eric Guzman | 2012-02-16 |
| * | Merge branch 'refs/heads/master' into PresetsPanel | Eric Guzman | 2012-02-16 |
| |\ |
|
| | * | CSSPanel - fix code indentation | Eric Guzman | 2012-02-16 |
| | * | CSS Panel - Add Resizer to sub panels | Eric Guzman | 2012-02-16 |
| * | | Merge branch 'refs/heads/TreeComponents' into PresetsPanel | Eric Guzman | 2012-02-16 |
| |\| |
|
| * | | Presets - Get/set active tab from local storage + other improvements | Eric Guzman | 2012-02-15 |
| * | | Presets - Modify application of preset classes for new json structure | Eric Guzman | 2012-02-15 |
| * | | Presets - Modify structure of preset data | Eric Guzman | 2012-02-15 |
| * | | Presets - Add external json file with transition data | Eric Guzman | 2012-02-15 |
| * | | Merge branch 'refs/heads/master' into PresetsPanel | Eric Guzman | 2012-02-13 |
| |\ \ |
|
| * | | | Style Presets - Separate out the style preset data to new file | Eric Guzman | 2012-02-13 |
| * | | | Merge branch 'refs/heads/master' into PresetsPanel | Eric Guzman | 2012-02-13 |
| |\ \ \ |
|
| * | | | | Presets - Committing half-baked drag and drop | Eric Guzman | 2012-02-13 |
| * | | | | Presets - fixed some object naming and css for presets tree | Eric Guzman | 2012-02-08 |
| * | | | | Merge branch 'refs/heads/master' into PresetsPanel | Eric Guzman | 2012-02-08 |
| |\ \ \ \ |
|
| * | | | | | Presets Panel - Initial commit with panel content | Eric Guzman | 2012-02-07 |
* | | | | | | Merge branch 'refs/heads/master' into components | Valerio Virgillito | 2012-02-15 |
|\ \ \ \ \ \
| | |_|_|_|/
| |/| | | | |
|
| * | | | | | Merge branch 'components' of https://github.com/mencio/ninja-internal into in... | Valerio Virgillito | 2012-02-14 |
| |\ \ \ \ \ |
|
| * \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-13 |
| |\ \ \ \ \ \
| | | |_|_|_|/
| | |/| | | | |
|
| * | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-13 |
| |\ \ \ \ \ \ |
|
| * \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-11 |
| |\ \ \ \ \ \ \
| | | |_|_|_|_|/
| | |/| | | | | |
|
| * | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-10 |
| |\ \ \ \ \ \ \ |
|
| * | | | | | | | | disabling the auto open of a document on load. Temporary using the new projec... | Valerio Virgillito | 2012-02-09 |