diff --git a/AUTHORS.txt b/AUTHORS.txt index 770207ae8..8ff526119 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -1,6 +1,6 @@ OpenSceneGraph Library 3.2.2 -526 Contributors: +528 Contributors: Firstname Surname ----------------- @@ -396,6 +396,7 @@ Miha Rav Michael Schanne Michael Polak Michael Morrison +Michael Mc Donnell Michael Logan Michael Kapelko Michael Bach Jensen @@ -447,6 +448,7 @@ Jeroen den Dekker Jay Zuckerman Jason Howlett Jason Ballenger +Jannik Heller James Turner James Killian James Athey diff --git a/ChangeLog b/ChangeLog index 745e929f6..f5d6e7f0a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,40 @@ +2015-03-03 12:56 robert + + * src/osgUtil/Optimizer.cpp: Restructed the checks in the + CollectLowestTransformsVisitor::removeTransforms() to avoid + benign case being flagged as warning. + +2015-03-03 12:00 robert + + * src/osg/PolygonMode.cpp: Re-organized the #ifdef's to avoid usage + of glPolyginMode under GLES + +2015-03-02 11:08 robert + + * examples/osgtessellationshaders/osgtessellationshaders.cpp: From + Michael McDonnell, Merged enchancements to osgtesselationshader + example from OSG-svn/trunk to OSG-3.2 branch. + +2015-03-01 11:08 robert + + * src/osgGA/OrbitManipulator.cpp, + src/osgGA/StandardManipulator.cpp: From Jannik Heller, "I noticed + the rotation in the OrbitManipulator depends on the framerate. To + reproduce this issue, start the osganimate example, rotate the + model with the left mouse button, then let go of the mouse button + while still moving. You will notice that with V-Sync enabled, the + model rotates slower. + + The OrbitManipulator calculates a scale to counteract the + framerate dependency, but it turns out this scale wasn't used for + the rotation yet." + +2015-02-27 10:15 robert + + * AUTHORS.txt, CMakeLists.txt, ChangeLog, + applications/osgversion/Contributors.cpp: Updated AUTHROS, + Controbitors and rc number in prep for the 3.2.2-rc1 + 2015-02-26 20:06 robert * AUTHORS.txt, ChangeLog, applications/osgversion/Contributors.cpp: diff --git a/applications/osgversion/Contributors.cpp b/applications/osgversion/Contributors.cpp index 9fa1635f7..66f885c41 100644 --- a/applications/osgversion/Contributors.cpp +++ b/applications/osgversion/Contributors.cpp @@ -472,10 +472,14 @@ TypoCorrection typoCorrections[] = {"Messershmidt","Messerschmidt"}, {"Auelien","Aurelien"}, {"Aurélien","Aurélien"}, + {"McDonnel","Mc Donnell"}, {"McDonnell","Mc Donnell"}, {"Delallée","Delallée"}, {"Gjøl","Gjøl"}, - {"RavÅ¡elj","Rav¨elj"} + {"RavÅ¡elj","Rav¨elj"}, + {"Ravsel", "Rav¨elj"}, + {"Ravselj", "Rav¨elj"} + }; @@ -653,8 +657,6 @@ NameCorrection nameCorrections[] = "Laurens", "Voerman"}, {"Pjotr", "Sventachov", "Pjotr", "Svetachov"}, - {"Miha", "Ravsel", - "Miha", "Rav¨elj"}, {"Bradley", "Baker", "Bradley", "Baker Searles"}, {"PawelKsiezopolski", "",