aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes/3D
Commit message (Collapse)AuthorAge
* Squashed commit of the following:Jonathan Duran2012-03-14
| | | | | | merge master into timeline Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Squashed commit of the following:Jonathan Duran2012-03-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 3a9c7a57a227a36ec47c6635fc6a0bd4c4b7f9c3 Merge: 5940b22 caa0825 Author: Valerio Virgillito <valerio@motorola.com> Date: Thu Mar 8 15:51:58 2012 -0800 Merge pull request #102 from dhg637/Panels Fixed Some Calculation issues and bugs & appended disabled state when no documents exist commit 5940b22e01de4fc36e5c5de5f3ed074f08fadb07 Merge: 9b006ac 130cd6d Author: Valerio Virgillito <valerio@motorola.com> Date: Thu Mar 8 13:39:11 2012 -0800 Merge pull request #104 from ananyasen/integration-candidate IKNINJA-1270: fixed browser crashing when you close a document while playing a video commit 130cd6d4b99c9db344ec0ab44a54a59d11b31d2f Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Thu Mar 8 13:29:58 2012 -0800 IKNINJA-1270: fixed browser crashing when you close a document while playing a video Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit caa08250663007bea76faf555f166b42cf4c76fb Author: Armen Kesablyan <armen@motorola.com> Date: Thu Mar 8 12:09:13 2012 -0800 Disabled State is now darker Signed-off-by: Armen Kesablyan <armen@motorola.com> commit 21cb7af351e738f446458af5b896c84e03fa5c17 Author: Armen Kesablyan <armen@motorola.com> Date: Thu Mar 8 12:05:43 2012 -0800 Z-Index issue of disabled state with file open dialog Signed-off-by: Armen Kesablyan <armen@motorola.com> commit 9b006acf1f6c2be5abc54f94a8bee7e684f106f9 Merge: 0637a6d 1c61c69 Author: Valerio Virgillito <valerio@motorola.com> Date: Thu Mar 8 11:04:02 2012 -0800 Merge pull request #100 from imix23ways/TimelineUber Timeline uber commit 0637a6d9cc9fbe074145ad6beaa4725f5e7eb212 Merge: cef0708 d981394 Author: Valerio Virgillito <valerio@motorola.com> Date: Wed Mar 7 19:32:38 2012 -0800 Merge pull request #103 from joseeight/FileIO-Build-Candidate File I/O Fixed commit d9813946dc28d8c28033a68b68300b9d9eda115c Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Wed Mar 7 19:22:05 2012 -0800 Image data fix on Open Fixed a bug with data-uris not opening correctly. commit 8b0988b6dd2fe7f5977f70f651f7155c78ee872b Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Wed Mar 7 19:04:19 2012 -0800 Adding To-do comments for CDN stylesheets Removed inserting CDN styles into head as it was proper because the hierarchy would be lost, and there is no current fast-alternative to achieve a preview. commit bb83bfb7af1e82dfbce7661fe2eb7612ff730c6f Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Wed Mar 7 18:36:31 2012 -0800 Removing temp viewing of CDN styles It's not done correctly, we really need the proxy for this. commit 1c61c69265b9c0230b834c0d4d7c78a11f9d5b19 Author: Kruti Shah <kruti.shah@motorola.com> Date: Wed Mar 7 16:19:05 2012 -0800 Timeline Bug Fix: IKNINJA-1283 Signed-off-by: Kruti Shah <kruti.shah@motorola.com> commit 84931583f1da8da29784074978f146b281b8efa3 Author: Armen Kesablyan <armen@motorola.com> Date: Wed Mar 7 16:08:36 2012 -0800 Disabled state for panels Signed-off-by: Armen Kesablyan <armen@motorola.com> commit d18d91946627c53c646a6f167855551a1891f8f4 Author: Armen Kesablyan <armen@motorola.com> Date: Wed Mar 7 14:33:09 2012 -0800 Reordering and resizing now works Signed-off-by: Armen Kesablyan <armen@motorola.com> commit e3a5626b21ac8b906638bed9eb96aca5fadd26d8 Author: Armen Kesablyan <armen@motorola.com> Date: Wed Mar 7 11:41:10 2012 -0800 Fixed: Collapsed panels would collapse panels below Signed-off-by: Armen Kesablyan <armen@motorola.com> commit c7b07a9663ac1553fb10d8541b25274e522e07f7 Author: Armen Kesablyan <armen@motorola.com> Date: Wed Mar 7 10:39:23 2012 -0800 Fixed Collapsing and resizing window with panels Signed-off-by: Armen Kesablyan <armen@motorola.com> commit cef07085443b7c31e878daaad083b7408c57e104 Merge: 2e3943a fca9290 Author: Valerio Virgillito <valerio@motorola.com> Date: Tue Mar 6 17:08:28 2012 -0800 Merge pull request #99 from joseeight/FileIO-Build-Candidate File IO Updates commit fca92904597895675ddd216399cd235f3c5a7cfa Merge: ec7cbc9 eebb7de Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Tue Mar 6 17:02:44 2012 -0800 Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate commit eebb7de4d19cddec9c763a073d8cf41d76fe70f7 Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Tue Mar 6 17:02:37 2012 -0800 Adding CDN support for URLs in linked CSS commit f6a60f50ca9cd09713baa27f2990eda9346496fc Merge: 7271c25 2e3943a Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Tue Mar 6 16:19:59 2012 -0800 Merge branch 'refs/heads/Ninja-Internal' into FileIO Conflicts: js/controllers/selection-controller.js commit 7271c25bf34917b1751f433d284f21485057425b Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Tue Mar 6 11:24:25 2012 -0800 Fixing WebGL not available bug commit 3c4967fa93b3abc529fc404115707307ba72d5cd Merge: bee2df0 84332ab Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Tue Mar 6 11:18:30 2012 -0800 Merge branch 'refs/heads/Ninja-Internal' into FileIO commit ec7cbc95de031d2be667c2a8629a9d63e91f7e1a Merge: 97176d4 bee2df0 Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Tue Mar 6 11:05:04 2012 -0800 Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate commit bee2df0d4da72677aaa2adae669ffdd4ac210dd6 Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Tue Mar 6 11:04:52 2012 -0800 Changing length of characters per line (pretty function) commit 97176d466bb0d217f1bc5f45e362ed15c3066507 Merge: de26ba9 887e555 Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Mon Mar 5 23:35:08 2012 -0800 Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate commit 887e555d00939a99fd13d0fc8fe081a4feb5d677 Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Mon Mar 5 23:34:54 2012 -0800 CSS on CDN preview fix commit de26ba991c1d6351dfed4a81c246f62d40f075d6 Merge: 478c50e 4f274aa Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Mon Mar 5 23:19:08 2012 -0800 Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate commit 4f274aa5beff735f63905704e52e6ea938c140d9 Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Mon Mar 5 23:18:49 2012 -0800 Temp support for CDN CSS Added a temp fix for allow the viewing of CSS on a CDN, however, the styles should not be editable, but will allow for accurate preview of styles. Need to coordinate with the CSS panel and styles manager to insert styles in the appropriate files or tags that have write permission. commit 478c50ee0ce0291c13c4f1e469a234b64946413e Merge: 869f5f1 a68fe3f Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Mon Mar 5 22:24:20 2012 -0800 Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate commit a68fe3f0180f5ab3304ff201be8da40c4432bd40 Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Mon Mar 5 22:23:59 2012 -0800 Minor Fix Forgot to comment out the return, therefore preventing to save. commit 869f5f1ca66b976ba07049b1180882cb8ccb9630 Merge: 0913cd5 4c4d49a Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Mon Mar 5 20:07:10 2012 -0800 Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate commit 4c4d49ae7958e2c87764f9319665189cf69c5c0a Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Mon Mar 5 20:06:32 2012 -0800 Fixed URL parsing issue on actual opened document Still need to implement CSS loaded from a CDN, currently this would break Ninja. commit 0913cd53a13083119a6e6bfc2ee939e6becd40e0 Merge: 4505203 56efed8 Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Mon Mar 5 16:16:34 2012 -0800 Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate commit 56efed8b1ed9974aade615fce2d96bc214d21540 Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Mon Mar 5 15:55:30 2012 -0800 Resolved URL path issues in document and CSS Added logic to allow for files opened and assets linked in any order all under the cloud server root. commit 195624da6d0c5d15bcde8a8655355544687ef58a Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Sun Mar 4 19:21:34 2012 -0800 Setting up document level URL parsing Set up logic to parse URLs document level (href, src, url) still need to add functionality to return proper value, currently only detecting current value. commit b2de52888a7c976cc9ae40518e3653cec0aac296 Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Sun Mar 4 11:15:27 2012 -0800 Improved CSS URL cleaned Added logic to accommodate any URLs in a CSS file inside the opened document root. Need to add logic for handling linked references above the root. Also need to reformat into a reusable method as it might be needed besides CSS. commit 5c49635cc44815364f9a0296ffaa7acc34254937 Merge: 5c97959 13f52cf Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Fri Mar 2 19:06:37 2012 -0800 Merge branch 'refs/heads/Ninja-Internal' into FileIO commit 45052033e018ecc0cba582f84c0431d3bd4020fe Merge: 940b9fc 13f52cf Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Fri Mar 2 19:06:17 2012 -0800 Merge branch 'refs/heads/Ninja-Internal' into FileIO-Build-Candidate commit 940b9fc0bf71845bcae39de637e85697e5911eea Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Fri Mar 2 15:54:12 2012 -0800 Formatting fixes commit 5c9795958b08c233eb2c4afab8054d55c3a33d98 Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Fri Mar 2 14:52:18 2012 -0800 Minor logic fixes for URL resolution in CSS commit 4d35a90ba032d51ce701eebec323117d02e827fa Merge: e24631e 0aeb400 Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Fri Mar 2 14:20:46 2012 -0800 Merge branch 'refs/heads/Ninja-Internal' into FileIO commit e24631ecac0772fc51756fe4aff9638de3b95faf Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Fri Mar 2 14:11:08 2012 -0800 Fixing CSS URL issues Only partially, supporting unquoted files under same root. commit c4bfc8b79820b55cc86d755fe590ee649813232a Merge: ff77f86 ff0a956 Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Fri Mar 2 10:34:57 2012 -0800 Merge branch 'refs/heads/Ninja-Internal' into FileIO commit ff77f861fba349dd36d6c15c9a545459c3a76583 Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Fri Mar 2 10:34:01 2012 -0800 Fixing IO RegEx Fixed parsing files to have correct URLs with RegEx, inner content of CSS files still needs to be fixed. commit 66bc1f46938afc696b11878ebbb97d1fd361386e Merge: 80ac930 61dd921 Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Thu Mar 1 18:13:18 2012 -0800 Merge branch 'refs/heads/Ninja-Internal' into FileIO commit 80ac930684255dd24cecae70b488285a6058488e Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Thu Mar 1 13:34:45 2012 -0800 Optimizing URL intercepting detection Modified the way the webRequest maps to the file. commit 13aca03d4e0d11729d691db0b7f0d2f2a6899cf6 Merge: b09956e 8fee7d6 Author: Jose Antonio Marquez Russo <jose@eightyearproject.com> Date: Wed Feb 29 15:41:12 2012 -0800 Merge pull request #24 from ananyasen/FileIO undo/redo per document , codemirror 2.22 update commit 8fee7d6bdb55ba18f396c3523081b18499fa1e30 Merge: 5d4f1aa b09956e Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Wed Feb 29 15:21:31 2012 -0800 Merge branch 'refs/heads/ninja-internal-master' into FileIO Conflicts: js/controllers/selection-controller.js js/document/html-document.js js/panels/properties/content.reel/content.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit 5d4f1aad01737695238582c704e6d4f2c3a2f317 Merge: ccedeef 551e1f2 Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Wed Feb 29 14:53:13 2012 -0800 Merge branch 'refs/heads/ninja-internal-master' into FileIO commit ccedeef38d6eb2e55d1782b82401828f3c99dd9c Merge: 7a259f8 84d6f6f Author: Ananya Sen <xhdq84@motorola.com> Date: Wed Feb 29 13:56:35 2012 -0800 Merge pull request #4 from mqg734/AnanyaFileIO Fix for selection bug due to bad scrollLeft and scrollTop values when switching between documents. commit 84d6f6f5518e5ef8fc3d68be7e41c510f57b597a Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Wed Feb 29 13:53:45 2012 -0800 Fixing typo. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit 0cd17b6cf9231e60083958d85759d4796f505342 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Wed Feb 29 13:48:11 2012 -0800 Fix for selection bug due to bad scrollLeft and scrollTop values when switching between documents. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit 7a259f8c78a2394e32c62654623285ee595c6249 Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Wed Feb 29 13:25:35 2012 -0800 IKNINJA-1217: use encodeURI instead to save into sessionStorage Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit 4e21db069b28c79236c8c7fd19dcc7810d28c5cb Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Wed Feb 29 12:18:09 2012 -0800 set selectionContainer before restoring selected elements Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit 03ea76700cb8bee3f4f58acf3e3503b0642d13fb Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Wed Feb 29 11:46:19 2012 -0800 fixed selection which click after switching to a document Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit 7a9c2a91dfbbdd0cd7c79d81be5aeecd7887e7f1 Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Wed Feb 29 10:12:38 2012 -0800 handle selections for switching documents Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit 1c7e86b6c2c802d720cc3075f75c7a61866ebc07 Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Tue Feb 28 16:41:18 2012 -0800 fix for creatingNewFile flag Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit e0fab951e4f3869b04fd4a01f429a6654991cd68 Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Tue Feb 28 15:33:35 2012 -0800 minor fixes in saving undo/redo stacks per document Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit 1766c6b17e2311fcd21c2be6608c7dcdc0a9b23a Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Tue Feb 28 15:07:49 2012 -0800 persist selections while switching documents Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit 866df4801b9e77a0155ffbfb87adbc79a94ce9a5 Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Tue Feb 28 12:34:33 2012 -0800 reverted null check as per request Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit ada597016685a83f2c9a8b25b28589b9221569c0 Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Tue Feb 28 12:26:52 2012 -0800 reverting null checks as per request Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit bca9189a076432f35f99fc90f271c45ec00c0f1c Merge: 2edcdd8 6af71de Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Tue Feb 28 10:06:48 2012 -0800 Merge branch 'refs/heads/FileIO-jose' into FileIO commit 2edcdd88ffc2f6ff0ea836e4da3e1fd2cb3e856f Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Mon Feb 27 17:39:26 2012 -0800 persist undo/redo stack per html document Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit 51ed781953bc44bba3c70938aa57b856394cbc88 Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Mon Feb 27 14:41:21 2012 -0800 updating to codemirror 2.22 Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Squashed commit of the following:Jonathan Duran2012-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 1cd89d4d06e3a8f2c221628b19cf26a2c69f5d3f Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Tue Mar 6 11:24:25 2012 -0800 Fixing WebGL not available bug commit 84332ab81c1b445195f1d9be8bbeae0725c8e758 Author: Valerio Virgillito <valerio@motorola.com> Date: Tue Mar 6 10:58:25 2012 -0800 Squashed commit of preload-fix into Master - Requiring all the previously pre-loaded files - RDGE, Codemirror and gl-matrix are not included via a script tag. Signed-off-by: Valerio Virgillito <valerio@motorola.com> commit 13f52cf0c74f53a919fa864f86669e8155f82961 Merge: dced508 abc04f3 Author: Valerio Virgillito <valerio@motorola.com> Date: Fri Mar 2 15:46:11 2012 -0800 Merge pull request #93 from imix23ways/Timeline Timeline: Critical bug fixes commit dced508bb19a7bcd467ff1b86b5df5bbec4be794 Merge: 0aeb400 cc772ef Author: Valerio Virgillito <valerio@motorola.com> Date: Fri Mar 2 15:45:35 2012 -0800 Merge pull request #92 from mqg734/WebGLFixes Selection Tool Fixes for elements flying off into space when they overlap commit 0aeb400070762cf01d83cf9f9ee25a5595098b7f Merge: ff0a956 aabb48a Author: Valerio Virgillito <valerio@motorola.com> Date: Fri Mar 2 14:05:21 2012 -0800 Merge pull request #94 from ericguzman/PresetsPanel Presets Panel - Fix single-click activation, and transition cut-off bug. commit cc772ef3333ed419d269a2bda7aea5b0150a7bd9 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Fri Mar 2 11:34:58 2012 -0800 Fixing flying off into space bug for translate tool too. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit abc04f3d50311ed1c21067344bc7e448686f8c5c Author: Jonathan Duran <jduran@motorola.com> Date: Fri Mar 2 11:26:25 2012 -0800 Timeline Fix timing function Signed-off-by: Jonathan Duran <jduran@motorola.com> commit aabb48a1c8d34bc968f4c6b0ffee4e31c1d5d286 Author: Eric Guzman <ericg@motorola.com> Date: Fri Mar 2 11:22:44 2012 -0800 Presets Panel - Fix single-click activation, and transition cut-off bug. Use double-click as the activation event for transition presets. Also fixed the bug when applying a style preset before the transition preset, which disabled transitions after the first one. commit f3207f39ea9d8c1c34246217a23d3a689671903d Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Fri Mar 2 11:21:29 2012 -0800 Don't draw transform handles if the stage is the target element. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit 5425be91e7125c22955b4459a62412ff574e49a8 Author: Jonathan Duran <jduran@motorola.com> Date: Fri Mar 2 11:11:48 2012 -0800 Timeline: Fix for animation iteration count Add default webkit css properties to allow animations with integer iteration counts. Signed-off-by: Jonathan Duran <jduran@motorola.com> commit 1760bac1da9218315ad1bacdcf3a157495a049e8 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Fri Mar 2 10:48:41 2012 -0800 Fix for jumping issue when moving items that have any 3d on them. We can't translate 3d moves into 2d space due to perspective, so we must update the matrix3d values instead of the top-left values if items have 3d. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit 2c04935f0ccb1cb7c98371fc10b43155f2d956c4 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Thu Mar 1 22:20:06 2012 -0800 Fix for elements flying off into space when moving elements that overlap. This was happening because our hit record's element and the browser's element from point did not match. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit 50058746779f714ed9b0287f49e56c9f0d35593e Merge: 500426d ff0a956 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Thu Mar 1 21:49:44 2012 -0800 Merge branch 'refs/heads/ninja-internal' into WebGLFixes commit 500426dea0ca95a6b45be8ea8d132cfdb4d2c940 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Thu Mar 1 10:11:39 2012 -0800 Fixed logic error when resizing with the top-left transform handles. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit 7980d9bde2b43aa5a494ddf6f1db5c4959a57b91 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Thu Mar 1 10:04:15 2012 -0800 Re-fixing IKNinja-940 - Can't select objects when in side/top view. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit f04cc0146d8f7573628678613a99c270116768e4 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Wed Feb 29 16:45:40 2012 -0800 Last-used material (instead of FlatMaterial) is applied to shape when turning on use WebGL checkbox in the PI. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Squashed commit of the following:Jonathan Duran2012-02-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 2b9f63089534356607ad7e0ddde6f22e42d04f80 Merge: 98d491f a89e30a Author: Valerio Virgillito <valerio@motorola.com> Date: Wed Feb 29 12:12:11 2012 -0800 Merge pull request #88 from mqg734/ToolFixes Fix for performance issue when moving shapes. commit 98d491f7e57ff5a9b091e332d7d1e81061e39efa Merge: 052d980 d417b33 Author: Valerio Virgillito <valerio@motorola.com> Date: Wed Feb 29 12:10:57 2012 -0800 Merge branch 'SnapManagerFixes' of https://github.com/mqg734/ninja-internal into integration-candidate commit 052d9805a6f0a3a90d6849eb94eabffb7ec26962 Merge: 3d233f2 2f3e4d1 Author: Valerio Virgillito <valerio@motorola.com> Date: Wed Feb 29 12:10:03 2012 -0800 Merge branch 'integration-candidate' of github.com:Motorola-Mobility/ninja-internal into integration-candidate commit 3d233f25cff057fff5c5a75e4c4b40e88c22a8f5 Merge: 3dbe798 209e078 Author: Valerio Virgillito <valerio@motorola.com> Date: Wed Feb 29 12:09:43 2012 -0800 Merge branch 'NiveshColor' of https://github.com/mqg734/ninja-internal into integration-candidate commit 2f3e4d12aa15077d3cc9794862156e57b7815e68 Merge: 850f3a1 0996a51 Author: Valerio Virgillito <valerio@motorola.com> Date: Wed Feb 29 12:06:21 2012 -0800 Merge pull request #87 from joseeight/FileIO-Build-Candidate Fixes to preview caching issues commit 850f3a1f7ab81ec80b6de1c49f2d2bbcbfe87c8e Merge: 1568367 5f777eb Author: Valerio Virgillito <valerio@motorola.com> Date: Wed Feb 29 12:05:48 2012 -0800 Merge pull request #86 from imix23ways/Timeline Timeline commit 1568367213e760463f3ee29a531aa345fda6bd6d Merge: 3dbe798 271a8f2 Author: Valerio Virgillito <valerio@motorola.com> Date: Wed Feb 29 12:03:23 2012 -0800 Merge pull request #85 from pushkarjoshi/brushtool Brushtool commit a89e30ab834a48be32b6122e0c8ac1e0c3ed43e8 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Wed Feb 29 11:58:28 2012 -0800 Fix for performance issue when moving shapes. We don't need to call render except if the geometry and materials change. This is more easy to see with shapes like the brush tool. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit 271a8f2b29d87d12c81d03e3f1e2c05b816a138d Author: Pushkar Joshi <pushkar@motorola.com> Date: Wed Feb 29 11:50:41 2012 -0800 prevent extremely long path rendering (temporary fix) commit 0996a519afccbed526912807c70c20d598e9cae7 Merge: 98f1cfc 03d277d Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Wed Feb 29 11:46:59 2012 -0800 Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate commit 03d277db80b6cea9a25320c0575ae2bf7a6d7e6e Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Wed Feb 29 11:46:44 2012 -0800 Preview Fix Adding save all logic before preview, temporary fix. commit 46fb52be241dced940d46629c809a09c86ed4438 Author: Pushkar Joshi <pushkar@motorola.com> Date: Wed Feb 29 11:38:33 2012 -0800 changed the registration point of the brush tool icon and added a temporary check to prevent extremely long brush strokes commit 98f1cfc58f545702a18166ab216362d667c18915 Merge: da83f44 bb3e42b Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Wed Feb 29 11:29:09 2012 -0800 Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate commit bb3e42b531848b400670df6caf0f3ce02adf1243 Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Wed Feb 29 11:28:58 2012 -0800 Fix: Caching issue with chrome tab API Using window.open to test movie. commit f000a3cced9adbfff1d7aa641e6eb42ad6edf7e8 Author: Pushkar Joshi <pushkar@motorola.com> Date: Wed Feb 29 10:21:06 2012 -0800 change in comment only commit 795329d2225ff3b760f7f0ea3bb6b5e68f6c6b5b Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Wed Feb 29 10:07:53 2012 -0800 Making class level url template variable Created a class level variable for the URL to be parsed out of the user files. commit f931c48a7d0bcf1222cf05787e3294839ed0b9fb Author: Pushkar Joshi <pushkar@motorola.com> Date: Wed Feb 29 09:47:41 2012 -0800 resample the brush stroke so we don't have gaps if the path is drawn rapidly, and, allow to change the stroke color, and, more efficient stroke rendering by drawing translated radial gradients (instead of creating new gradients for each stroke sample) commit d417b3315f1aa6dd52fea10cbf5f17a213ef8726 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Wed Feb 29 06:50:51 2012 -0800 SnapManager fixes for sag tags. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit 209e0781e926212bbaaad9e8ca4b61a0c389b30f Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Tue Feb 28 17:19:42 2012 -0800 We need to remove color buttons from the color model when updating the PI for selection change. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit b43efdcbfa671a46d1edaeb1555f508fe2ad0338 Merge: 16d6a90 f2ab699 Author: Pushkar Joshi <pushkar@motorola.com> Date: Tue Feb 28 14:55:08 2012 -0800 Merge branch 'pentool' into brushtool commit 16d6a90579cdafede931a9c818689fad2e622d8b Merge: 03ca7a5 63307c9 Author: Pushkar Joshi <pushkar@motorola.com> Date: Tue Feb 28 14:19:25 2012 -0800 Merge branch 'pentool' into brushtool commit 03ca7a5ed13c25faaa9100bb666e062fd15335e6 Merge: fcb12cc 053fc63 Author: Pushkar Joshi <pushkar@motorola.com> Date: Fri Feb 24 12:08:49 2012 -0800 Merge branch 'pentool' into brushtool Conflicts: imports/codemirror/mode/scheme/scheme.js js/tools/BrushTool.js commit fcb12cc09eb3cd3b42bd215877ba18f449275b75 Author: Pushkar Joshi <pushkar@motorola.com> Date: Fri Feb 10 14:16:56 2012 -0800 render the brush stroke as a sequence of rectangles, with each rectangle having its own linear gradient commit 6bb00e69713bd7131b2bc0a15e4e0cb6071d616c Merge: 5f42bd1 666ae3e Author: Pushkar Joshi <pushkar@motorola.com> Date: Thu Feb 9 13:42:59 2012 -0800 Merge branch 'master' into brushtool commit 5f42bd1f7723483d374cdd3fe51ef8298c86a1a2 Merge: abeb9f1 fba39db Author: Pushkar Joshi <pushkar@motorola.com> Date: Thu Feb 9 10:55:58 2012 -0800 Merge branch 'pentool' into brushtool commit abeb9f1e23679200bb2f4a3ccbcebfb37645975c Author: Pushkar Joshi <pushkar@motorola.com> Date: Thu Feb 9 10:45:50 2012 -0800 first phase of simple resampling to prevent tiny segments Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Merge pull request #19 from ananyasen/FileIOJose Antonio Marquez Russo2012-02-24
|\ | | | | FileIO branch pull request
| * - added closeDocument event for timelineAnanya Sen2012-02-24
| | | | | | | | | | | | - minor bug fixes Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-23
| |\
| * \ Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-23
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/html-document.js js/helper-classes/3D/snap-manager.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | switch html document - re-initialize draw-utils and snap-manager on opening ↵Ananya Sen2012-02-23
| | | | | | | | | | | | | | | | | | | | | | | | a document and while switching documents Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
*