Commit message (Collapse) | Author | Age | ||
---|---|---|---|---|
... | ||||
| * | | Fixing chips updating with alpha change | Jose Antonio Marquez | 2012-06-28 | |
| | | | ||||
| * | | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 2012-06-28 | |
| |\| | ||||
| * | | Fixing body background bug | Jose Antonio Marquez | 2012-06-28 | |
| | | | ||||
| * | | Fixing init alpha issue | Jose Antonio Marquez | 2012-06-28 | |
| | | | ||||
| * | | Fixing color panel sliders updating | Jose Antonio Marquez | 2012-06-28 | |
| | | | ||||
| * | | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 2012-06-28 | |
| |\ \ | ||||
| * | | | Fixing history bug | Jose Antonio Marquez | 2012-06-27 | |
| | | | | ||||
| * | | | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 2012-06-27 | |
| |\ \ \ | ||||
| * | | | | Fixing minor color history bug | Jose Antonio Marquez | 2012-06-27 | |
| | | | | | ||||
| * | | | | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 2012-06-27 | |
| |\ \ \ \ | ||||
| * | | | | | Adding a dismiss step when switching popups | Jose Antonio Marquez | 2012-06-27 | |
| | | | | | | | | | | | | | | | | | | | | | | | | This is needed to allow for model to change during draw routines | |||
| * | | | | | Fixing palette reference bug | Jose Antonio Marquez | 2012-06-27 | |
| | | | | | | ||||
| * | | | | | Adding no color support to popup in chips | Jose Antonio Marquez | 2012-06-27 | |
| | | | | | | ||||
| * | | | | | Fixing alpha hottext input bug | Jose Antonio Marquez | 2012-06-27 | |
| | | | | | | ||||
| * | | | | | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 2012-06-27 | |
| |\ \ \ \ \ | ||||
| * | | | | | | Fix to remember gradient from chip input | Jose Antonio Marquez | 2012-06-26 | |
| | | | | | | | ||||
| * | | | | | | Fixing losing focus when switch wheels from popups (nested) | Jose Antonio Marquez | 2012-06-26 | |
| | | | | | | | ||||
| * | | | | | | Fixing toggle modes losing value | Jose Antonio Marquez | 2012-06-26 | |
| | | | | | | | ||||
| * | | | | | | Fixing hiding gradient popups | Jose Antonio Marquez | 2012-06-26 | |
| | | | | | | | ||||
| * | | | | | | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 2012-06-26 | |
| |\ \ \ \ \ \ | ||||
| * | | | | | | | Fixing gradient/solid color toggle | Jose Antonio Marquez | 2012-06-26 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also added a null value setter fix for no color hex | |||
| * | | | | | | | Adding support for no color init on hex input popup | Jose Antonio Marquez | 2012-06-26 | |
| | | | | | | | | ||||
| * | | | | | | | Fixing hex value syncing in popups | Jose Antonio Marquez | 2012-06-26 | |
| | | | | | | | | ||||
| * | | | | | | | Hiding panel popup if opened when chip popup is opened | Jose Antonio Marquez | 2012-06-26 | |
| | | | | | | | | ||||
| * | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 2012-06-26 | |
| |\ \ \ \ \ \ \ | ||||
| * | | | | | | | | Fixing alpha memory bug on reopen | Jose Antonio Marquez | 2012-06-26 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is for the color chip | |||
| * | | | | | | | | Partially fixing alpha issues on gradient stops | Jose Antonio Marquez | 2012-06-25 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Still need to implement getting value on retrieve while opening | |||
| * | | | | | | | | Fixing alpha bugs on color chips | Jose Antonio Marquez | 2012-06-25 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Getting the right value of alpha on reopening color chips. | |||
| * | | | | | | | | Adding default values to chip | Jose Antonio Marquez | 2012-06-25 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a fallback is null and alpha is changed. | |||
| * | | | | | | | | Fixing alpha slider for chip popups | Jose Antonio Marquez | 2012-06-25 | |
| | | | | | | | | | ||||
| * | | | | | | | | Fixing alpha binding bug | Jose Antonio Marquez | 2012-06-25 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The chip popup alpha sliders were binding to the panel when they shouldn't, so added a check. | |||
| * | | | | | | | | Fixing bottom hit test for popup | Jose Antonio Marquez | 2012-06-25 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This address clicking outside (below) and closing the popup. The wrong value was being used. | |||
| * | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 2012-06-25 | |
| |\ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | Cleaning up events | Jose Antonio Marquez | 2012-06-25 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding/Removing events when only needed by color popups. | |||
| * | | | | | | | | | Color Popup Test Candidate | Jose Antonio Marquez | 2012-06-25 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preliminary check in for testing to commence on new color popup functionality. | |||
| * | | | | | | | | | Adding support for gradients on chips | Jose Antonio Marquez | 2012-06-23 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Need to handle other color modes, currently only handling HSV and gradients. Working on getting other modes supported. Also, will need clean up color popup manager after completion. | |||
| * | | | | | | | | | Fixing logic for popup value bubbling | Jose Antonio Marquez | 2012-06-23 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only working for HSV, need to implement HEX and gradient | |||
| * | | | | | | | | | Deleting obsolete files | Jose Antonio Marquez | 2012-06-23 | |
| | | | | | | | | | | ||||
| * | | | | | | | | | Added third gradient chip popup | Jose Antonio Marquez | 2012-06-22 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Need to add support for gradient events dispatching from standalone chips. Just need to hook up relays for events besides HSV to bubble up. | |||
| * | | | | | | | | | Fix closing logic and init color on chip | Jose Antonio Marquez | 2012-06-22 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added improved logic to handle toggling from button the color popup. Also added an init color method for the chip to initialize color in it's popup. | |||
| * | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 2012-06-21 | |
| |\ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | Replacing temp color chip pop | Jose Antonio Marquez | 2012-06-21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This replaces the temporary color chip popup with a main popup used universally throughout the app. There are still outstanding issues to be addressed, this is just the initial set up before debugging issues. | |||
* | | | | | | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti | Kruti Shah | 2012-06-28 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | clean up | Jonathan Duran | 2012-06-28 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| * | | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-06-28 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Used Theirs, doesn't matter, code block is in commented-out section. | |||
| * | | | | | | | | | | | Timeline: Better deselection of tweens when selecting/deselecting layers. | Jon Reid | 2012-06-28 | |
| | | | | | | | | | | | | ||||
* | | | | | | | | | | | | Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-kruti | Kruti Shah | 2012-06-28 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | ||||
| * | | | | | | | | | | | FIX layer selection bug | Jonathan Duran | 2012-06-28 | |
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |