aboutsummaryrefslogtreecommitdiff
path: root/assets
Commit message (Collapse)AuthorAge
* Merge branch 'master' into pentoolPushkar Joshi2012-05-31
|\
| * Merge branch 'refs/heads/master' into dom-architectureValerio Virgillito2012-05-22
| |\ | | | | | | | | | | | | | | | | | | Conflicts: js/io/system/ninjalibrary.json Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * Updates for WebGL/Canvas 2D authortime and runtime gradients.hwc4872012-05-18
| | |
| | * Linear & radial gradients for runtime fixeshwc4872012-05-17
| | |
| | * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into 3DBugshwc4872012-05-11
| | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: js/lib/geom/circle.js js/lib/geom/rectangle.js
| | * | WebGL linear gradients to match CSShwc4872012-05-08
| | | |
| | * | Radial gradients to match CSShwc4872012-05-08
| | | |
| * | | Modifying Canvas Data I/OJose Antonio Marquez2012-05-21
| | | | | | | | | | | | | | | | Changing methods to save all data to external files, this will be optional for the user. Currently save will only save to external files, but UI will allow user to save in file. Need to implement loading data on file open for external file, only works for in file currently. Modified the Runtime file to load all data itself to not bulk up the user document.
| * | | Squashed master into dom-architectureValerio Virgillito2012-05-16
| |/ / | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | / move all the subpath functions to its prototype, and first version of the ↵Pushkar Joshi2012-05-31
| |/ |/| | | | | pen path runtime
* | Updating canvas-runtime to use object literal notation.Nivesh Rajbhandari2012-05-10
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Converting canvas runtime to use prototypes for geom obj, rectangle, oval ↵Nivesh Rajbhandari2012-05-03
|/ | | | | | and line. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-04-27
|\ | | | | | | Canvas-interaction
| * Updating the canvas runtime files for gradient and rectangle radius fixes.Nivesh Rajbhandari2012-04-25
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | canvas interactionhwc4872012-04-26
|/
* Updated canvas-runtime.js to support gradients for rectangle and oval in ↵Nivesh Rajbhandari2012-04-05
| | | | | | canvas2d shape mode. Also fixed some typos. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Changing .default to ["default"] to avoid WebStorm errors.Nivesh Rajbhandari2012-04-05
| | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Undoing mistakes from auto-merge.Nivesh Rajbhandari2012-04-05
| | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Merge branch 'refs/heads/WebGLFileIO' into ToolFixesNivesh Rajbhandari2012-04-04
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: assets/canvas-runtime.js js/controllers/elements/shapes-controller.js js/lib/drawing/world.js js/lib/geom/geom-obj.js js/lib/geom/line.js js/mediators/element-mediator.js js/panels/presets/animations-presets.reel/animations-presets.js js/panels/presets/style-presets.reel/style-presets.js js/panels/presets/transitions-presets.reel/transitions-presets.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * IKNinja-1392 - Unable to view Oval canvas2D with Inner Radius in the ↵Nivesh Rajbhandari2012-04-03
| | | | | | | | | | | | | | | | Chrome-Preview. Any shapes object are drawn after will not shown in Chrome-Preview. Vector.create should be replaced with [ ] notation. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Removed the dependence on an "assets" directory for the RDGE runtime. Now ↵John Mayhew2012-04-03
| | | | | | | | Ninja does not need to create duplicate files when it sets up the users Ninja Projects directory for RDGE support.
* | removed old unused import and export functions.John Mayhew2012-04-03
| |
* | Namespaced the canvas runtime file and updated all dependenciesJohn Mayhew2012-04-03
| |
* | updated the rdge compiled version and its runtime, incremented rdge library ↵John Mayhew2012-04-03
|/ | | | version number
* Fixed issue with WebGL materials not working after file-save or ↵Nivesh Rajbhandari2012-03-26
| | | | | | chrome-preview. Also fixed Raiders material not showing in the PI or working during Chrome Preview. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Squashed commit of the following GL integrationValerio Virgillito2012-03-22
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Corrections for Uber shader IOhwc4872012-03-14
|
* Fixed BumpMetal materialhwc4872012-03-13
|
* Cleaning up webGL runtimeJose Antonio Marquez2012-03-13
|
* Fix for 2D Canvas runtimeJose Antonio Marquez2012-03-12
| | | | Array was not allowing for multiple items.
* Temp Runtime WebGL FixJose Antonio Marquez2012-03-10
| | | | Added a temporary fix to allow for webGL runtime functionality. Copying the desired folder name into a static name. There is a lag in doing this, so obviously now ideal. Need to discuss adding dynamic path-ing during author and runtime.
* remap hard coded strings in rdge internal code.hwc4872012-03-09
|
* Merge pull request #32 from ericmueller/integrationJose Antonio Marquez Russo2012-03-09
|\ | | | | Added asset folder replacement to runtime load.
| * Added asset folder replacement to runtime load.hwc4872012-03-09
| |
* | Adding missing file for webGL, still need a fix for runtimeJose Antonio Marquez2012-03-09
|/
* Adding webGL I/O runtime functionalityJose Antonio Marquez2012-03-09
| | | | There is a problem that needs to be resolved in the CanvasRuntime.
* Adding I/O functionality to RDGEJose Antonio Marquez2012-03-08
| | | | Added webGL/Canvas file I/O for Ninja, it also created routine for saving data for runtime, however, the runtime RDGE library needs an update for runtime to work, so right now I/O will only work for Ninja.
* Fixed a few problems with Plasma material.hwc4872012-03-07
|
* Added all materials back inhwc4872012-02-22
|
* Adding new RDGE library dataJose Antonio Marquez2012-02-16
|
* Setting up webGL local library (assets)Jose Antonio Marquez2012-02-15
|
* Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-11
|\ | | | | | | | | Conflicts: js/ninja.reel/ninja.html
| * Undoing experimental changes from the basic webgl shaders.Nivesh Rajbhandari2012-02-09
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Removing image assets that were being used by deleted WebGL materials.Nivesh Rajbhandari2012-02-09
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Removed unused materials.Nivesh Rajbhandari2012-02-09
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Removed unused images and reduced the size of the larger image files used ↵John Mayhew2012-02-01
| | | | | | | | for shaders.
* | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-09
|\ \
| * | removing shadersPushkar Joshi2012-02-09
| | |
| * | changes to allow minimal rendering ofnon-animated materials.hwc4872012-02-01
| | |
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-01-31
| |\ \ | | | | | | | | | | | | working