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
Thijs Wenker
d47e8eb999
Fix setting colors in ParticleExplorer without having the particle entity disappear. Handles Hex strings as well as color arrays.
2016-03-22 17:39:57 +01:00
Brad Davis
a30df07d53
PR feeback, precendence
2016-03-22 09:15:29 -07:00
Anthony Thibault
9faccabf0d
Merge branch 'master' of https://github.com/highfidelity/hifi into tony/vive-rendering-work
2016-03-21 21:55:53 -07:00
Anthony Thibault
b1286517c6
Removed frame latency in GLEscrow
...
This could occur if the GLEscrow queue has extra frames in it.
When new textures were fetched, before this fix, they were simply popped from the queue.
This commit introduces a loop, that will fetch from the queue until it is empty.
2016-03-21 21:51:16 -07:00
Anthony Thibault
225c462685
Improved NSIGHT instrumentation
...
* Application::idle, physics and avatar processing are tracked
* Application::paintGL frameNumber payload is tracked
* OpenGLDisplayPlugin::present is profiled with corresponding frameNumber payload
* Added color and payload support to Nsight ProfileRange class.
2016-03-21 21:47:59 -07:00
Brad Davis
28f25489f8
Fix occasional crash on creating overlay tool windows
2016-03-21 19:17:31 -07:00
Brad Hefta-Gaub
513138ca98
one more crack at fixing the blender
2016-03-21 18:28:26 -07:00
Philip Rosedale
6b3a4eb327
Merge pull request #7419 from hyperlogic/tony/no-locks-no-problem
...
Prevent deadlocks in AvatarUpdate
2016-03-21 17:54:27 -07:00
Seth Alves
eee4abfd95
Merge pull request #7420 from birarda/octree-leak
...
fix a memory leak in OctreePacketProcessor packet piggybacking
2016-03-21 17:52:04 -07:00
samcake
de374c0cac
Switching emissive and lightmap somewhere but not big issue
2016-03-21 17:51:57 -07:00
Anthony Thibault
0d046b12de
OpenVR: Moved WaitGetPoses after main window preview.
2016-03-21 17:39:10 -07:00
Anthony Thibault
63d6f888e6
Update openvr sdk to 0.9.19
2016-03-21 17:31:13 -07:00
Stephen Birarda
20c923db32
remove leaking unused method from NLPacketList
2016-03-21 17:26:49 -07:00
ericrius1
2dce75bfb0
baton sound
2016-03-21 17:22:18 -07:00
Clément Brisset
59b043d803
Merge pull request #7418 from birarda/ds-uuid-cookie
...
fix a crash in DS and remove storage of cookie UUIDs to disk
2016-03-21 17:17:01 -07:00
Philip Rosedale
c8816f8e76
Merge pull request #7389 from Menithal/on-grab-fix
...
Grab.js: Update Position on Mouse Grab Start
2016-03-21 17:10:00 -07:00
ericrius1
adeaa9475e
num
2016-03-21 16:49:55 -07:00
ericrius1
9c18d6c016
change name
2016-03-21 16:47:51 -07:00
ericrius1
efd56ac22a
spawner
2016-03-21 16:45:23 -07:00
Chris Collins
277f49ef64
Merge pull request #7410 from hyperlogic/tony/limit-accumulate-time-loops
...
AnimUtil: prevent accumulateTime from looping forever
2016-03-21 16:39:37 -07:00
samcake
695e558851
Trying to clena up the problem?
2016-03-21 16:36:47 -07:00
Stephen Birarda
6b28523cb5
don't release the OPP processed packet
2016-03-21 16:29:18 -07:00
