Revision: 1948
http://smartbody.svn.sourceforge.net/smartbody/?rev=1948&view=rev
Author: arishapiro
Date: 2011-06-07 22:04:42 +0000 (Tue, 07 Jun 2011)
Log Message:
-----------
Merged from trunk to r1936
Modified Paths:
--------------
branches/cmake/core/cerevoicerelay/src/cerevoice_tts.cpp
branches/cmake/core/smartbody/sbm/src/RootWindow.cxx
branches/cmake/core/smartbody/sbm/src/RootWindow.h
branches/cmake/core/smartbody/sbm/src/fltk_viewer.cpp
branches/cmake/core/smartbody/sbm/src/fltk_viewer.h
branches/cmake/core/smartbody/sbm/visualc9/sbm-fltk.vcproj
branches/cmake/core/smartbody/smartbody-lib/src/sbm/SteeringAgent.cpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/action_unit.hpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/mcontrol_callbacks.cpp
branches/cmake/data/sbm-common/scripts/init-example-reach.seq
Added Paths:
-----------
branches/cmake/data/mesh/Brad/
branches/cmake/data/mesh/Brad/BeltShape.obj
branches/cmake/data/mesh/Brad/Brad.xml
branches/cmake/data/mesh/Brad/EyesShape.obj
branches/cmake/data/mesh/Brad/Face1Shape.obj
branches/cmake/data/mesh/Brad/HandsShape.obj
branches/cmake/data/mesh/Brad/InnerMouthShape.obj
branches/cmake/data/mesh/Brad/LowerTeethShape.obj
branches/cmake/data/mesh/Brad/PantsShape.obj
branches/cmake/data/mesh/Brad/ShirtShape.obj
branches/cmake/data/mesh/Brad/ShoesShape.obj
branches/cmake/data/mesh/Brad/TongueShape.obj
branches/cmake/data/mesh/Brad/UpperTeethShape.obj
branches/cmake/data/mesh/Brad/polySurfaceShape1.obj
branches/cmake/data/mesh/Utah/
branches/cmake/data/mesh/Utah/ChrUtah_Head_Diffuse.dds
branches/cmake/data/mesh/Utah/Eyelashes001_Diffuse.dds
branches/cmake/data/mesh/Utah/Itm_SpectaclesShape.obj
branches/cmake/data/mesh/Utah/Utah.xml
branches/cmake/data/mesh/Utah/Uth_Apron_MshShape.obj
branches/cmake/data/mesh/Utah/Uth_Arm_Lt_MshShape.obj
branches/cmake/data/mesh/Utah/Uth_Arm_Rt_MshShape.obj
branches/cmake/data/mesh/Utah/Uth_Eye_Lt_MshShape.obj
branches/cmake/data/mesh/Utah/Uth_Eye_Rt_MshShape.obj
branches/cmake/data/mesh/Utah/Uth_Eyelash_Lo_MshShape.obj
branches/cmake/data/mesh/Utah/Uth_Eyelash_Up_MshShape.obj
branches/cmake/data/mesh/Utah/Uth_Knot_MshShape.obj
branches/cmake/data/mesh/Utah/Uth_Pants_MshShape.obj
branches/cmake/data/mesh/Utah/Uth_Shirt_MshShape.obj
branches/cmake/data/mesh/Utah/Uth_Shoe_Lt_MshShape.obj
branches/cmake/data/mesh/Utah/Uth_Shoe_Rt_MshShape.obj
branches/cmake/data/mesh/Utah/Uth_Teeth_Lo_GrpShape.obj
branches/cmake/data/mesh/Utah/Uth_Teeth_Up_MshShape.obj
branches/cmake/data/mesh/Utah/headShape.obj
Removed Paths:
-------------
branches/cmake/data/mesh/Brad/BeltShape.obj
branches/cmake/data/mesh/Brad/Brad.xml
branches/cmake/data/mesh/Brad/EyesShape.obj
branches/cmake/data/mesh/Brad/Face1Shape.obj
branches/cmake/data/mesh/Brad/HandsShape.obj
branches/cmake/data/mesh/Brad/InnerMouthShape.obj
branches/cmake/data/mesh/Brad/LowerTeethShape.obj
branches/cmake/data/mesh/Brad/PantsShape.obj
branches/cmake/data/mesh/Brad/ShirtShape.obj
branches/cmake/data/mesh/Brad/ShoesShape.obj
branches/cmake/data/mesh/Brad/TongueShape.obj
branches/cmake/data/mesh/Brad/UpperTeethShape.obj
branches/cmake/data/mesh/Brad/polySurfaceShape1.obj
branches/cmake/data/mesh/Utah/ChrUtah_Head_Diffuse.dds
branches/cmake/data/mesh/Utah/Eyelashes001_Diffuse.dds
branches/cmake/data/mesh/Utah/Itm_SpectaclesShape.obj
branches/cmake/data/mesh/Utah/Utah.xml
branches/cmake/data/mesh/Utah/Uth_Apron_MshShape.obj
branches/cmake/data/mesh/Utah/Uth_Arm_Lt_MshShape.obj
branches/cmake/data/mesh/Utah/Uth_Arm_Rt_MshShape.obj
branches/cmake/data/mesh/Utah/Uth_Eye_Lt_MshShape.obj
branches/cmake/data/mesh/Utah/Uth_Eye_Rt_MshShape.obj
branches/cmake/data/mesh/Utah/Uth_Eyelash_Lo_MshShape.obj
branches/cmake/data/mesh/Utah/Uth_Eyelash_Up_MshShape.obj
branches/cmake/data/mesh/Utah/Uth_Knot_MshShape.obj
branches/cmake/data/mesh/Utah/Uth_Pants_MshShape.obj
branches/cmake/data/mesh/Utah/Uth_Shirt_MshShape.obj
branches/cmake/data/mesh/Utah/Uth_Shoe_Lt_MshShape.obj
branches/cmake/data/mesh/Utah/Uth_Shoe_Rt_MshShape.obj
branches/cmake/data/mesh/Utah/Uth_Teeth_Lo_GrpShape.obj
branches/cmake/data/mesh/Utah/Uth_Teeth_Up_MshShape.obj
branches/cmake/data/mesh/Utah/headShape.obj
Property Changed:
----------------
branches/cmake/
branches/cmake/core/ogre-viewer/
branches/cmake/core/ogre-viewer/build/vs2008/OgreViewer.sln
branches/cmake/core/ogre-viewer/build/vs2008/OgreViewer.vcproj
branches/cmake/core/ogre-viewer/media/Brad.mesh
branches/cmake/core/ogre-viewer/media/Brad.skeleton
branches/cmake/core/ogre-viewer/media/Brad_Face_2048.dds
branches/cmake/core/ogre-viewer/media/Brad_Hand.dds
branches/cmake/core/ogre-viewer/media/Brad_Pants.dds
branches/cmake/core/ogre-viewer/media/Brad_Shirt.dds
branches/cmake/core/ogre-viewer/media/Brad_Tpose.material
branches/cmake/core/ogre-viewer/src/main.cpp
branches/cmake/core/smartbody/
branches/cmake/core/smartbody/exporters/maya/
branches/cmake/core/smartbody/sbm/
branches/cmake/core/smartbody/smartbody-lib/src/me/me_default_prune_policy.cpp
branches/cmake/core/smartbody/smartbody-lib/src/me/me_default_prune_policy.hpp
branches/cmake/core/smartbody/smartbody-lib/src/me/me_prune_policy.hpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/behavior_span.cpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/behavior_span.hpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/bml_event.cpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/bml_event.hpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/bml_exception.hpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/bml_interrupt.cpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/bml_interrupt.hpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/bml_speech.cpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/bml_speech.hpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/bml_sync_point.cpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/bml_sync_point.hpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/bml_xml_consts.hpp
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
_______________________________________________
Smartbody-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/smartbody-svn
