aboutsummaryrefslogtreecommitdiff
path: root/js/document
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/Document' into stage-document-architectureValerio Virgillito2012-04-19
|\
| * Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-04-10
| |\
| * \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-04-04
| |\ \
| * | | Backup for mergeJose Antonio Marquez2012-04-04
| * | | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-04-02
| |\ \ \
| * | | | Setting up document reworkJose Antonio Marquez2012-04-02
* | | | | initial stage web templateValerio Virgillito2012-04-18
| |_|_|/ |/| | |
* | | | Merge pull request #159 from mqg734/WebGLMaterialsValerio Virgillito2012-04-09
|\ \ \ \
| * | | | Removing fill, stroke, fillMaterial and strokeMaterial from the shapeModel ca...Nivesh Rajbhandari2012-04-05
| * | | | Merge branch 'refs/heads/ToolFixes' into WebGLMaterialsNivesh Rajbhandari2012-04-04
| |\ \ \ \
| | * \ \ \ Merge branch 'refs/heads/WebGLFileIO' into ToolFixesNivesh Rajbhandari2012-04-04
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | Give user feedback about which element the Fill/InkBottle tools will act on.Nivesh Rajbhandari2012-04-03
| | | * | | Merge branch 'refs/heads/ninja-internal' into WebGLFileIONivesh Rajbhandari2012-03-30
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | * | | Updated shapes to always check for its stroke and fill colors and materials i...Nivesh Rajbhandari2012-03-29
| | | | |/ | | | |/|
| * | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-03-27
| |\ \ \ \
| * | | | | Adding logic for flatten checkbox in PI.Nivesh Rajbhandari2012-03-24
* | | | | | Merge pull request #157 from ananyasen/ninja-internal-master-patch1Valerio Virgillito2012-04-04
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | [CR] Keep Save related menu items always enabled, if there is an open documentAnanya Sen2012-04-04
| | |_|_|/ | |/| | |
* | | | | Removed the dependence on an "assets" directory for the RDGE runtime. Now Nin...John Mayhew2012-04-03
* | | | | removed old unused import and export functions.John Mayhew2012-04-03
* | | | | Namespaced the canvas runtime file and updated all dependenciesJohn Mayhew2012-04-03
|/ / / /
* | | | Merge pull request #147 from pushkarjoshi/brushtoolValerio Virgillito2012-03-29
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch 'master' into brushtoolPushkar Joshi2012-03-28
| |\ \ \
| * | | | File IO for the brush stroke AND changing the data type of brush stroke from ...Pushkar Joshi2012-03-27
| | |_|/ | |/| |
* | | | Merge pull request #131 from ananyasen/integration-candidateValerio Virgillito2012-03-28
|\ \ \ \ | |_|/ / |/| | |
| * | | - enable/disable save, saveAs, saveAll, close, closeAll as per documents openAnanya Sen2012-03-22
| | |/ | |/|
* | | Presets Controller - Removing test background from transition classEric Guzman2012-03-27
* | | Merge branch 'refs/heads/master' into PresetsPIEric Guzman2012-03-27
|\ \ \ | | |/ | |/|
| * | Removing m-js components I/O and fix for webGLJose Antonio Marquez2012-03-23
| * | Merge branch 'refs/heads/Ninja-Montage-Integration' into FileIO-Montage-Compo...Jose Antonio Marquez2012-03-22
| |\ \
| | * | Squashed commit of the following GL integrationValerio Virgillito2012-03-22
| * | | Adding Ninja URL method to io-mediatorJose Antonio Marquez2012-03-22
| * | | Adding firstDraw event to components addedJose Antonio Marquez2012-03-22
| |/ /
| * | Adding 'addComponentFirstDraw' event from the user document main component.Valerio Virgillito2012-03-21
| * | Merge branch 'refs/heads/francoisfrisch-Ninja-Internal' into FileIO-Montage-C...Jose Antonio Marquez2012-03-18
| |\ \
| | * | Deleting unecessary propertyFrançois Frisch2012-03-17
| | * | Getting ownerComponent bindingsFrançois Frisch2012-03-17
| | |/
| * / Temp I/O functionality for M-JS componentsJose Antonio Marquez2012-03-18
| |/
* / Presets Panel - Adding presets controller and removing functionality from pan...Eric Guzman2012-03-22
|/
* Corrections for Uber shader IOhwc4872012-03-14
* Fixed BumpMetal materialhwc4872012-03-13
* Add temp delay for webGL previewJose Antonio Marquez2012-03-10
* further removal of authortime asset path replacement.hwc4872012-03-09
* Removed asset path replacement at authortime.hwc4872012-03-09
* Adding webGL I/O runtime functionalityJose Antonio Marquez2012-03-09
* Merge branch 'refs/heads/integration' into FileIO-IntegrationJose Antonio Marquez2012-03-09
|\
| * Canvas IOhwc4872012-03-08
* | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-08
|\ \
| * | IKNINJA-1270: fixed browser crashing when you close a document while playing ...Ananya Sen2012-03-08
* | | Merge pull request #30 from ananyasen/FileIO-ananyaJose Antonio Marquez Russo2012-03-08
|\ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-30 04:13:03 +0000