Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-18 12:57:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
41278 commits 69 branches 56 tags 1.2 GiB
Commit graph

41278 commits

This branch
This branch
All branches
Author SHA1 Message Date
PhilipRosedale
7e658896e6 update header 2016-03-22 22:39:55 -07:00
PhilipRosedale
472dd07625 airship from hack project 2016-03-22 22:39:22 -07:00
Brad Davis
252a49eea4 Add a tracker and logging of memory allocated by the GPU library 2016-03-22 22:35:46 -07:00
Brad Davis
2fdb92e8cd Move oglplus dependency from sourceforge to s3 2016-03-22 22:19:10 -07:00
Anthony J. Thibault
df187499ff MyAvatar: fix jitter in hands when moving 
Store hand controller positions within the avatar in sensor space, not world space.
Before IK the sensorToWorld matrix is updated to reflect the world space motion of the
character controller during physics.  This ensures the IK hand targets move properly with the character.
 2016-03-22 19:19:52 -07:00
Zach Pomerantz
40b21933a5 Clean QML Surface render log 2016-03-22 18:42:54 -07:00
Zach Pomerantz
fe1d8b24b4 Lock the QML Surface resizing better 2016-03-22 18:42:46 -07:00
Zach Pomerantz
b41c106f3c Only set the context once per QML surface 2016-03-22 18:40:58 -07:00
Anthony J. Thibault
9dd24f81d4 Fix for osx and linux 2016-03-22 18:24:48 -07:00
Anthony J. Thibault
c40b70688c Made Nsight wrapper win32 only. 2016-03-22 17:43:36 -07:00
ericrius1
8ce23e2345 simple baton test 2016-03-22 17:41:29 -07:00
ericrius1
7450a2ea3a update 2016-03-22 17:38:56 -07:00
ericrius1
e5364fd186 update 2016-03-22 17:33:18 -07:00
Zach Pomerantz
745438148a Reset deadlock watch before qml load 2016-03-22 17:17:36 -07:00
Zach Pomerantz
9c11474dd7 Expose qApp->updateHeartbeat 2016-03-22 17:17:36 -07:00
ericrius1
60bb77fd34 unload baton 2016-03-22 17:12:42 -07:00
ericrius1
107479039a update 2016-03-22 17:10:04 -07:00
ericrius1
608821b50b simple baton 2016-03-22 17:06:49 -07:00
ericrius1
ad5a111b85 simple baton 2016-03-22 17:04:47 -07:00
samcake
34633c2f19 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-03-22 16:51:32 -07:00
samcake
3274df9923 Fixing the missing field for blender translucent map 2016-03-22 16:18:51 -07:00
Brad Hefta-Gaub
9f0084dbb1 make Blender keep a shared pointer to the model it's blending 2016-03-22 16:01:31 -07:00
Anthony Thibault
209524a5c0 openvr: Non-threaded present work 
In the unlikely event you hit 90htz in non-threaded present mode, you will have perfect tracking and latency.
This verifies that there are no other sources of tracking or rendering latency, other then the ones we already know about.
 2016-03-22 15:38:10 -07:00
samcake
3c075532f8 Good to go for merge 2016-03-22 15:14:01 -07:00
ericrius1
dfffe5f431 more removal 2016-03-22 15:02:44 -07:00
ericrius1
a0e8e00357 removed cache defeating code and fixed whitespace 2016-03-22 15:02:00 -07:00
Brad Davis
3e71316589 Merge pull request #7426 from ZappoMan/avatarIdentityFix 
fix to default avatar model
 2016-03-22 13:46:52 -07:00
Brad Hefta-Gaub
d372ca47ad Merge pull request #7428 from zzmp/fix/clear-qml-gl 
Clear GL error before initializing qml to avoid mystery crash
 2016-03-22 13:39:45 -07:00
Zach Pomerantz
e28a876629 Compare gl to GL_NO_ERROR, not GLEW_OK 2016-03-22 13:25:43 -07:00
Zach Pomerantz
471ac80135 Revert most of "Rm extra GL logging" 2016-03-22 13:24:29 -07:00
Brad Hefta-Gaub
361aa3e683 Merge branch 'master' of https://github.com/highfidelity/hifi into avatarIdentityFix 2016-03-22 12:31:19 -07:00
Zach Pomerantz
362e288be8 Rm mystery GL error before qml fbo 2016-03-22 12:05:24 -07:00
Zach Pomerantz
23e3b7e4e3 Rm extra GL logging 2016-03-22 12:04:58 -07:00
Zach Pomerantz
64ced6ee04 Add comment explaining bare glGetError 2016-03-22 12:04:24 -07:00
Brad Hefta-Gaub
bc0ea0e893 Merge pull request #7425 from sethalves/refix-convexHullContains 
be more defensive in FBXGeometry::convexHullContains
 2016-03-22 12:03:11 -07:00
Brad Hefta-Gaub
691ee87c73 fix to default avatar model 2016-03-22 11:32:38 -07:00
Ryan Huffman
1a2f74f43a Add protection around ScriptEngine::runInThread being called twice 2016-03-22 11:26:10 -07:00
Seth Alves
47fb85eaeb be more defensive in FBXGeometry::convexHullContains 2016-03-22 11:24:12 -07:00
Anthony Thibault
50ac101d56 Avatar and Rig NSIGHT instrumentation 2016-03-22 10:36:32 -07:00
ericrius1
918c61c166 removed extra code from virtualBaton 2016-03-22 10:34:10 -07:00
ericrius1
c9c5d3d8bc removed VRVJ files 2016-03-22 10:32:04 -07:00
ericrius1
94283904b8 update 2016-03-22 10:26:13 -07:00
ericrius1
1c876fe110 update 2016-03-22 10:16:49 -07:00
samcake
67abdab8b2 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-03-22 10:13:50 -07:00
ericrius1
f043b27a56 hardcoded num avatars 2016-03-22 10:12:44 -07:00
ericrius1
130eb6b619 working for one; 2016-03-22 10:07:59 -07:00
ericrius1
bc8a8ac703 fix syntax error 2016-03-22 10:00:44 -07:00
ericrius1
2bb11c5dc6 unload baton 2016-03-22 09:59:10 -07:00
Philip Rosedale
f57332e4be Merge pull request #7421 from ZappoMan/fixBlenderCrashRedux 
one more crack at fixing the blender
 2016-03-22 09:51:21 -07:00
Andrew Meadows
114cb27c4f Merge pull request #7422 from jherico/tabs 
Fix occasional crash on creating overlay tool windows
 2016-03-22 09:49:22 -07:00