Atlante45
2839f5207b
Merge branch 'master' of https://github.com/highfidelity/hifi into anchers_apply_rotation_and_scale
2014-05-17 22:08:39 -07:00
Atlante45
7d40790260
Don't compute avatar anchor specs if uneeded
2014-05-17 22:08:28 -07:00
Andrzej Kapolka
5ebb2659a4
Fixed initialization order warning.
2014-05-17 19:02:14 -07:00
Andrzej Kapolka
c8f2dae7bd
Fix for stopping scripts on Windows.
2014-05-17 18:45:54 -07:00
Atlante45
0edcd732fe
Added rotation and scale to overlay anchers
2014-05-16 17:36:27 -07:00
Brad Hefta-Gaub
2c8efa05b7
Merge pull request #2873 from birarda/master
...
assume use of a Qt build without bearer management
2014-05-16 17:22:55 -07:00
Brad Hefta-Gaub
06a0084269
Merge pull request #2862 from AndrewMeadows/inertia
...
improved model bounding shapes
2014-05-16 17:22:28 -07:00
Stephen Birarda
e6fa1c55db
assume we are using a Qt build without bearer management
2014-05-16 17:06:17 -07:00
Andrzej Kapolka
6eaa549f65
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-05-16 16:26:47 -07:00
Andrzej Kapolka
4a23c0cfd9
Fix for arms' getting twisted up with new IK.
2014-05-16 16:25:24 -07:00
Philip Rosedale
d54ff7a2cf
Merge pull request #2869 from huffman/19630
...
Code Review for Job #19630
2014-05-16 16:00:05 -07:00
Andrzej Kapolka
956c5d2eb6
More joystick fixes.
2014-05-16 14:24:49 -07:00
Ryan Huffman
cc952f9cee
Reset node bounds overlay text when no nodes are selected
2014-05-16 13:56:28 -07:00
Ryan Huffman
4100e5c64a
Merge branch '19630' of github.com:huffman/hifi into 19630
2014-05-16 13:21:44 -07:00
Ryan Huffman
e5d6a66ca9
Use char array instead of QString in NodeBounds
2014-05-16 13:21:10 -07:00
Ryan Huffman
3f2d08871c
Reorder includes in NodeBounds.cpp
2014-05-16 12:24:26 -07:00
Ryan Huffman
32974b4003
Remove QGLWidget include from NodeBounds
2014-05-16 12:16:42 -07:00
Andrzej Kapolka
4314e42116
Merge branch 'priority' of https://github.com/ey6es/hifi into priority
...
Conflicts:
interface/src/Application.cpp
interface/src/devices/PrioVR.h
interface/src/scripting/ControllerScriptingInterface.cpp
2014-05-16 12:16:40 -07:00
Andrzej Kapolka
a7234fd8d3
Stuff the joystick and position bits into the palms.
2014-05-16 12:10:21 -07:00
Ryan Huffman
b48b8aab12
Merge branch 'master' of git://github.com/highfidelity/hifi into 19630
...
Conflicts:
interface/src/Application.cpp
2014-05-16 11:48:58 -07:00
Andrzej Kapolka
c42368594d
Scratch that; going to shoehorn joystick data into palms.
2014-05-16 11:24:45 -07:00
Andrzej Kapolka
20eadab970
Lock joystick states for thread safety.
2014-05-16 11:18:21 -07:00
Andrzej Kapolka
5a2f61084e
Merge branch 'master' of https://github.com/highfidelity/hifi into priority
2014-05-16 11:09:12 -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
Ryan Huffman
ea5dfbdf28
Update parameter to const
2014-05-16 09:53:48 -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
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
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
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
