Andrzej Kapolka
5a2f61084e
Merge branch 'master' of https://github.com/highfidelity/hifi into priority
2014-05-16 11:09:12 -07:00
Brad Hefta-Gaub
c77b234621
Merge pull request #2868 from PhilipRosedale/master
...
Improved hydra movement
2014-05-16 11:02:29 -07:00
Stephen Birarda
514d6d64c4
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-05-16 10:43:12 -07:00
ZappoMan
e7513ff7c6
Merge branch 'master' of https://github.com/worklist/hifi into modelserver
2014-05-16 10:40:41 -07:00
Ryan Huffman
59b23efbd8
Update old comment
2014-05-16 10:37:28 -07:00
Ryan Huffman
91b1910b86
Explicitly null-terminate a string
2014-05-16 10:28:21 -07:00
Ryan Huffman
dbbd3351ef
Fix node bounds overlay blinking
...
QString.to* do not seem to return null terminated strings.
2014-05-16 10:25:15 -07:00
ZappoMan
f5b4e1da37
fix potential floating point error when animations have no frames
2014-05-16 10:00:35 -07:00
Ryan Huffman
ea5dfbdf28
Update parameter to const
2014-05-16 09:53:48 -07:00
Philip Rosedale
5dcd942e8e
removed dead code
2014-05-16 09:44:03 -07:00
Philip Rosedale
4532c93419
debug off
2014-05-16 09:36:55 -07:00
Philip Rosedale
25f1e180f5
revert test change
2014-05-16 09:34:54 -07:00
Philip Rosedale
f8338b66e1
Merge branch 'master' of https://github.com/worklist/hifi
2014-05-16 09:33:21 -07:00
Ryan Huffman
8252b01e30
Cleanup NodeBounds
2014-05-16 09:31:36 -07:00
Ryan Huffman
f646eda7aa
Move server borders to a submenu
2014-05-16 09:30:34 -07:00
Brad Hefta-Gaub
90a84d4241
Merge pull request #2866 from talentraspel/19661
...
yep - this fixes the issue.
2014-05-16 09:20:26 -07:00
Philip Rosedale
85b94ff71c
added dead zone to pitch in hydra move, animated models show up where you are
2014-05-16 09:20:15 -07:00
Brad Hefta-Gaub
6bd1bdebde
Merge pull request #2865 from talentraspel/19662
...
MenuOption::Visage now default to false.
2014-05-16 08:59:31 -07:00
Andrew Meadows
337bc8b947
reuse boolean results rather than recomputing them
2014-05-16 08:28:36 -07:00
Kai Ludwig
51965fd283
changed
...
float specular = max(0.0, dot(normalize(gl_LightSource[0].position + vec4(0.0, 0.0, 1.0, 0.0)), normalizedNormal));
to
float specular = max(0.0, dot(gl_LightSource[0].position, normalizedNormal));
Calculation for specular value has to be done like in all other shaders with the unmodified unnormalized lightsource position. Otherwise the specular effect will have weird behaviour.
2014-05-16 15:44:07 +02:00
Kai Ludwig
e8937852bc
MenuOption::Visage now default to false.
2014-05-16 15:12:49 +02:00
Philip Rosedale
ad4556ab56
Merge branch 'master' of https://github.com/worklist/hifi
2014-05-15 21:58:09 -07:00
Andrzej Kapolka
c29708f22c
Basic joystick integration.
2014-05-15 19:18:19 -07:00
Andrzej Kapolka
e415006526
Fixed index of out bounds error, issue with head not being tracked in
...
PrioVR.
2014-05-15 18:22:57 -07:00
Andrzej Kapolka
e5ef65242f
Merge branch 'master' of https://github.com/highfidelity/hifi into priority
2014-05-15 17:44:54 -07:00
Andrzej Kapolka
a544489f30
First cut at adding external joysticks to the mix.
2014-05-15 17:44:35 -07:00
AndrewMeadows
ecbe61e32a
Merge pull request #2864 from Atlante45/fix_jittery_overlays
...
Add ability to anchor an overlay
2014-05-15 17:32:33 -07:00
AndrewMeadows
0f2cb46188
Merge pull request #2863 from ey6es/master
...
Added alternate IK method for Hydras from code provided by Sixense.
2014-05-15 17:29:27 -07:00
Andrzej Kapolka
946e2b5743
Avoid unused variable warnings in Xcode.
2014-05-15 17:15:25 -07:00
Andrzej Kapolka
6dd08ca1bf
Working on joystick support using SDL.
2014-05-15 17:09:28 -07:00
Atlante45
61fd09e0bd
Add ability to anchor an overlay
2014-05-15 16:24:31 -07:00
Andrzej Kapolka
301234a397
Tabs -> spaces.
2014-05-15 15:34:01 -07:00
Andrzej Kapolka
3eefb6a93e
Rotation bits for alternate IK.
2014-05-15 15:32:32 -07:00
Ryan Huffman
21819ce3b4
Merge branch '19630' of github.com:huffman/hifi into 19630
...
Conflicts:
interface/src/Menu.h
2014-05-15 14:37:05 -07:00
Ryan Huffman
7a3826b72a
Add Node border display
2014-05-15 14:35:01 -07:00
Philip Rosedale
074a6b7f38
Merge pull request #2861 from birarda/master
...
send an updated address to data-server with domain (when changed)
2014-05-15 14:01:39 -07:00
Stephen Birarda
c02baca72d
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-05-15 13:52:32 -07:00
Philip Rosedale
e7e26aa475
Merge pull request #2860 from ey6es/priority
...
PrioVR tweaks: average over two frames, use Faceshift head rotation when PrioVR one is unavailable.
2014-05-15 13:31:05 -07:00
Andrew Meadows
49a7f8c910
formatting some lines that are too long
2014-05-15 12:42:38 -07:00
Andrew Meadows
e98f5c7486
merge upstream/master into andrew/inertia
...
Conflicts:
interface/src/renderer/Model.cpp
2014-05-15 12:33:09 -07:00
Andrew Meadows
4640587445
more correct model bounding capsule
2014-05-15 12:28:55 -07:00
Stephen Birarda
8e9defad3e
send an updated address to data-server with domain (when changed)
2014-05-15 12:18:24 -07:00
Andrzej Kapolka
8ee2642f0e
Fixed compile error.
2014-05-15 12:10:59 -07:00
Andrzej Kapolka
c12f436a7c
Try smoothing the PrioVR input over a couple of frames.
2014-05-15 11:47:11 -07:00
Andrzej Kapolka
f28ba72f75
When PrioVR is connected but head rotation is unavailable, use Faceshift
...
rotation.
2014-05-15 11:37:58 -07:00
Andrzej Kapolka
94988ed5e6
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-05-15 11:31:30 -07:00
Andrzej Kapolka
7bee0478be
More work on integrating IK solution from Sixense.
2014-05-15 11:30:09 -07:00
Stephen Birarda
491e915c93
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-05-15 10:45:45 -07:00
Philip Rosedale
4d32c5f3ed
Merge branch 'master' of https://github.com/worklist/hifi
2014-05-15 09:57:32 -07:00
AndrewMeadows
565f6b9491
Merge pull request #2858 from ZappoMan/modelserver
...
Fix bug where sometimes models don't render
2014-05-15 09:51:43 -07:00
