lp:~smspillaz/compiz/compiz.animationaddon-returns

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:compiz/0.9.12 at revision 4062

Marco Trevisan (Treviño): Approve on 2016-06-28

Eleni Maria Stea: Approve on 2016-05-26

PS Jenkins bot: Pending (continuous-integration) requested 2016-05-23

Diff: 1931 lines (+594/-428)

27 files modified

debian/compiz-dev.install (+1/-0)
debian/compiz-plugins.install (+2/-0)
debian/compiz-plugins.install.armel (+2/-0)
debian/compiz-plugins.install.armhf (+2/-0)
plugins/CMakeLists.txt (+0/-1)
plugins/animation/include/animation/animeffect.h (+5/-2)
plugins/animation/include/animation/grid.h (+0/-1)
plugins/animation/include/animation/multi.h (+19/-9)
plugins/animation/src/animation.cpp (+17/-24)
plugins/animation/src/glide.cpp (+1/-1)
plugins/animation/src/grid.cpp (+0/-6)
plugins/animation/src/private.h (+1/-1)
plugins/animationaddon/CMakeLists.txt (+1/-4)
plugins/animationaddon/include/animationaddon/animationaddon.h (+17/-11)
plugins/animationaddon/src/airplane.cpp (+47/-36)
plugins/animationaddon/src/animationaddon.cpp (+2/-2)
plugins/animationaddon/src/dissolve.cpp (+11/-2)
plugins/animationaddon/src/particle.cpp (+52/-40)
plugins/animationaddon/src/polygon.cpp (+259/-250)
plugins/animationaddon/src/private.h (+3/-2)
plugins/opengl/include/opengl/matrix.h (+27/-0)
plugins/opengl/include/opengl/opengl.h (+6/-0)
plugins/opengl/include/opengl/vertexbuffer.h (+20/-2)
plugins/opengl/src/paint.cpp (+1/-10)
plugins/opengl/src/privatevertexbuffer.h (+6/-2)
plugins/opengl/src/vertexbuffer.cpp (+77/-22)
plugins/opengl/src/window.cpp (+15/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

4030. By Sam Spilsbury <email address hidden> on 2016-06-22

Revert addition of animationjc

4029. By Sam Spilsbury <email address hidden> on 2016-06-22

Merge lp:compiz

4028. By Sam Spilsbury <email address hidden> on 2016-06-04

animationaddon: Don't use glClearDepth on GLES (use glClearDepthf)

4027. By Sam Spilsbury <email address hidden> on 2016-06-01

animationaddon: Completely remove clip planes

(Until a different solution can be found)

4026. By Sam Spilsbury <email address hidden> on 2016-06-01

Merge lp:~smspillaz/compiz/compiz.animationaddon-returns

4025. By Sam Spilsbury <email address hidden> on 2016-05-30

Merge lp:compiz

4024. By Sam Spilsbury <email address hidden> on 2016-05-26

debian: Add animationsjc to compiz-plugins.install

4023. By Sam Spilsbury <email address hidden> on 2016-05-24

animationjc: Re-add the animationjc plugin

(Thanks MC Return)

4022. By Sam Spilsbury <email address hidden> on 2016-05-23

CMakeLists: Enable building animationaddon

4021. By Sam Spilsbury <email address hidden> on 2016-05-23

animationaddon: Provide damage box for dissolveAnim