| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into working | hwc487 | 2012-02-07 |
| |\ | | | | | | | | | | | | | Conflicts: js/helper-classes/RDGE/GLRectangle.js js/helper-classes/RDGE/GLWorld.js js/helper-classes/RDGE/MaterialsLibrary.js | ||
| | * | id's must start with a letter, so our workaround for using uuid for RDGE ↵ | Nivesh Rajbhandari | 2012-02-07 |
| | | | | | | | | | | | | | canvas id's won't work because they often start with a number. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Fixing some typos and undeclared variables in GLRectangle and ShapesController. | Nivesh Rajbhandari | 2012-02-07 |
| | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Supporting switching materials in the PI. Also, moved makeFillMaterial and ↵ | Nivesh Rajbhandari | 2012-02-07 |
| | | | | | | | | | | | | | makeStrokeMaterial functions into GLGeomObj so shapes other than GLRectangle can use these routines. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Fixed PI to support WebGL materials. | Nivesh Rajbhandari | 2012-02-07 |
| | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Updated tools and PI to get/set materials by binding to appModel's materials ↵ | Nivesh Rajbhandari | 2012-02-07 |
| | | | | | | | | | | | | | property. This requires us to add FlatMaterial to the list of materials in the MaterialsLibrary. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Merge branch 'refs/heads/ninja-internal' into ToolFixes | Nivesh Rajbhandari | 2012-02-07 |
| | |\ | |||
| | | * | Attempt to fix initialization bug for snap-manager | Jose Antonio Marquez | 2012-02-06 |
| | | | | |||
| | | * | TreeController - moving the tree controller to the components directory | Eric Guzman | 2012-02-06 |
| | | | | |||
| | | * | Tree Components - Adding the tree components | Eric Guzman | 2012-02-06 |
| | | | | |||
| | | * | Tree Controller - Clean out unused code | Eric Guzman | 2012-02-06 |
| | | | | |||
| | | * | Tree Controller - Initial add | Eric Guzman | 2012-02-06 |
| | | | | |||
| | | * | Styles Controller - Add some methods for modifying css keyframe rules | Eric Guzman | 2012-02-06 |
| | | | | |||
| | | * | Styles Controller - Correct author attribution for specificity calculation | Eric Guzman | 2012-02-06 |
| | | | | |||
| | | * | Styles Controller - Add code to remove cache items from history (not just ↵ | Eric Guzman | 2012-02-06 |
| | | | | | | | | | | | | | nullifying them) | ||
| | | * | Styles Controller - First stab at group styling | Eric Guzman | 2012-02-06 |
| | | | | | | | | | | | | | Split "createOverrideRule" into two methods --> now has createOverrideSelector. Also took first stab at creating a group style. | ||
| | * | | Force layout canvas and SelectionController to update their info when a 2d ↵ | Nivesh Rajbhandari | 2012-02-06 |
| | | | | | | | | | | | | | | | | | | | canvas is replaced by a 3d canvas (and vice-versa). Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | Support toggling between 2d and 3d canvas context. This requires us to ↵ | Nivesh Rajbhandari | 2012-02-06 |
| | | | | | | | | | | | | | | | | | | | create a new canvas with all the same values as the canvas being replaced and copying over all the shape data. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | Add enabled property for ComboBox to support enabling/disabling materials ↵ | Nivesh Rajbhandari | 2012-02-06 |
| | | | | | | | | | | | | | | | | | | | dropdowns in the PI. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | Allow users to switch between 2d and webGL mode. Note that this doesn't ↵ | Nivesh Rajbhandari | 2012-02-06 |
| | | | | | | | | | | | | | | | | | | | currently work. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | test code for deformation shader | hwc487 | 2012-02-07 |
| | | | | |||
| * | | | Enhanced the overlap test for the selection tool marquee select. | hwc487 | 2012-02-06 |
| | | | | |||
| * | | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into working | hwc487 | 2012-02-06 |
| |\| | | |||
| | * | | Support use WebGL checkbox in the PI. | Nivesh Rajbhandari | 2012-02-06 |
| | |/ | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Merge pull request #15 from mqg734/ToolFixes | Valerio Virgillito | 2012-02-06 |
| | |\ | | | | | | | Adding, deleting and modifying elements now keep the element planes and PI in sync. | ||
| | | * | Fixing format of for loop. | Nivesh Rajbhandari | 2012-02-06 |
| | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | We were only updating the first custom section in the PI. | Nivesh Rajbhandari | 2012-02-03 |
| | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | IKNINJA-854 - removed cons and replaced it with var | Valerio Virgillito | 2012-02-03 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | Removed an unnecessary (and incorrect) snapping calculation. | hwc487 | 2012-02-06 |
| | | | | |||
| * | | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into working | hwc487 | 2012-02-03 |
| |\ \ \ | | |/ | |/| | |||
| | * | | Update element planes after shapes are created so stage grid updates. | Nivesh Rajbhandari | 2012-02-03 |
| | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | Handle delete of multiple objects. Also, have deletion go through the ↵ | Nivesh Rajbhandari | 2012-02-03 |
| | | | | | | | | | | | | | | | | | | | mediator so elementDeleted event is fired for SnapManager, DrawUtils, etc. to clean up after deleted element(s). Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | Update grid and planes when elementChange event signifies the "matrix", ↵ | Nivesh Rajbhandari | 2012-02-03 |
| | | | | | | | | | | | | | | | | | | | "left", "top", "width" or "height" properties have changed. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | Update grid and planes when elementChange event signifies the "matrix", ↵ | Nivesh Rajbhandari | 2012-02-03 |
| | | | | | | | | | | | | | | | | | | | "left", "top", "width" or "height" properties have changed. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | Merge branch 'refs/heads/NiveshColor' into ToolFixes | Nivesh Rajbhandari | 2012-02-03 |
| | |\ \ | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | Removed border special-casing from PI since the mediator now handles this ↵ | Nivesh Rajbhandari | 2012-02-01 |
| | | | | | | | | | | | | | | | | | | | | | | | | | generically. Updated mediator's set stroke routine to use the setColor routine. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | Updated color code in the PI to go through element mediator. | Nivesh Rajbhandari | 2012-02-01 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | Updated color code to handle shapes. | Nivesh Rajbhandari | 2012-01-31 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | Merge branch 'refs/heads/Jose-Color' into NiveshColor | Nivesh Rajbhandari | 2012-01-31 |
| | | |\ \ | |||
| | * | \ \ | Merge branch 'refs/heads/master' into ToolFixes | Nivesh Rajbhandari | 2012-02-03 |
| | |\ \ \ \ | | | |_|/ | | |/| | | |||
| | * | | | | Update PI when element is changed by one of the tools. | Nivesh Rajbhandari | 2012-02-02 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | Fixing keyboard shortcut and tooltip for hand and 3d tools. | Nivesh Rajbhandari | 2012-02-02 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | | Added a counter to the renderer that tracks the number of unloaded texture maps. | hwc487 | 2012-02-03 |
| | | | | | | | | | | | | | | | | | | | | | Started vertex deformations. | ||
| * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-02-03 |
| |\ \ \ \ \ | | |/ / / | |/| | | | | | | | | working | ||
| | * | | | | Merge branch 'montage-integration' into staging | Valerio Virgillito | 2012-02-02 |
| | |\ \ \ \ | |||
| | | * | | | | Fixed the color popups to work with m-js v6 | Jose Antonio Marquez | 2012-02-02 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Removed the wrapper DIV, now it's more direct to create and insert the content in the popups. Changes created DOM exceptions, so it had to be modified. | ||
| | | * | | | | upgrading to Montage v0.6 | Valerio Virgillito | 2012-02-02 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | | Revert "Adding njUtils as a component and adding it to the application object" | Valerio Virgillito | 2012-02-01 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f07bbfaa60c3fb7c2412c5aa97b49d114d6a88ea. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | | Fixes for montage integration | Valerio Virgillito | 2012-02-01 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | | Adding njUtils as a component and adding it to the application object | Valerio Virgillito | 2012-02-01 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||