Philip Rosedale
2846381396
Merge pull request #5817 from sethalves/hand-controller-adjustment
...
if the intersection distance is small, use grab-mode rather than distant-grab-mode
2015-09-15 18:41:42 -07:00
Brad Davis
f35ffd2ab7
Merge pull request #5814 from samcake/HMDLightingBug
...
Fixing HMD and stereo lighting bug
2015-09-15 18:10:26 -07:00
Sam Gateau
80d25a68b6
Bringing back the eyeView per side to the deferred transform stack
2015-09-15 18:05:15 -07:00
Sam Gateau
5410bc0945
FIx the review comment and trying to fix the simple stereo display plugin projection and eye view matrix
2015-09-15 17:48:55 -07:00
Stephen Birarda
62de828493
Merge pull request #5815 from ZappoMan/entityServerCrashes
...
couple of entity server corner cases
2015-09-15 17:21:36 -07:00
Brad Hefta-Gaub
54972515dc
make sure timer is owned
2015-09-15 17:04:40 -07:00
Sam Gateau
8ab96fe907
Bringin back full screen for stereo mode
2015-09-15 17:02:30 -07:00
Seth Alves
f7193dbb97
if the intersection distance is small, use grab-mode rather than distant-grab-mode
2015-09-15 16:55:51 -07:00
Sam Gateau
f00e3829f1
Cleaning for PR
2015-09-15 16:54:04 -07:00
Brad Hefta-Gaub
0aed08a006
more robust handling of readConfiguration
2015-09-15 16:52:15 -07:00
Brad Hefta-Gaub
4a24a3767b
couple of entity server corner cases
2015-09-15 16:17:05 -07:00
Brad Hefta-Gaub
22b979a663
couple of entity server corner cases
2015-09-15 16:02:22 -07:00
Howard Stearns
848bb4fccb
Merge pull request #5813 from hyperlogic/tony/anim-hand-state-machines
...
Added point and grab support to the AnimGraph
2015-09-15 15:47:19 -07:00
Ryan Huffman
8c3d8bc7de
Merge pull request #5809 from birarda/phrc
...
timing fixes for default time_point on windows
2015-09-15 15:29:30 -07:00
Sam Gateau
7b8e11e01c
Debugging, looking good, no ready for final lighting
2015-09-15 15:22:45 -07:00
Anthony J. Thibault
f13c839f4a
Removed comment
2015-09-15 15:19:11 -07:00
Stephen Birarda
8454cb916c
avoid branching by using %= operator
2015-09-15 15:15:26 -07:00
Anthony J. Thibault
1948829ca8
Improved state machine for right hand.
...
The hand state machine has the following features
* There's a idle to point animation, followed by a looping point hold state.
* There's a point to idle animation.
* The grab state is composed of a linear blend between an open and closed pose.
Additionally the C++ code will ramp on the left and right hand overlays,
This allows the fingers to be animated normally when the user is not actively
pointing or grabbing.
2015-09-15 15:09:08 -07:00
Sam Gateau
dc8756e465
Need to pull master, just updated all the deferred shaders to use scribe func declare blocks to avoid long shaders... didn;t validate the current clip to eye position evaluation
2015-09-15 14:40:23 -07:00
Philip Rosedale
e04f89280d
Merge pull request #5812 from sethalves/grab-controller-adjustment
...
Grab controller adjustment
2015-09-15 13:29:07 -07:00
Brad Davis
4c0a21f3d2
Merge pull request #5811 from ZappoMan/scriptEngineCleanup
...
Rework the ScriptEngine shutdown process, Fix crash in AC Scripts
2015-09-15 13:23:40 -07:00
Brad Hefta-Gaub
016a5e5f0a
cleanup comments
2015-09-15 11:52:07 -07:00
Brad Hefta-Gaub
41caa36038
removed some debug code
2015-09-15 11:50:10 -07:00
Seth Alves
e650e40388
try harder to have line rezzed when it's needed. don't ignore entities that are too close when doing line intersection
2015-09-15 11:32:56 -07:00
Brad Hefta-Gaub
bdae3e420b
fix crash in AC
2015-09-15 11:24:04 -07:00
Seth Alves
7b5d6c20e9
double change in hand rotation before applying it to the object
2015-09-15 11:21:13 -07:00
Brad Davis
41383c49cf
Merge pull request #5808 from kencooke/audio-fix
...
Audio fixes
2015-09-15 11:04:31 -07:00
Brad Hefta-Gaub
6521de8163
rework ScriptEngine and worker thread shutdown
2015-09-15 11:00:05 -07:00
Seth Alves
99b0046fc7
various adjustments
2015-09-15 10:43:17 -07:00
Ken Cooke
ffe3fcf4ce
Replace repeated division with multiply by inverse
2015-09-15 10:18:53 -07:00
Stephen Birarda
6756d5364b
sensible defaults for other time_point uses
2015-09-15 10:11:05 -07:00
Ken Cooke
5045f8558e
Fix incorrect scale factor for converting int16_t to/from float
2015-09-15 10:08:24 -07:00
Stephen Birarda
6a186ad1fe
ensure a handshake goes out the first time
2015-09-15 09:48:17 -07:00
Brad Hefta-Gaub
0efc8d6628
Merge branch 'master' of https://github.com/highfidelity/hifi into scriptEngineCleanup
2015-09-15 09:21:02 -07:00
Clément Brisset
cb1b70820a
Merge pull request #5801 from AndrewMeadows/fix-animation-tests
...
fix animation unit tests
2015-09-15 17:53:06 +02:00
Brad Hefta-Gaub
bd8d2dab9c
Merge branch 'master' of https://github.com/highfidelity/hifi into scriptEngineCleanup
2015-09-15 08:50:55 -07:00
Brad Davis
4ce1db16f4
Merge pull request #5804 from ZappoMan/scriptEngineCleanup
...
ScriptEngine Threading Repairs
2015-09-15 08:47:11 -07:00
Brad Hefta-Gaub
38e4726fa7
Merge pull request #5807 from jherico/marge
...
Fix avatar and other model animations
2015-09-15 08:38:26 -07:00
Sam Gateau
9f8d6a78cc
Merge branch 'master' of https://github.com/highfidelity/hifi into HMDLightingBug
2015-09-15 08:35:42 -07:00
Sam Gateau
400f90aea4
Introducing a stereo loop that should do the right thing but doesn't yet
2015-09-15 08:34:46 -07:00
Brad Hefta-Gaub
bd1d3cb468
Merge branch 'master' of https://github.com/highfidelity/hifi into scriptEngineCleanup
2015-09-15 08:11:11 -07:00
Brad Hefta-Gaub
70d2288407
CR feedback
2015-09-15 08:04:26 -07:00
Brad Davis
f4818c17cf
Fix avatar and other model animations
2015-09-15 08:04:17 -07:00
Brad Davis
3f688f92d3
Don't do an O(N^2) operation on cluster matrices
2015-09-15 08:04:17 -07:00
Brad Hefta-Gaub
2fb2307bf8
Merge pull request #5805 from highfidelity/revert-5800-marge
...
Revert "Fix over-calculation of cluster matrices"
2015-09-14 21:46:01 -07:00
Brad Hefta-Gaub
70fcdbf2fd
Revert "Fix over-calculation of cluster matrices"
2015-09-14 21:20:11 -07:00
Brad Hefta-Gaub
e92d195030
tweak
2015-09-14 21:18:36 -07:00
Brad Hefta-Gaub
54a45f3173
Merge branch 'master' of https://github.com/highfidelity/hifi into scriptEngineCleanup
...
Conflicts:
libraries/entities-renderer/src/EntityTreeRenderer.cpp
libraries/script-engine/src/ScriptEngine.cpp
libraries/script-engine/src/ScriptEngine.h
2015-09-14 21:13:08 -07:00
Brad Hefta-Gaub
94b273a029
more work on script engine
2015-09-14 20:59:10 -07:00
Brad Hefta-Gaub
a3c0288eae
more work on proper threading of ScriptEngine
2015-09-14 20:26:04 -07:00
