| Commit message (Collapse) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| | | * | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLFixes | Nivesh Rajbhandari | 2012-03-06 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ | ||||
| | | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/ninja-internal' into WebGLFixes | Nivesh Rajbhandari | 2012-03-06 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | * | | | | | | | | | | | | | Create drag plane parallel to working plane and offset by where the user ↵ | Nivesh Rajbhandari | 2012-03-06 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clicked in z. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | | * | | | | | | | | | | | | | Do not use transform code if transform mode is off. | Nivesh Rajbhandari | 2012-03-05 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | | * | | | | | | | | | | | | | We should show snap marker on mouse move even if user hasn't moused down yet. | Nivesh Rajbhandari | 2012-03-02 | |
| | | | |_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | * | | | | | | | | | | | | | Merge pull request #108 from pushkarjoshi/brushtool | Valerio Virgillito | 2012-03-13 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Brushtool | |||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #105 from joseeight/FileIO-Build-Candidate | Valerio Virgillito | 2012-03-13 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | File I/O adding webGL/canvas data functionality | |||
| | | * | | | | | | | | | | | | | Cleaning up webGL runtime | Jose Antonio Marquez | 2012-03-13 | |
| | | | | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | | | Clean up and TODOs | Jose Antonio Marquez | 2012-03-12 | |
| | | | | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | | | Fix for 2D Canvas runtime | Jose Antonio Marquez | 2012-03-12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Array was not allowing for multiple items. | |||
| | | * | | | | | | | | | | | | | Merge branch 'refs/heads/FileIO-Integration' into FileIO | Jose Antonio Marquez | 2012-03-11 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | * | | | | | | | | | | | | | Add temp delay for webGL preview | Jose Antonio Marquez | 2012-03-10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a padded launch webGL preview delay. This is very temporary, just a work around until RDGE issues are fixed. | |||
| | | | * | | | | | | | | | | | | | Merge branch 'refs/heads/FileIO-Integration' into FileIO-Build-Candidate | Jose Antonio Marquez | 2012-03-10 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | | * | | | | | | | | | | | | | Temp Runtime WebGL Fix | Jose Antonio Marquez | 2012-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 assets | Jose Antonio Marquez | 2012-03-10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is still no resolving issues with webGL runtime. | |||
| | | | | * | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO-Integration | Jose Antonio Marquez | 2012-03-09 | |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|/ / / / | | | | | |/| | | | | | | | | | | | ||||
| | | | | * | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO-Integration | Jose Antonio Marquez | 2012-03-09 | |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | | * | | | | | | | | | | | | | | Fixing Issues for Windows Lib | Jose Antonio Marquez | 2012-03-09 | |
| | | | | | | | | | | | | | | | | | | | ||||
| | | | | * | | | | | | | | | | | | | | Merge pull request #33 from ericmueller/integration | Jose Antonio Marquez Russo | 2012-03-09 | |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Integration | |||
| | | | | | * | | | | | | | | | | | | | | remap hard coded strings in rdge internal code. | hwc487 | 2012-03-09 | |
| | | | | | | | | | | | | | | | | | | | | ||||
| | | | | | * | | | | | | | | | | | | | | Merge branch 'FileIO-Integration' of github.com:joseeight/ninja-internal ↵ | hwc487 | 2012-03-09 | |
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into integration Conflicts: js/document/html-document.js | |||
| | | | | | * | | | | | | | | | | | | | | | further removal of authortime asset path replacement. | hwc487 | 2012-03-09 | |
| | | | | | | | | | | | | | | | | | | | | | ||||
| | | | | * | | | | | | | | | | | | | | | | Removing duplicate file | Jose Antonio Marquez | 2012-03-09 | |
| | | | | | |/ / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | ||||
| | | | | * | | | | | | | | | | | | | | | Clean up | Jose Antonio Marquez | 2012-03-09 | |
| | | | | | | | | | | | | | | | | | | | | ||||
| | | | | * | | | | | | | | | | | | | | | Merge pull request #32 from ericmueller/integration | Jose Antonio Marquez Russo | 2012-03-09 | |
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added asset folder replacement to runtime load. | |||
| | | | | | * | | | | | | | | | | | | | | Removed asset path replacement at authortime. | hwc487 | 2012-03-09 | |
| | | | | | | | | | | | | | | | | | | | | ||||
| | | | | | * | | | | | | | | | | | | | | Added asset folder replacement to runtime load. | hwc487 | 2012-03-09 | |
| | | | | | | | | | | | | | | | | | | | | ||||
| | | | | * | | | | | | | | | | | | | | | Adding missing file for webGL, still need a fix for runtime | Jose Antonio Marquez | 2012-03-09 | |
| | | | | |/ / / / / / / / / / / / / / | ||||
| | | | | * | | | | | ||||