aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/NINJAmaster' into TimelineJonathan Duran2012-02-25
|\
| * Adding some missing copyrightsValerio Virgillito2012-02-24
* | Merge branch 'refs/heads/NINJAmaster' into TimelineJonathan Duran2012-02-24
|\|
| * Merge pull request #67 from ntfx47/PullRequest-TimelineValerio Virgillito2012-02-23
| |\
| | * Timeline : Fix for the split and element model errorKruti Shah2012-02-23
| * | Fix to read back colors when re-opening files.Nivesh Rajbhandari2012-02-23
* | | add back layer selectionJonathan Duran2012-02-23
* | | Remove unneeded selection codeJonathan Duran2012-02-23
* | | Move element selection to click handlerJonathan Duran2012-02-23
|/ /
* / Remove selection calls from timelinepanel.jsJonathan Duran2012-02-23
|/
* Fix for tween repetition arrays getting overwritten on file openJonathan Duran2012-02-23
* Timeline: Reopen Doc Restore TimeLineJonathan Duran2012-02-23
* New DocJonathan Duran2012-02-23
* Timeline Track Open docJonathan Duran2012-02-23
* Timeline:Open Doc in TimelinePanel.jsJonathan Duran2012-02-23
* Timeline: Create new PropertyTrack subcomponent, and use it in the TimelineTr...Jonathan Duran2012-02-23
* Unterminated linesJonathan Duran2012-02-23
* Redo timeline resize codeJonathan Duran2012-02-23
* Timeline Reset to clean Master branch. Code scrub.Jonathan Duran2012-02-23
* Integrating canvas-2d and WebGL drawing fixes. Also adding back WebGL materials.Nivesh Rajbhandari2012-02-22
* Revert "Integrating canvas-2d drawing and WebGL fixes, including adding back ...Nivesh Rajbhandari2012-02-22
* Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-02-22
|\
| * Removing the timeline selection code.Valerio Virgillito2012-02-20
* | Integrating canvas-2d drawing and WebGL fixes, including adding back WebGL ma...Nivesh Rajbhandari2012-02-22
* | Updated Materials Library and Materials Editor Popup to work with latest vers...mqg7342012-02-21
|/
* Fixing the selectInput and finishing the textinputValerio Virgillito2012-02-16
* Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-02-16
|\
| * Presets Panel - Move to bottom, add to menuEric Guzman2012-02-16
| * Presets - Minor CSS text-shadow work-around for Windows ChromeEric Guzman2012-02-16
| * Merge branch 'refs/heads/master' into PresetsPanelEric Guzman2012-02-16
| |\
| | * CSSPanel - fix code indentationEric Guzman2012-02-16
| | * CSS Panel - Add Resizer to sub panelsEric Guzman2012-02-16
| * | Merge branch 'refs/heads/TreeComponents' into PresetsPanelEric Guzman2012-02-16
| |\|
| * | Presets - Get/set active tab from local storage + other improvementsEric Guzman2012-02-15
| * | Presets - Modify application of preset classes for new json structureEric Guzman2012-02-15
| * | Presets - Modify structure of preset dataEric Guzman2012-02-15
| * | Presets - Add external json file with transition dataEric Guzman2012-02-15
| * | Merge branch 'refs/heads/master' into PresetsPanelEric Guzman2012-02-13
| |\ \
| * | | Style Presets - Separate out the style preset data to new fileEric Guzman2012-02-13
| * | | Merge branch 'refs/heads/master' into PresetsPanelEric Guzman2012-02-13
| |\ \ \
| * | | | Presets - Committing half-baked drag and dropEric Guzman2012-02-13
| * | | | Presets - fixed some object naming and css for presets treeEric Guzman2012-02-08
| * | | | Merge branch 'refs/heads/master' into PresetsPanelEric Guzman2012-02-08
| |\ \ \ \
| * | | | | Presets Panel - Initial commit with panel contentEric Guzman2012-02-07
* | | | | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-02-15
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'components' of https://github.com/mencio/ninja-internal into in...Valerio Virgillito2012-02-14
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-13
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-13
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-11
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-10
| |\ \ \ \ \ \ \