Commit graph

67 commits

Author SHA1 Message Date
Anthony J. Thibault
da809efcd6 WIP commit, DOES NOT BUILD.
* Added AnimSkeleton class
* Attempt to copy animation frames when _networkAnimation has
  finished loading.  Fill in the holes with bind pose.
2015-08-04 18:14:46 -07:00
Brad Davis
5744200f64 Merge remote-tracking branch 'upstream/master' into plugins
Conflicts:
	interface/CMakeLists.txt
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/avatar/MyAvatar.h
2015-07-20 19:21:02 -07:00
SamGondelman
a4cbb7f412 const references in glmhelpers 2015-07-20 17:30:23 -07:00
Atlante45
b4121eb464 Remove unnecessary move 2015-07-16 13:14:17 -07:00
Anthony J. Thibault
5293effc2e more work in progress vive room tracking
Found and disabled torso twist
use an old copy of the hmd pose before physics, and the most up to date
one after physics.
2015-07-07 00:12:48 -07:00
Seth Alves
508ae276c6 enable -Wdouble-promotion 2015-06-16 18:23:10 -07:00
Bradley Austin Davis
fc73676b4d Merge branch 'master' into plugins_pt1 2015-05-06 11:43:25 -07:00
Brad Davis
302aa9db47 Removing access to the gl widget and display managers 2015-05-02 00:49:52 -07:00
Stephen Birarda
94739cf8d3 move number constants out of SharedUtil to NumericalConstants 2015-05-01 10:26:53 -07:00
Atlante45
6be0910966 Fix contain for collision hulls 2015-04-23 15:58:18 +02:00
Atlante45
955723acf1 RenderableEntityItem uses collision hull in contains 2015-04-22 21:03:55 +02:00
Brad Davis
da05c26aad Moving shaders to standard format, adding bounding box support and using it in text node 2015-02-04 21:32:05 -08:00
Brad Davis
1745ba9a7e More OSX work, refactoring functions to shared, removing erroneuous Qt 5.4 dependency, fixing PrioVR text api usage 2015-02-04 12:42:27 -08:00
Atlante45
ae3bcc8f06 No more .f 2014-11-19 16:53:39 -08:00
Stephen Birarda
0033dfe5af use quat orientation to store locations and user locations 2014-09-16 09:57:21 -07:00
ZappoMan
fd9f64cb44 normalize all quats before packing 2014-09-15 08:46:28 -07:00
Stephen Birarda
0378fb3049 break glm helpers out of SharedUtil 2014-08-08 13:17:53 -07:00