Stephen Birarda
|
ce7918108c
|
remove a lingering comment
|
2013-05-17 11:09:23 -07:00 |
|
Stephen Birarda
|
194035e464
|
repair indentation in Head constructor
|
2013-05-17 11:08:44 -07:00 |
|
Stephen Birarda
|
a11ddee974
|
fix the width and height for the new iris texture
|
2013-05-17 10:55:11 -07:00 |
|
Stephen Birarda
|
b2518e0595
|
change the iris texture
|
2013-05-17 10:51:29 -07:00 |
|
Stephen Birarda
|
c214e9b179
|
use the default Avatar destructor, comment out unused consts in Head
|
2013-05-17 10:46:59 -07:00 |
|
Stephen Birarda
|
a1ea7b58dd
|
remove unused GLUQuadric sphere from Avatar class
|
2013-05-17 10:45:26 -07:00 |
|
Stephen Birarda
|
0e7c0776f2
|
refactor the Head class to remove _sphere and use default copy constructor
|
2013-05-17 10:43:26 -07:00 |
|
birarda
|
4b590eda78
|
Merge pull request #330 from Ventrella/master
fixed camera tightness in mirror mode; fixed a bunch of header (c) notifications; added avatar lookat code (not finished yet)t
|
2013-05-17 10:14:19 -07:00 |
|
Jeffrey Ventrella
|
ade5b7bec3
|
formatting changes
|
2013-05-17 09:52:19 -07:00 |
|
Jeffrey Ventrella
|
0edf72a2be
|
trying to fix merge conflicts
|
2013-05-17 09:20:42 -07:00 |
|
Jeffrey Ventrella
|
7e0877e753
|
cleanup
|
2013-05-17 08:48:54 -07:00 |
|
ZappoMan
|
501a68a2de
|
Merge pull request #336 from PhilipRosedale/master
View shifts back to straight ahead on movement
|
2013-05-16 21:25:04 -07:00 |
|
Philip Rosedale
|
e55efb81a8
|
Added acceleration decay of pitch (you look up/straight if you start moving)
|
2013-05-16 19:12:48 -06:00 |
|
Philip Rosedale
|
2be597beb0
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-05-16 19:11:15 -06:00 |
|
Jeffrey Ventrella
|
1c126e2525
|
resolved conflicts
|
2013-05-16 17:32:54 -07:00 |
|
Jeffrey Ventrella
|
750a48bb73
|
cleaned up head class - made most members private. Added copy constructor
|
2013-05-16 17:20:00 -07:00 |
|
ZappoMan
|
068e863fb4
|
Merge pull request #334 from PhilipRosedale/master
Mouse moves pitch, yaw when near screen edge, gravity bouncing fixed!
|
2013-05-16 16:24:42 -07:00 |
|
Philip Rosedale
|
aad5f3bfff
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-05-16 17:21:24 -06:00 |
|
Philip Rosedale
|
d8578ebb42
|
Merge pull request #335 from ey6es/master
Added gray background for chat entry, shadow/outline effects for text rendering. Enabled shadows for text contrast.
|
2013-05-16 16:21:10 -07:00 |
|
Andrzej Kapolka
|
26badc56e0
|
Added shadow and outline effects to TextRenderer, use the shadow effect in
our text to separate it from the background.
|
2013-05-16 16:10:38 -07:00 |
|
Philip Rosedale
|
9011484590
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-05-16 17:06:40 -06:00 |
|
Philip Rosedale
|
9f57787ece
|
Fixed jerking on gravity, added mouse pitch, yaw behavior.
|
2013-05-16 17:05:45 -06:00 |
|
Andrzej Kapolka
|
191c533ad2
|
Provide a gray background for the chat entry, so that we can see what we're
typing.
|
2013-05-16 14:24:18 -07:00 |
|
ZappoMan
|
d58a811844
|
Merge pull request #332 from birarda/audio-injection-manager
add an AudioInjectionManager to handle memory management for multiple injectors
|
2013-05-16 14:12:24 -07:00 |
|
Stephen Birarda
|
442d658835
|
switch from 255 to 0xFF for max volume constant
|
2013-05-16 14:10:48 -07:00 |
|
Stephen Birarda
|
a37b451993
|
add constants for volume byte values
|
2013-05-16 14:09:50 -07:00 |
|
Philip Rosedale
|
7866c803fb
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-05-16 14:44:15 -06:00 |
|
Philip Rosedale
|
b2709652b4
|
Tweaks to improve mouse Yaw behavior.
|
2013-05-16 14:43:46 -06:00 |
|
Philip Rosedale
|
f06e071d6b
|
Merge pull request #333 from ey6es/master
Experimenting with a simple 3D Perlin noise texture on the voxels.
|
2013-05-16 13:43:16 -07:00 |
|
Stephen Birarda
|
f6cc40362c
|
hook the injector up to the change AudioInjector setup
|
2013-05-16 13:10:48 -07:00 |
|
Andrzej Kapolka
|
d241dba573
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-05-16 13:09:31 -07:00 |
|
Andrzej Kapolka
|
86ddcea87f
|
Better names for the shaders.
|
2013-05-16 13:08:21 -07:00 |
|
Stephen Birarda
|
a2f8d8ae25
|
break audio out of shared into its own library
|
2013-05-16 13:00:40 -07:00 |
|
Philip Rosedale
|
31967e8afb
|
Merge pull request #331 from ZappoMan/master
get rid of the "kill the solar system" feature... protecting us from ourselves!
|
2013-05-16 12:59:55 -07:00 |
|
ZappoMan
|
f8dc01a890
|
removed the - key killing all the planets
|
2013-05-16 12:56:13 -07:00 |
|
birarda
|
3eaa1e6a4c
|
Merge pull request #327 from PhilipRosedale/master
transmitter drives hand, part 1 of echo cancellation, removed renderPitch
|
2013-05-16 12:40:59 -07:00 |
|
Stephen Birarda
|
5514966d9c
|
add an AudioInjectionManager to handle multiple injections, link eve to it
|
2013-05-16 12:40:23 -07:00 |
|
Philip Rosedale
|
a36d32e101
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-05-16 13:34:54 -06:00 |
|
Philip Rosedale
|
78bd5ab40f
|
Fixes per review
|
2013-05-16 13:34:48 -06:00 |
|
Jeffrey Ventrella
|
cd248188d9
|
thingy
|
2013-05-16 12:19:20 -07:00 |
|
Jeffrey Ventrella
|
aafb557b02
|
turned off look at behavior - until it is finished and working correctly
|
2013-05-16 12:14:36 -07:00 |
|
Jeffrey Ventrella
|
04828c8224
|
cleaned up copyright header notifications in several files
|
2013-05-16 12:06:36 -07:00 |
|
Jeffrey Ventrella
|
be7be4ad99
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-05-16 11:18:32 -07:00 |
|
Philip Rosedale
|
c8c4b8fda5
|
Merge pull request #328 from kordero/master
fixing sscanf issue with floats for certain locales
|
2013-05-15 23:36:04 -07:00 |
|
Philip Rosedale
|
ed3a94d3fc
|
Merge pull request #322 from ey6es/master
Fix for glut reinitialization warning, Linux build fix, migrated to Qt shader classes.
|
2013-05-15 23:22:07 -07:00 |
|
Philip Rosedale
|
1b039c3755
|
Transmitter V2 drives the hand, and rendering levels with 'l' shows the hand transmitter data. Physics will need to be tuned.
|
2013-05-16 00:10:10 -06:00 |
|
=
|
0016038fe3
|
fixing locale issue with decimal delimiter for floats
|
2013-05-16 02:39:10 -03:00 |
|
Andrzej Kapolka
|
0a6b4702c6
|
Experimenting with simple Perlin noise shader for voxels.
|
2013-05-15 22:18:56 -07:00 |
|
Philip Rosedale
|
29889725ef
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-05-15 21:17:34 -06:00 |
|
Philip Rosedale
|
1a283c3ac0
|
Improvements to scope display, added framework for echo analysis over multiple frames
|
2013-05-15 21:15:55 -06:00 |
|