diff --git a/AUTHORS.txt b/AUTHORS.txt index 56c28dc5e..5a7d48690 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -84,10 +84,10 @@ David Spilling Daniel Sjölie Bryan Thrall Fabien Lavignotte +Andreas Ekstrand Mike Connell Melchior Franz Johannes Baeuerle -Andreas Ekstrand Riccardo Corsi Rafa Gaitan Neil Hughes @@ -294,6 +294,7 @@ Daniel Trstenjak Craig Bosma Claus Scheiblauer Christophe Loustaunau +Christian Ruzicka Brad Anderegg Aric Aumann Andrew Sampson @@ -481,7 +482,6 @@ Clay Fowler Chuck Sembroski Christopher Blaesius Christophe Herreman -Christian Ruzicka Christian Noon Christian Kaser Christian Ehrlicher diff --git a/CMakeLists.txt b/CMakeLists.txt index fe46299e6..570205494 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,7 +53,7 @@ SET(OPENSCENEGRAPH_SOVERSION 99) # set to 0 when not a release candidate, non zero means that any generated # svn tags will be treated as release candidates of given number -SET(OPENSCENEGRAPH_RELEASE_CANDIDATE 1) +SET(OPENSCENEGRAPH_RELEASE_CANDIDATE 2) SET(OPENSCENEGRAPH_VERSION ${OPENSCENEGRAPH_MAJOR_VERSION}.${OPENSCENEGRAPH_MINOR_VERSION}.${OPENSCENEGRAPH_PATCH_VERSION}) diff --git a/ChangeLog b/ChangeLog index 3482b1763..1d3eb4449 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,68 @@ +2013-07-22 13:31 robert + + * src/osgPlugins/dae/daeWGeometry.cpp: From Andreas Ekstrand, + "Attached is a small modification of the Collada writer that + protects from crashes due to valArray being NULL in some + situations." + +2013-07-22 10:15 robert + + * include/osg/FrameBufferObject, include/osg/StateAttribute: Added + FRAME_BUFFER_OBJECT enum + +2013-07-22 10:15 robert + + * include/OpenThreads/Version: Updated OpenThreads version + +2013-07-19 21:05 robert + + * src/osgViewer/GraphicsWindowIOS.mm: From Christian Ruzicka, "with + the current touch implementation on iOS the touches are not + forwarded to parent views because the base implementation is not + called. Also see the "Best Practices" in the iOS documentation + for event handling: + + http://developer.apple.com/library/ios/#documentation/EventHandling/Conceptual/EventHandlingiPhoneOS/multitouch_background/multitouch_background.html + + "If you handle events in a subclass of any other UIKit responder + class: + - You do not have to implement all of the event handling methods. + - In the methods you do implement, be sure to call the superclass + implementation. For example, [super touchesBegan:touches + withEvent:event]." + + I added the missing lines and tested it with OSG 3.1.9 and iOS + SDK 6.1." + +2013-07-19 20:59 robert + + * src/osg/Geometry.cpp: Added default setting of BIND_PER_VERTEX + when applying Geometry::setTexCoordArray() + +2013-07-19 17:00 robert + + * src/OpenThreads/CMakeLists.txt: Updated OpenThreads version to be + in sync with OSG version + +2013-07-19 14:55 robert + + * CMakeLists.txt, include/osg/Version: Updated version number for + svn/trunk to 3.3.0 for all new feature development + +2013-07-19 14:07 robert + + * AUTHORS.txt: Updated AUTHORS file for new 3.2 branch + +2013-07-19 14:06 robert + + * CMakeLists.txt, include/osg/Version: Updated version number to + 3.2.0-rc1 in prep for create the 3.2 branch, and 3.2.0-rc1 + +2013-07-19 10:31 robert + + * AUTHORS.txt, ChangeLog: Update ChangeLog and AUTHORS files for + 3.1.10 dev release + 2013-07-19 10:17 robert * CMakeLists.txt, include/osg/Version: Updater version for 3.1.10