aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| * | | | | | | | | | | | | | | | | Merge branch 'Bindables_GIO' of https://github.com/ericguzman/ninja-internal ↵Armen Kesablyan2012-06-28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into GIO_binding-view Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵Eric Guzman2012-06-28
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bindables_GIO
| | * | | | | | | | | | | | | | | | | Binding HUD - Updated CSS for hud and promoted/bound properties.Eric Guzman2012-06-28
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Binding View - Bug fix After save corrupts doom and breaks binding viewArmen Kesablyan2012-06-28
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'Bindables_GIO' of https://github.com/ericguzman/ninja-internalArmen Kesablyan2012-06-27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵Eric Guzman2012-06-27
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bindables_GIO
| | * | | | | | | | | | | | | | | | | | Binding HUD - CSS UpdateEric Guzman2012-06-27
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Binding HUD - Show promoted PI properties at top of listEric Guzman2012-06-27
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Binding View - Hide in Live PreviewArmen Kesablyan2012-06-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | | | | | | | | | | | | | | | Binding Hud Not rendering at correct x and yArmen Kesablyan2012-06-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | | | | | | | | | | | | | | | | | | | Merge pull request #359 from mencio/live-preview-buttonValerio Virgillito2012-06-28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | Live preview button and canvas are kept on timeline play
| * | | | | | | | | | | | | | | | | | | Changing the livePreview button to do a chromePreview and keeping the canvas ↵Valerio Virgillito2012-06-28
|/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when doing a timeline play Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | | | | | | | | | | | | | | | | * Fixes for incorrect line/polygon intersections.hwc4872012-06-28
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge pull request #349 from joseeight/ColorValerio Virgillito2012-06-28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | Color
| * | | | | | | | | | | | | | | | | Fixing body PI background getterJose Antonio Marquez2012-06-28
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Fixing chips updating with alpha changeJose Antonio Marquez2012-06-28
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge pull request #353 from imix23ways/Timeline-criticalfixValerio Virgillito2012-06-28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | FIX layer selection bug
| * | | | | | | | | | | | | | | | | FIX layer selection bugJonathan Duran2012-06-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | | | | | | | | | | | | | | Fixing body background bugJose Antonio Marquez2012-06-28
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Fixing init alpha issueJose Antonio Marquez2012-06-28
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Fixing color panel sliders updatingJose Antonio Marquez2012-06-28
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-28
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/