Stephen Birarda
2a1357e8e1
more debugging to track down a mixer crash
2013-05-29 11:00:51 -07:00
Stephen Birarda
ad95190e15
add debugging for current mixer crash
2013-05-29 10:52:20 -07:00
Philip Rosedale
a3a5241672
Merge pull request #447 from PhilipRosedale/one-liner
...
fix for translucent head
2013-05-29 10:47:45 -07:00
Philip Rosedale
c31c14c56e
Merge remote-tracking branch 'upstream/master' into one-liner
2013-05-29 10:46:55 -07:00
Philip Rosedale
ca8c78162d
one line fix for translucent head
2013-05-29 10:46:10 -07:00
Philip Rosedale
01b0efbb66
Merge pull request #446 from Ventrella/master
...
fixed some glitches in avatar render alpha transition between 3p and 1p
2013-05-29 09:42:27 -07:00
Jeffrey Ventrella
31ff768363
fixed some glitches in avatar render alpha transition between 3p and 1p
2013-05-29 08:30:14 -07:00
ZappoMan
eb675c8dd7
fix crash when no audio mixer available
2013-05-29 08:25:30 -07:00
ZappoMan
6b1d37599c
Merge branch 'master' of https://github.com/worklist/hifi into copy_and_paste_voxels
2013-05-29 08:12:07 -07:00
ZappoMan
b4241da1f0
add --local option to avatar-mixer
2013-05-29 00:49:51 -07:00
ZappoMan
d1d2e75143
first cut at export and import of voxels
2013-05-28 19:00:02 -07:00
ZappoMan
6ff2d1a102
Merge pull request #444 from Ventrella/master
...
fixed bug causing camera to not get updated position of other avatar
2013-05-28 18:56:17 -07:00
Jeffrey Ventrella
0e329af03e
made inline
2013-05-28 18:55:21 -07:00
Jeffrey Ventrella
b98d03337d
fixed bug causing camera to not get updated position of other av
2013-05-28 18:49:16 -07:00
Jeffrey Ventrella
a30936c57c
Merge pull request #443 from Ventrella/master
...
AVATAR_FACING_THRESHOLD
2013-05-28 18:16:40 -07:00
Jeffrey Ventrella
e4c0aeb9a0
added AVATAR_FACING_THRESHOLD to avatarTouch
2013-05-28 18:15:29 -07:00
birarda
0d81d0a451
Merge pull request #442 from Ventrella/master
...
camera bug
2013-05-28 18:00:23 -07:00
Jeffrey Ventrella
82683dbabc
merge
2013-05-28 17:58:02 -07:00
Jeffrey Ventrella
5d9b8c08b3
Merge remote-tracking branch 'upstream/master'
2013-05-28 17:57:42 -07:00
Jeffrey Ventrella
923c39cdc0
fixed third person shift bug
2013-05-28 17:57:11 -07:00
ZappoMan
36fed3db9c
Merge pull request #441 from birarda/master
...
fix a couple of warnings
2013-05-28 16:28:27 -07:00
Stephen Birarda
65f10cb99a
fix the enum in AABox, fix a warning in Head
2013-05-28 16:26:18 -07:00
ZappoMan
221f581fdd
Merge pull request #440 from birarda/master
...
fix silent audio on client
2013-05-28 16:24:53 -07:00
Stephen Birarda
8118e3bf69
type squish in Audio.cpp
2013-05-28 16:23:54 -07:00
Stephen Birarda
55954899e6
fix silent audio on client
2013-05-28 16:20:23 -07:00
ZappoMan
b3045ea681
working on handPosition optimizations
2013-05-28 16:11:07 -07:00
ZappoMan
ccc04688d2
Merge pull request #439 from birarda/mouth-render
...
move _audioLoudness to HeadData
2013-05-28 16:06:44 -07:00
Stephen Birarda
badab39ef1
resolve conflict on merge with upstream master
2013-05-28 15:58:57 -07:00
Stephen Birarda
e040c927f5
Merge remote-tracking branch 'upstream/master' into mouth-render
2013-05-28 15:58:11 -07:00
birarda
17e3902d17
Merge pull request #435 from Ventrella/master
...
Integrated mohawk code, and did some cleanup and improvements on avatar
2013-05-28 15:50:48 -07:00
Stephen Birarda
9f2c0adec7
move audioLoudness to HeadData
2013-05-28 12:22:51 -07:00
Philip Rosedale
d3c9d60cd6
Merge pull request #437 from ey6es/master
...
Sphere/box and capsule/box collisions for voxels; allows us to slide along and stand on voxels. Also a couple build fixes.
2013-05-27 22:07:09 -07:00
Jeffrey Ventrella
5715860f6b
added Skeleton class (to be completed soon)
2013-05-27 18:55:23 -07:00
Jeffrey Ventrella
75b57d17a7
fixed some things based on recent code review
2013-05-27 18:54:44 -07:00
Geenz
8ac8335776
Check how many matches were found for the given data type we're checking for. 1 for bool and float, 3 for vec3. Return false and assign default values if this isn't true.
2013-05-27 19:18:36 -04:00
Geenz
5efda079c9
Store settings in an ordered map to allow for runtime getting and setting of settings. Read the setting file on startup, then write on shut down.
2013-05-27 18:48:05 -04:00
Andrzej Kapolka
278ff00926
Fixed Linux build error and a warning on call to Avatar.simulate, moved grid
...
size constant to world.h and made gravity bounds match.
2013-05-27 14:46:16 -07:00
Andrzej Kapolka
1df7806464
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-27 14:40:30 -07:00
Andrzej Kapolka
949befee09
Fix for NaN.
2013-05-27 14:37:07 -07:00
ZappoMan
04f4e499e1
Optimize wire-format for AvatarData
...
- moved HandState into semi-nibble in bitItems
- moved KeyState into semi-nibble in bitItems
- moved AudioLoudness into scaled float stored as byte
- overall savings - 5 bytes
2013-05-27 14:18:10 -07:00
ZappoMan
ddf4d7c748
removed extra comment
2013-05-27 14:17:55 -07:00
ZappoMan
5d1ba857c5
Optimize View Frustum wire format.
...
- Changed View frstum orientaton to be a quaternion
- Implemented packing formats for Orientation Quats, Ratios, and Clipping values
- Changed wire format for View Frustum details to be more efficient 28 bytes vs 64 bytes
2013-05-27 14:17:34 -07:00
Andrzej Kapolka
cfb66bee95
Capsule/box collisions.
2013-05-27 14:05:44 -07:00
Geenz
94a07b92a7
Documentation for #19308 .
2013-05-27 15:54:32 -04:00
Jeffrey Ventrella
096e465d36
cleaned up some formatting and in-line functions in Avatar.cpp
2013-05-27 10:31:31 -07:00
Geenz
93eac0c0dc
Setup various debug options.
2013-05-27 12:56:41 -04:00
Geenz
17a5e6a700
First round of settings serialization. Setup an API to load and save different settings to the avatar data file.
...
Initial serialized settings:
Gyro look
Mouse look
Transmitter drives
Voxel rendering
Voxel textures
Star rendering
Atmosphere rendering
Avatar rendering
Oculus rift mode
Render stats
Frame stats
Look at vectors
Logging
Frustum debugging
View frustum offset
Camera frustum
2013-05-27 12:37:42 -04:00
Jeffrey Ventrella
d43c5ca52c
normalized body spring tightness
2013-05-26 21:56:21 -07:00
Jeffrey Ventrella
ad5d097ed4
improved neck rendering
2013-05-26 17:44:52 -07:00
Jeffrey Ventrella
4e4a672f32
fixed visual glitch where mouth penetrates head sphere
2013-05-26 17:17:15 -07:00
