Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-22 23:54:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
13063 commits 25 branches 0 tags 1.1 GiB
Commit graph

7056 commits

Author SHA1 Message Date
Andrzej Kapolka
f709ea61b5 Need to initialize this to false. 2014-05-20 17:55:48 -07:00
Andrzej Kapolka
7124b4a196 Mask joints from animation when explicitly set. 2014-05-20 17:10:53 -07:00
Andrzej Kapolka
d3e5e3ccf1 A couple explanatory comments. 2014-05-20 15:41:11 -07:00
Andrzej Kapolka
dd5d3c5591 Merge branch 'master' of https://github.com/highfidelity/hifi into animenu 2014-05-20 15:23:41 -07:00
Andrzej Kapolka
49a0645677 Animation bits. 2014-05-20 15:23:15 -07:00
Stephen Birarda
a9c2e3fe71 put back ssize_t definition 2014-05-20 11:56:06 -07:00
Stephen Birarda
e3dd6509d8 remove dependency on GnuTLS for later replacement with OpenSSL 2014-05-20 10:47:11 -07:00
Stephen Birarda
0e7615391c don't look for GnuTLS from cmake 2014-05-20 10:35:04 -07:00
Andrzej Kapolka
62e7a31602 More work on animation configuration. 2014-05-19 18:09:33 -07:00
Andrzej Kapolka
5da656e3f5 Working on animation dialog. 2014-05-19 16:55:33 -07:00
Andrzej Kapolka
e066d552a0 Added missing unlock that was causing a hang. 2014-05-19 12:48:26 -07:00
Andrzej Kapolka
4f4b4c08bb Restore specular lighting--but, per the OpenGL spec, shut off specular 
contribution if the surface isn't facing the light.
 2014-05-19 12:29:49 -07:00
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