aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
* Uber material changes for IOhwc4872012-03-12
|
* Add temp delay for webGL previewJose Antonio Marquez2012-03-10
| | | | Added a padded launch webGL preview delay. This is very temporary, just a work around until RDGE issues are fixed.
* 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.
* Setting local path to assetsJose Antonio Marquez2012-03-10
| | | | This is still no resolving issues with webGL runtime.
* Merge branch 'refs/heads/Ninja-Internal' into FileIO-IntegrationJose Antonio Marquez2012-03-09
|\
| * reverting old pi dataValerio Virgillito2012-03-09
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Merge branch 'refs/heads/Ninja-Internal' into FileIO-IntegrationJose Antonio Marquez2012-03-09
|\|
| * Temp Gradient FixJose Antonio Marquez2012-03-09
| | | | | | | | Temporary fix for getting gradient mode.
| * Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-03-09
| |\
| * \ Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-02-29
| |\ \ | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/shapes-controller.js
| * \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-28
| |\ \ \
| * \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-23
| |\ \ \ \
| * \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-22
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-21
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-17
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-17
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-16
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-15
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Bug FixesJose Antonio Marquez2012-02-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IKNINJA-1101 IKNINJA-1079 IKNINJA-1144
| * | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-11
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-08
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-08
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/shapes-controller.js js/data/pi/pi-data.js js/panels/properties/content.reel/content.js
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-02
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/shapes-controller.js js/data/pi/pi-data.js js/panels/properties/content.reel/content.js
* | | | | | | | | | | | | | | | Fixing Issues for Windows LibJose Antonio Marquez2012-03-09
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #33 from ericmueller/integrationJose Antonio Marquez Russo2012-03-09
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Integration
| * | | | | | | | | | | | | | | | remap hard coded strings in rdge internal code.hwc4872012-03-09
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'FileIO-Integration' of github.com:joseeight/ninja-internal ↵hwc4872012-03-09
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into integration Conflicts: js/document/html-document.js
| * | | | | | | | | | | | | | | | | further removal of authortime asset path replacement.hwc4872012-03-09
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Removing duplicate fileJose Antonio Marquez2012-03-09
| |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Clean upJose Antonio Marquez2012-03-09
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #32 from ericmueller/integrationJose Antonio Marquez Russo2012-03-09
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added asset folder replacement to runtime load.
| * | | | | | | | | | | | | | | | Removed asset path replacement at authortime.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.
* | | | | | | | | | | | | | | | Merge branch 'refs/heads/integration' into FileIO-IntegrationJose Antonio Marquez2012-03-09
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/html-document.js
| * | | | | | | | | | | | | | | | Canvas IOhwc4872012-03-08
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-08
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/html-document.js js/helper-classes/3D/draw-utils.js
| * | | | | | | | | | | | | | | | Merge pull request #102 from dhg637/PanelsValerio Virgillito2012-03-08
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \