Anthony Thibault
9fb897476e
Application: fix for mouse control in third-person camera
...
Process the keyboard & mouse input plugin after the userInputMapper()->update().
2016-03-11 17:29:18 -08:00
Anthony Thibault
ab390f7d2e
Merge branch 'master' into tony/smooth-hands
2016-03-11 10:06:31 -08:00
Anthony J. Thibault
5eeb4ca594
Fix one frame lag controller lag/jitter
...
Move userInputMapper->update() after inputPlugin->pluginUpdate().
2016-03-11 09:28:25 -08:00
Zach Pomerantz
40378920b1
Merge branch 'master' of github.com:highfidelity/hifi into fix/skybox-tex
2016-03-10 21:44:31 -08:00
Anthony J. Thibault
ab19d3e5a2
Moved animation after physics, hand poses are in world frame.
...
There are still some debug hacks enabled so I can test in the vive room.
2016-03-10 20:44:35 -08:00
Anthony J. Thibault
807d31743c
Removed Hand, HandData & PalmData
...
Instead, we just store two controller::Poses in MyAvatar.
Existing behavior and scripting APIs have been preserved.
The hand controller debug drawing is slightly different, but still works.
2016-03-10 19:33:31 -08:00
Philip Rosedale
e87ef52a4c
Merge pull request #7302 from hyperlogic/tony/wrong-way-overlay
...
More reliable and usable UI sphere overlay location
2016-03-10 17:43:50 -08:00
Anthony J. Thibault
6d11dd465c
Application: reset avatar on displayMode change
...
but not HMD sensor.
2016-03-10 13:12:09 -08:00
Zach Pomerantz
b627a17ce9
Allow px/color skybox without tex
2016-03-10 12:58:49 -08:00
Anthony J. Thibault
5f1b8805cf
Removed unnecessary include
2016-03-09 17:37:51 -08:00
Brad Davis
9645ed9120
Update the watchdog heartbeat manually during startup
2016-03-09 17:00:45 -08:00
Anthony J. Thibault
886457939d
Merge branch 'master' into tony/wrong-way-overlay
2016-03-09 16:50:18 -08:00
Howard Stearns
2b576e86f0
Merge pull request #7259 from jherico/crashes
...
Crash fixes
2016-03-09 16:42:36 -08:00
Anthony Thibault
5df616be37
OpenVR: More usable UI Sphere overlay location
...
Also, added a debug option to display SensorToWorld matrix in Developer > Avatar menu.
2016-03-09 16:24:08 -08:00
Brad Davis
23a89a63d8
Set deadlock thread name
2016-03-09 14:51:19 -08:00
Anthony J. Thibault
4af3766804
Don't reset sensors when initializing or changing display plugins.
...
This should fix the issue with the Oculus starting up with the UI aligned
to the HMD on your desk, rather then the configured default sitting pose.
2016-03-09 14:28:26 -08:00
Zach Pomerantz
21719b3980
Wait 10m for DEBUG deadlocks
2016-03-09 14:07:36 -08:00
Brad Davis
d428f3b96f
Working on crash bugs
2016-03-09 14:00:05 -08:00
Brad Davis
cac31761c0
Safer shutdown code in deadlock thread
2016-03-09 13:45:01 -08:00
Brad Davis
80fdef4348
Ensure the heartbeat has a valid value before the thread starts
2016-03-09 10:53:01 -08:00
Brad Davis
95f5d82d37
Add a watchdog thread to trigger a crash on detecting a deadlock
2016-03-09 00:32:46 -08:00
Brad Davis
8988dd9771
Fix mouse drag turning
2016-03-07 17:14:44 -08:00
Brad Davis
28103cf5ef
Migrate composition of the overlay and pointer to the present thread
2016-03-07 17:14:41 -08:00
Chris Collins
7850ca3576
Merge pull request #7227 from hyperlogic/tony/eye-look-at-fixes
...
Avatar eye look at fixes for HMD and desktop
2016-03-07 11:50:16 -08:00
Brad Hefta-Gaub
cfce5af8d4
Merge pull request #7191 from samcake/orange
...
Better Shading Model and support fr Stingray material
2016-03-01 18:24:09 -08:00
samcake
16ac69315f
Imroving the roughness/specular highlight nd fixing a bug with the CUbemap texture
2016-03-01 16:38:02 -08:00
Zach Pomerantz
5c64115b26
Use keyLight in DLE instead of _skyboxTexture
2016-03-01 14:44:34 -08:00
Stephen Birarda
f44cf3903c
re-instate verified domain ownership for full automatic networking
...
This reverts commit 34408c8144
2016-03-01 13:04:37 -08:00
Stephen Birarda
b0c11e6562
Merge pull request #7217 from huffman/udt-random-seq
...
Randomize initial send sequence number in UDT
2016-03-01 12:59:10 -08:00
Atlante45
4944d0a8d0
Handle threading inside AssetServer
2016-03-01 12:00:43 -08:00
Atlante45
6a4b93a4e7
Proper fix for DiskCacheInfo
2016-03-01 12:00:43 -08:00
Atlante45
40d307a37b
Temporary fix to disk cache editor crash
2016-03-01 12:00:43 -08:00
Atlante45
2c1762526d
Move all resource requests to the same thread
2016-03-01 12:00:43 -08:00
Ryan Huffman
cc9c87d281
Fix packet version mismatch not showing for domain packets
2016-03-01 11:36:49 -08:00
Brad Hefta-Gaub
2c3fdc995f
Away improvements
2016-02-29 20:23:06 -08:00
Anthony J. Thibault
460582239a
Avatar eye look at fixes for HMDs
...
There were three things that were causing issues with eye look at vectors while wearing an HMD.
1) The matrix returned by AvatarUpdate->getHeadPose() was in the wrong space, it should be in avatar space.
it was actually returning a matrix in sensor/room space.
2) The lookAtPosition was incorrect while wearing an HMD and with no avatars to look at.
3) The eye rotation limits in Rig::updateEyeJoint were relative to the model's zero orientation, NOT relative to the head.
this was causing the eyes to hit limits when the avatar head turned.
2016-02-29 18:02:50 -08:00
Zach Pomerantz
3c53078178
Merge pull request #7194 from ZappoMan/toggleOverlay
...
add toggleOverlays menu item and action
2016-02-26 10:17:24 -08:00
Philip Rosedale
783892ac2e
Merge pull request #7206 from hyperlogic/tony/simrate-fix
...
Application: don't simulate until we are ready to render
2016-02-26 07:27:35 -08:00
Brad Hefta-Gaub
bf0fb7258a
CR feedback
2016-02-25 22:01:10 -08:00
Anthony J. Thibault
e5c81f66a5
Application: removed threadID and milliseconds from logging.
2016-02-25 18:20:43 -08:00
Anthony J. Thibault
08c16beff2
Application: re-worded presentCount comments
2016-02-25 18:17:42 -08:00
Andrew Meadows
5d1e283508
namechange TouchesKeyhole to IntersectsKeyhole
2016-02-25 18:09:35 -08:00
Andrew Meadows
2591c5ee3e
cleanup names that use "keyhole"
2016-02-25 18:09:35 -08:00
Andrew Meadows
9558258f64
use cubeInKeyhole() where appropriate
2016-02-25 18:09:35 -08:00
Andrew Meadows
dfdf375853
use shapeInFrustum() names again
...
but at the same time make the code more redable
also: add some more efficient shape-touches-view methods
and cleanup some whitespace
2016-02-25 18:09:35 -08:00
Anthony J. Thibault
11cd8e03b9
Merge branch 'master' into tony/simrate-fix
2016-02-25 17:50:23 -08:00
Anthony J. Thibault
1fdae13de1
Application: don't simulate until we are ready to render.
2016-02-25 17:48:55 -08:00
Stephen Birarda
34408c8144
Revert "verified domain ownership for full automatic networking"
2016-02-25 17:02:08 -08:00
Brad Hefta-Gaub
b0c286bc3b
Merge branch 'master' of https://github.com/highfidelity/hifi into toggleOverlay
...
Conflicts:
interface/src/Application.cpp
2016-02-25 16:21:38 -08:00
Brad Hefta-Gaub
202a456e1a
Merge pull request #7126 from AndrewMeadows/cleanup
...
cleanup ViewFrustum method names
2016-02-25 16:12:25 -08:00
