This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gem - Graphics environment for multimedia".
The branch, master has been updated
via 8032816cd9120038fb9822e3df3af160d1da7230 (commit)
via ed1cb90c41928b90c3bd1112b8820b3e4c9038d4 (commit)
via 06fc27d6a9628d2e69d2167a5b0f35d986373717 (commit)
via fac2774a6d7b3d0985dc9bfaeaf48501dc0c6b11 (commit)
via f55806d7dd8c95b65c3efb8f398164c8fdfc6cb7 (commit)
via 29651ce1dc23c4b037a8982ac01bb031787560bd (commit)
via 63d87246cc6801c4fbc40fc5c00155ba07c25485 (commit)
via 74ec3285192ec5b12538d75328526dda6da654fc (commit)
via a5198ca6184667e7560b84b5b992488d9f8a87d9 (commit)
via f0e3dd6e02669d9d83cf154ba5a12c387954e866 (commit)
from 98f17b4298d30d32904ab768b754321abee4023f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 8032816cd9120038fb9822e3df3af160d1da7230
Merge: ed1cb90 a5198ca
Author: IOhannes m zmölnig <zmoel...@umlautq.umlaeute.mur.at>
Date: Thu Sep 4 12:12:55 2014 +0200
Merge remote-tracking branch 'avilleret/fix_glsl'
Conflicts:
src/Manips/glsl_vertex.cpp
commit ed1cb90c41928b90c3bd1112b8820b3e4c9038d4
Author: IOhannes m zmölnig <zmoel...@umlautq.umlaeute.mur.at>
Date: Thu Sep 4 12:06:07 2014 +0200
add [gemkeyboard] to install_DATA
also use alphabetically correct position of gemkey*
commit 06fc27d6a9628d2e69d2167a5b0f35d986373717
Merge: fac2774 f0e3dd6
Author: IOhannes m zmölnig <zmoel...@umlautq.umlaeute.mur.at>
Date: Thu Sep 4 12:04:46 2014 +0200
Merge remote-tracking branch 'avilleret/master'
commit fac2774a6d7b3d0985dc9bfaeaf48501dc0c6b11
Author: IOhannes m zmölnig <zmoel...@umlautq.umlaeute.mur.at>
Date: Thu Sep 4 11:25:07 2014 +0200
cleanups
commit f55806d7dd8c95b65c3efb8f398164c8fdfc6cb7
Author: IOhannes m zmölnig <zmoel...@umlautq.umlaeute.mur.at>
Date: Thu Sep 4 11:24:54 2014 +0200
remove compile errors
commit 29651ce1dc23c4b037a8982ac01bb031787560bd
Author: IOhannes m zmölnig <zmoel...@umlautq.umlaeute.mur.at>
Date: Thu Sep 4 11:24:33 2014 +0200
use CPPEXTERN_MSG rather than explicit static callbacks
commit 63d87246cc6801c4fbc40fc5c00155ba07c25485
Author: IOhannes m zmölnig <zmoel...@umlautq.umlaeute.mur.at>
Date: Thu Sep 4 11:22:43 2014 +0200
defer download to after context creation
commit 74ec3285192ec5b12538d75328526dda6da654fc
Author: IOhannes m zmölnig <zmoel...@umlautq.umlaeute.mur.at>
Date: Thu Sep 4 11:12:56 2014 +0200
only call GLEW_... if we have a valid context
commit a5198ca6184667e7560b84b5b992488d9f8a87d9
Author: Antoine Villeret <antoine.ville...@gmail.com>
Date: Thu Sep 4 00:21:02 2014 +0200
load shader in startRendering()
commit f0e3dd6e02669d9d83cf154ba5a12c387954e866
Author: Antoine Villeret <antoine.ville...@gmail.com>
Date: Wed Sep 3 22:57:22 2014 +0200
add gemkeyname to install data
-----------------------------------------------------------------------
Summary of changes:
abstractions/Makefile.am | 2 ++
src/Manips/fragment_program.cpp | 5 ++++-
src/Manips/glsl_fragment.cpp | 4 ++++
src/Manips/glsl_geometry.cpp | 4 ++++
src/Manips/glsl_program.cpp | 13 ++++++-------
src/Manips/glsl_vertex.cpp | 28 +++++++++++++++-------------
src/Manips/glsl_vertex.h | 1 +
src/Manips/vertex_program.cpp | 4 ++++
src/Pixes/pix_cubemap.cpp | 2 +-
src/Pixes/pix_imageInPlace.cpp | 38 +++++++++++++-------------------------
src/Pixes/pix_imageInPlace.h | 7 ++-----
src/Pixes/pix_snap.cpp | 4 ++++
src/Pixes/pix_snap2tex.cpp | 4 ++++
src/Pixes/pix_texture.cpp | 2 +-
14 files changed, 65 insertions(+), 53 deletions(-)
hooks/post-receive
--
Gem - Graphics environment for multimedia
------------------------------------------------------------------------------
Slashdot TV.
Video for Nerds. Stuff that matters.
http://tv.slashdot.org/
_______________________________________________
pd-gem-CVS mailing list
pd-gem-CVS@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/pd-gem-cvs
