Philip Rosedale
60100fd473
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-04 09:09:39 -07:00
ZappoMan
ce499f925a
add cut voxels
2013-06-04 09:02:34 -07:00
ZappoMan
626874f9ec
add delete key support while in select mode
2013-06-04 08:47:57 -07:00
ZappoMan
743e1a433c
make import/export default to desktop
2013-06-04 01:24:35 -07:00
ZappoMan
4f3872c18f
CR feedback
2013-06-04 01:13:58 -07:00
ZappoMan
0a9b3bf5ce
changed file name and exention to Sparse Voxel Octree and svo
2013-06-04 01:07:18 -07:00
ZappoMan
435791f28c
CR feedback
2013-06-04 01:02:10 -07:00
ZappoMan
eef0636655
some cleanup
2013-06-03 21:53:06 -07:00
ZappoMan
510dfc7353
Merge branch 'master' of https://github.com/worklist/hifi into avatardata_optimization
2013-06-03 21:43:38 -07:00
ZappoMan
05e8c8806c
Merge branch 'master' of https://github.com/worklist/hifi into copy_and_paste_voxels
2013-06-03 21:28:23 -07:00
ZappoMan
cf3ff53e2c
copy and paste working
2013-06-03 18:08:11 -07:00
Jeffrey Ventrella
cee2244364
fixed formatting things
2013-06-03 17:55:48 -07:00
Philip Rosedale
179e30fdfc
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-03 17:37:25 -07:00
Philip Rosedale
5e0a70c524
gyro look controls head offset on/off
2013-06-03 17:36:32 -07:00
Philip Rosedale
da343215ce
Rename serialPort to serialHeadSensor, added passing of lean to eyeOffset
2013-06-03 17:25:20 -07:00
Andrzej Kapolka
6552a64bb4
Merge branch 'master' of https://github.com/worklist/hifi into voxeltars
2013-06-03 17:17:24 -07:00
Jeffrey Ventrella
da09dd3259
test
2013-06-03 17:16:52 -07:00
ZappoMan
0b7f4b21f4
Merge branch 'master' of https://github.com/worklist/hifi into copy_and_paste_voxels
2013-06-03 16:42:27 -07:00
Jeffrey Ventrella
3ff11d0eb8
test
2013-06-03 16:42:27 -07:00
Jeffrey Ventrella
b73eb66492
temp test
2013-06-03 16:31:39 -07:00
Jeffrey Ventrella
26bbb9917b
more work on avatar touch
2013-06-03 16:23:55 -07:00
ZappoMan
0f2b736130
cleanup
2013-06-03 13:50:42 -07:00
ZappoMan
ea965f2290
fixed issue with sendVoxelsOperataion, some other cleanup
2013-06-03 13:46:21 -07:00
ZappoMan
c4b3b568e7
make import and export properly rebase
2013-06-03 13:13:52 -07:00
Andrzej Kapolka
73f8fca2af
More work on voxeltars; added rotations.
2013-06-03 13:00:54 -07:00
Jeffrey Ventrella
e96503de0d
Merge remote-tracking branch 'upstream/master'
2013-06-03 12:26:51 -07:00
Jeffrey Ventrella
6479a41206
more ball prep
2013-06-03 12:26:20 -07:00
ZappoMan
78fe89172a
eyedropper mode, and import work
2013-06-03 12:23:16 -07:00
Stephen Birarda
0fedf354e0
don't attempt to send microphone audio if AgentList is NULL
2013-06-03 12:10:18 -07:00
Jeffrey Ventrella
00dce6b59e
fix
2013-06-03 12:01:01 -07:00
Stephen Birarda
5a5b22db61
fix use of PI constant after merge with upstream master
2013-06-03 12:00:57 -07:00
Stephen Birarda
4348702dd2
Merge remote-tracking branch 'upstream/master' into synthesis
2013-06-03 11:53:13 -07:00
Jeffrey Ventrella
8d031b5c2d
preparation for extending the avatar ball array to accommodate more touch capabilities
2013-06-03 11:53:00 -07:00
ZappoMan
7dd217b318
more work on copy and paste
2013-06-03 10:57:18 -07:00
Andrzej Kapolka
a6daa296ff
Slight fix to capsule/box penetration test: we should use the smaller distance
...
to the diagonal, not the first one we find.
2013-06-03 10:08:42 -07:00
Andrzej Kapolka
26b7976489
Merge branch 'master' of https://github.com/worklist/hifi into voxeltars
2013-06-03 09:49:50 -07:00
Jeffrey Ventrella
cf67f28b57
merge
2013-06-03 08:10:41 -07:00
Jeffrey Ventrella
6a14ae1eb9
Merge remote-tracking branch 'upstream/master'
2013-06-03 08:10:19 -07:00
Jeffrey Ventrella
9e046b74e6
working on avatar touch
2013-06-03 08:09:27 -07:00
Philip Rosedale
f840103ef2
Merge pull request #477 from Geenz/19351
...
#19351 Atmosphere shaders should be handled per-pixel instead of per-vertex.
2013-06-02 20:01:02 -07:00
Andrzej Kapolka
8d757e148f
More work on voxeltars; basic skinning works.
2013-06-02 19:55:51 -07:00
atlante45
dccc44a6f5
Added settings management using QSettings
2013-06-02 14:58:51 +02:00
Andrzej Kapolka
35ae08def0
Merge branch 'master' of https://github.com/worklist/hifi into voxeltars
2013-06-01 15:07:00 -07:00
Andrzej Kapolka
6c975f9c6f
More work on avatar voxels.
2013-06-01 15:06:29 -07:00
Andrzej Kapolka
7425b39237
Working on avatar voxel system.
2013-05-31 17:55:30 -07:00
Geenz
de76851207
Remove unnecessary normalize.
2013-05-31 20:35:26 -04:00
Jeffrey Ventrella
de49d7fc6c
more fixes
2013-05-31 17:32:30 -07:00
Geenz
d98b28d4ab
So apparently, this was a scale problem the entire time.
2013-05-31 20:30:42 -04:00
Jeffrey Ventrella
d92471860d
cleanup
2013-05-31 16:58:58 -07:00
Jeffrey Ventrella
4f49f1769e
separated springy balls from skeleton
2013-05-31 16:54:56 -07:00
Stephen Birarda
2d7c397138
create a FreeVerb object for each other agent per agent
2013-05-31 15:47:57 -07:00
Philip Rosedale
69ec109585
Refactor/Cleanup serial interface to use vectors, correct rotation axes. Added translation estimation for the head.
2013-05-31 15:28:15 -07:00
Jeffrey Ventrella
1061b3eb4d
cleanup
2013-05-31 15:05:05 -07:00
Jeffrey Ventrella
303643e921
cleanup
2013-05-31 15:01:08 -07:00
Jeffrey Ventrella
e33c11bb48
Merge remote-tracking branch 'upstream/master'
2013-05-31 14:52:46 -07:00
Andrzej Kapolka
929797516d
Merge branch 'master' of https://github.com/worklist/hifi into voxeltars
2013-05-31 14:52:39 -07:00
Andrzej Kapolka
e4bc7af6b4
Working on avatar voxels.
2013-05-31 14:52:29 -07:00
Jeffrey Ventrella
f1fc3fe704
merge
2013-05-31 14:52:24 -07:00
Andrzej Kapolka
8f377349ef
Merge pull request #474 from PhilipRosedale/master
...
Smooth gravity fields when flying
2013-05-31 14:52:00 -07:00
Philip Rosedale
088e9d0aef
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-31 14:21:38 -07:00
Jeffrey Ventrella
3ce051bff7
merge
2013-05-31 14:11:46 -07:00
Philip Rosedale
2a9a3139b2
Added smooth gravity field so we can fly to planets and land on them, static friction to stop drifting, thrust tweaks.
2013-05-31 14:02:20 -07:00
Jeffrey Ventrella
fdfc639c23
merge
2013-05-31 13:52:22 -07:00
ZappoMan
e5e200345b
more work on copy and paste
2013-05-31 11:52:18 -07:00
Jeffrey Ventrella
108ce62d1a
committing latest skeleton-separation changes (more to come as Andrzej and I work on it more)
2013-05-31 11:51:03 -07:00
ZappoMan
b0397e8eb9
Merge branch 'master' of https://github.com/worklist/hifi into copy_and_paste_voxels
2013-05-30 21:41:55 -07:00
Andrzej Kapolka
224e5d666d
Fix for segmentation fault when the settings file doesn't exist.
2013-05-30 17:12:18 -07:00
ZappoMan
bc5af6e399
Merge pull request #438 from Geenz/19308
...
#19308 - Store menu settings in the avatar data file
2013-05-30 16:51:02 -07:00
Geenz
ed904b58eb
Fixed spacing issues per the coding standard.
2013-05-30 19:50:01 -04:00
Geenz
fefa74135c
Moved to function overloads instead of unique function names.
2013-05-30 19:47:25 -04:00
Philip Rosedale
38e611eb7f
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-30 16:19:11 -07:00
Philip Rosedale
f009177aa7
Added check for lost transmitter
2013-05-30 16:19:07 -07:00
Andrzej Kapolka
9213cfd0c2
Revert to simply adding the Eulers.
2013-05-30 15:48:00 -07:00
Andrzej Kapolka
47bf5a2b77
Have the Head control how orientations are added.
2013-05-30 15:43:07 -07:00
Andrzej Kapolka
780b049f4b
I got these backwards.
2013-05-30 15:21:54 -07:00
Andrzej Kapolka
826ef33d4b
Reverse angles for mirror mode.
2013-05-30 15:20:20 -07:00
Andrzej Kapolka
3f6cf08b97
Removed remaining Orientation bits (and class itself), enforce limits on
...
head yaw/pitch/roll.
2013-05-30 15:15:12 -07:00
Andrzej Kapolka
e2ec8245b0
Rather than adding Euler angles, compose quaternions for gyros.
2013-05-30 14:56:12 -07:00
Andrzej Kapolka
f447230d26
Use body orientation, not head orientation, for mirror mode.
2013-05-30 14:14:01 -07:00
Geenz
0a3dbcd675
Removed unused readYaw variable.
2013-05-30 17:00:32 -04:00
Geenz
0dda2b88b5
Merge branch 'master' of https://github.com/worklist/hifi into 19308
...
Conflicts:
interface/src/Avatar.cpp - resolved; added avatarRotation setting that's interpreted as a vec3
2013-05-30 16:58:48 -04:00
Andrzej Kapolka
bcd3833898
Align chat with full camera rotation (not just yaw).
2013-05-30 13:46:53 -07:00
Geenz
fc5b93a77d
Merge branch 'master' of https://github.com/worklist/hifi into 19351
2013-05-30 16:24:36 -04:00
Andrzej Kapolka
28531fcae0
Added --local option to avatar-mixer for testing. Only update velocity,
...
acceleration, angular velocity, etc., for local avatar.
2013-05-30 12:33:05 -07:00
Andrzej Kapolka
342e19aa41
Save/restore the pitch and roll as well as the yaw.
2013-05-30 12:12:30 -07:00
Geenz
1eac57dd0c
#19351 - Atmosphere shaders should be handled per-pixel instead of per-vertex.
2013-05-30 15:02:11 -04:00
Geenz
78c3891c92
Merge commit '6d57324d0b9fce9d6a030123689bb499ed54c8ad' into 19308
2013-05-30 14:48:40 -04:00
Andrzej Kapolka
100d10dc9e
Offset camera fix, cleaner frustum transformation.
2013-05-30 11:08:33 -07:00
Andrzej Kapolka
3330b20232
More reformatting.
2013-05-30 10:33:45 -07:00
Andrzej Kapolka
fff9d1c372
Formatting.
2013-05-30 10:23:19 -07:00
Andrzej Kapolka
b502321b57
Moved gravity influence multiplier into constant, reduced.
2013-05-30 10:00:52 -07:00
Andrzej Kapolka
021dce72be
Moved direction vectors to AvatarData, made them align with OpenGL view space
...
(to avoid the 180 degree rotations).
2013-05-30 09:55:34 -07:00
Andrzej Kapolka
9b301eb235
Merge branch 'master' of https://github.com/worklist/hifi into reorient
...
Conflicts:
interface/src/Avatar.cpp
2013-05-29 19:13:18 -07:00
Andrzej Kapolka
d6855b6430
Massive changes to orientations: use quaternions rather than Orientation
...
class.
2013-05-29 19:05:33 -07:00
Jeffrey Ventrella
d839312cd6
testing avatar touch
2013-05-29 17:28:44 -07:00
Jeffrey Ventrella
88ff0ea7aa
merge
2013-05-29 16:54:15 -07:00
Jeffrey Ventrella
4c7d75b39e
testing avatar touch
2013-05-29 16:52:48 -07:00
Geenz
f0d7b47c37
Merge branch 'master' of https://github.com/worklist/hifi into 19308
2013-05-29 19:47:54 -04:00
birarda
73168af4d1
Merge pull request #458 from birarda/master
...
move the mouth out farther in front of the face
2013-05-29 16:38:35 -07:00
Stephen Birarda
089dc3669d
push the mouth out in front of the face
2013-05-29 16:37:40 -07:00
Jeffrey Ventrella
f7a0e8018a
Merge remote-tracking branch 'upstream/master'
2013-05-29 16:15:16 -07:00
Jeffrey Ventrella
63434da23c
testing avatar touch
2013-05-29 16:14:55 -07:00
birarda
64d02f5f5f
Merge pull request #457 from birarda/master
...
make it harder to quit accidentally
2013-05-29 16:06:40 -07:00
Stephen Birarda
b0a8de818d
make quit CMD-Q instead of just Q
2013-05-29 16:05:03 -07:00
Jeffrey Ventrella
5750adf6fd
test
2013-05-29 15:53:47 -07:00
Stephen Birarda
02333644dc
one line fix in AvatarTouch
2013-05-29 15:31:18 -07:00
Jeffrey Ventrella
72688d86ca
Merge remote-tracking branch 'upstream/master'
2013-05-29 15:25:05 -07:00
Jeffrey Ventrella
66c7da6552
simplify avatar proximity check for 1p transition
2013-05-29 15:24:37 -07:00
ZappoMan
46c6f2f9b5
latest copy paste
2013-05-29 15:02:28 -07:00
Geenz
c33d2ee25e
Coding standard cleanup based upon ZappoMan's suggestions.
2013-05-29 16:46:47 -04:00
ZappoMan
c70ade0cc1
temporary hack fix to not discarding voxels
2013-05-29 12:14:45 -07:00
ZappoMan
377fb1e936
latest copy and paste
2013-05-29 12:06:58 -07:00
Jeffrey Ventrella
ab1c00dac6
Merge remote-tracking branch 'upstream/master'
2013-05-29 11:51:34 -07:00
Jeffrey Ventrella
e34193f1d7
increased hand motion sensitivity
2013-05-29 11:51:16 -07:00
ZappoMan
408fef0de8
Merge pull request #450 from birarda/master
...
make audio echo a menu option instead of forcing it with the mirror mode
2013-05-29 11:47:38 -07:00
Stephen Birarda
b6a0662c98
inline the shouldEchoAudio
2013-05-29 11:47:02 -07:00
Jeffrey Ventrella
ab3b0c8aa3
alpha
2013-05-29 11:43:42 -07:00
Stephen Birarda
a5a30efec9
CR fixes
2013-05-29 11:42:10 -07:00
Jeffrey Ventrella
350bd878fc
fix
2013-05-29 11:39:53 -07:00
Stephen Birarda
5d74a865e8
make audio echo a menu option instead of forcing with mirror
2013-05-29 11:35:32 -07:00
Jeffrey Ventrella
39805db040
Merge remote-tracking branch 'upstream/master'
2013-05-29 11:27:36 -07:00
Jeffrey Ventrella
39499e4a92
fix to head transparency
2013-05-29 11:26:06 -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
Jeffrey Ventrella
31ff768363
fixed some glitches in avatar render alpha transition between 3p and 1p
2013-05-29 08:30:14 -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
d1d2e75143
first cut at export and import of voxels
2013-05-28 19:00:02 -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
e4c0aeb9a0
added AVATAR_FACING_THRESHOLD to avatarTouch
2013-05-28 18:15:29 -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
Stephen Birarda
65f10cb99a
fix the enum in AABox, fix a warning in Head
2013-05-28 16:26:18 -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
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
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
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
Jeffrey Ventrella
2b31e79a0b
cleanup
2013-05-26 15:23:44 -07:00
Jeffrey Ventrella
883d21a5e4
added facing other av requirement for camera shift to 1p; improved ease-in/out for camera mode shift; did some clean up on the camera code
2013-05-26 15:17:58 -07:00
Jeffrey Ventrella
622863dbf1
Merge remote-tracking branch 'upstream/master'
2013-05-26 10:19:02 -07:00
Jeffrey Ventrella
9f7e05d407
integrated Philip's mohawk colors into my hair code and added a switch to test each version
2013-05-26 10:18:35 -07:00
Philip Rosedale
7aebbe3047
Merge pull request #434 from ZappoMan/voxel_animation
...
Improve "Delta Sending" mode..
2013-05-26 09:45:54 -07:00
Andrzej Kapolka
70b25fd6c4
Sphere/box collisions for voxels, various utility functions.
2013-05-25 19:59:07 -07:00
ZappoMan
77e5fbb590
Merge pull request #427 from birarda/oculus
...
go into oculus mode when connected, fix the yaw pull
2013-05-25 15:38:20 -07:00
ZappoMan
1a2921e3e8
Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation
2013-05-25 15:32:12 -07:00
ZappoMan
60f2b9a438
removed debug
2013-05-25 15:31:28 -07:00
ZappoMan
f6863081f9
Fix Delta Sending mode by not culling out of view voxels until we STOP moving
...
- added isViewChanging() which determines if the view is currently changing
- made hasViewChanged() report false UNTIL we've stopped moving
- changed setupNewVoxelsForDrawing() to only call removeOutOfView() if we're not moving
2013-05-25 15:29:23 -07:00
Jeffrey Ventrella
1e4771fe27
fix
2013-05-24 18:05:14 -07:00
Jeffrey Ventrella
8c24477a24
Merge remote-tracking branch 'upstream/master'
2013-05-24 18:01:47 -07:00
Jeffrey Ventrella
0c2c90b84d
cleanup
2013-05-24 18:01:25 -07:00
Freddy
6a4bcf32fa
Code review fixes
2013-05-24 17:58:31 -07:00
Freddy
30e951578e
procedural voxel create/delete noises
2013-05-24 17:27:56 -07:00
Jeffrey Ventrella
28f3af4ea5
Merge remote-tracking branch 'upstream/master'
2013-05-24 17:13:10 -07:00
Jeffrey Ventrella
56438435c1
made mouth conform to the head sphere
2013-05-24 17:12:14 -07:00
birarda
82f5e0a3b1
Merge pull request #426 from PhilipRosedale/master
...
big ground plane
2013-05-24 16:37:53 -07:00
Jeffrey Ventrella
6634ad2ed2
thingy
2013-05-24 16:31:17 -07:00
Stephen Birarda
a8b08647d0
require that crotch grabbing be explicit, not implicit
2013-05-24 16:18:36 -07:00
Stephen Birarda
65168e6aec
add a yaw offset to the oculus so it can pull body
2013-05-24 15:23:25 -07:00
Philip Rosedale
608a4f71bf
ground surface is 20 meters across. play on!
2013-05-24 14:51:06 -07:00
Philip Rosedale
995fbcf4f9
mohawk also follows body pitch when accelerating
2013-05-24 14:46:26 -07:00
Philip Rosedale
d796956a96
fix per review
2013-05-24 14:32:56 -07:00
Philip Rosedale
9baf087c9a
Avatar renders right arm in 1P mode
2013-05-24 14:29:26 -07:00
Philip Rosedale
31e41260c1
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-24 14:17:44 -07:00
Philip Rosedale
f5c0f84d27
Mohawk is different/stable for each person, and rotates correctly with head
2013-05-24 14:15:53 -07:00
Stephen Birarda
d12bc85376
go directly into oculus mode when the oculus is connected
2013-05-24 14:05:22 -07:00
Philip Rosedale
cb7381fcd1
incremental fix rotation
2013-05-24 12:33:05 -07:00
Philip Rosedale
360c9c8ab1
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-24 12:30:12 -07:00
Philip Rosedale
dc9b2e33b5
Fixing mohawk orientation
2013-05-24 12:30:05 -07:00
Stephen Birarda
81307939d4
Merge remote-tracking branch 'upstream/master' into owner-pointers
2013-05-24 12:23:12 -07:00
Stephen Birarda
59a6016f4b
use a NULL default for owningAvatar to simplify constructors
2013-05-24 12:18:38 -07:00
ZappoMan
0a1a86ca94
Merge pull request #418 from PhilipRosedale/master
...
More stable gyro averaging
2013-05-24 12:18:02 -07:00
Stephen Birarda
49b483ef53
maintain a pointer to owning avatar from HeadData
2013-05-24 12:17:48 -07:00
Stephen Birarda
36892da488
keep a pointer to owning agent in AgentData
2013-05-24 12:17:34 -07:00
ZappoMan
8560e42357
fix issue with duplicate VBO slots
2013-05-24 12:08:25 -07:00
Philip Rosedale
8b5901d904
simplified per stephens code review
2013-05-24 12:04:17 -07:00
Jeffrey Ventrella
51ddf40ffe
cleaned up hair code
2013-05-24 11:54:55 -07:00
Philip Rosedale
17c898c151
Long term averaging of the gyros for better stability
2013-05-24 11:33:00 -07:00
Philip Rosedale
59ac5ebd66
Head will always render when body does - no decapitation
2013-05-24 11:07:19 -07:00
Philip Rosedale
f961a40d1c
Chat message height doubled to clear mohawk
2013-05-24 10:55:26 -07:00
birarda
05ad7309a1
Merge pull request #411 from ey6es/master
...
Fix for starfield rendering on Oculus.
2013-05-24 10:14:31 -07:00
Philip Rosedale
bf94c88bcc
Fixes per review
2013-05-24 10:12:50 -07:00
Philip Rosedale
95e73afc78
Added the avatar mohawk
2013-05-24 00:16:52 -07:00
Jeffrey Ventrella
b74ceae61a
added avatar hair
2013-05-23 22:52:43 -07:00
Andrzej Kapolka
add84b2f39
Hide the cursor when in fullscreen Oculus mode.
2013-05-23 17:58:04 -07:00
Andrzej Kapolka
9be4f06e9a
Disable voxel textures by default.
2013-05-23 17:32:43 -07:00
Andrzej Kapolka
514c12c7fc
Merge branch 'master' of https://github.com/worklist/hifi
...
Conflicts:
interface/src/Application.cpp
2013-05-23 15:39:04 -07:00
Andrzej Kapolka
9b433c974c
Fix for starfield rendering on Oculus: put inter-pupil translation in
...
modelview matrix where it belongs, don't reset perspective projection for
starfield.
2013-05-23 15:35:41 -07:00
Stephen Birarda
b673715aa2
remove the no longer in use AvatarRenderer
2013-05-23 15:18:32 -07:00
Philip Rosedale
37cb914891
You can reset start location with 'G'
2013-05-23 15:02:32 -07:00
Philip Rosedale
235cfc8ab2
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-23 12:33:39 -07:00
Philip Rosedale
32d2418b7a
Added display head mouse option (default off) and all camera modes follow head gyros the same way.
2013-05-23 12:33:26 -07:00
ZappoMan
089d8d525e
Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation
2013-05-23 12:20:34 -07:00
ZappoMan
6ec61996c9
Merge pull request #405 from PhilipRosedale/master
...
Chat in right place above head, not body, tweaks to sensors, reset behavior, gyro pitch back.
2013-05-23 12:19:43 -07:00
Philip Rosedale
eb15aa602c
Added amplification of gyro rates when applying to head, for more sensitivity, and to allow easily looking to one side and another
2013-05-23 12:17:24 -07:00
ZappoMan
473665fb4a
Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation
2013-05-23 12:16:29 -07:00
ZappoMan
6e5ed6435b
added shortcut key to log menu
2013-05-23 12:06:59 -07:00
Philip Rosedale
7a0ea8bd59
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-23 11:48:18 -07:00
Philip Rosedale
8fec96319c
Merge pull request #403 from Ventrella/master
...
added effect of avatars floating above the ground with knees bent slightly
2013-05-23 11:48:00 -07:00
Philip Rosedale
be1fae5958
Move head back to center when moving
2013-05-23 11:37:27 -07:00
Philip Rosedale
85ea48e43a
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-23 11:26:26 -07:00
Philip Rosedale
86e3e25663
removed commented line, formatting
2013-05-23 11:26:14 -07:00
Andrzej Kapolka
672f4de496
Avoid colliding with gravityless environments.
2013-05-23 10:36:28 -07:00
Andrzej Kapolka
34b526f15c
Restore the original floor behavior.
2013-05-23 10:32:12 -07:00
Jeffrey Ventrella
649fb72556
Merge remote-tracking branch 'upstream/master'
2013-05-23 10:15:18 -07:00
Jeffrey Ventrella
77324ebb46
made avatars appear to float above the ground
2013-05-23 10:14:46 -07:00
Philip Rosedale
c56509e5a2
Re-enabled pitch gyro look in first person, start location is now not reset on sensor reset
2013-05-23 09:30:36 -07:00
Philip Rosedale
6b3f35ef19
Merge pull request #393 from ey6es/master
...
Put all environment data in the same packet and only send it off about once a second.
2013-05-22 21:11:22 -07:00
Stephen Birarda
120c835004
fix head mouse
2013-05-22 19:46:33 -07:00
Philip Rosedale
5b3ac504c4
Updated merge conflicts
2013-05-22 19:43:11 -07:00
Philip Rosedale
f39fade4c7
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-22 19:40:13 -07:00
Philip Rosedale
22b534cd8e
Fixed headmouse
2013-05-22 19:39:37 -07:00
Stephen Birarda
d7a1cc6ea8
correct the sign for yaw and roll for invensense serial data
2013-05-22 19:38:17 -07:00
Stephen Birarda
3e192cda9b
correct rendering for first-person for oculus
2013-05-22 19:15:52 -07:00
birarda
3e16e6a36c
Merge pull request #398 from birarda/master
...
correct sign of yaw for oculus
2013-05-22 18:57:06 -07:00
Stephen Birarda
997a10c981
correct the sign of yaw for oculus
2013-05-22 18:56:38 -07:00
Jeffrey Ventrella
83c12ae9af
etc
2013-05-22 18:31:22 -07:00
Jeffrey Ventrella
b7613497eb
fixed pitch yaw (not roll)
2013-05-22 18:14:18 -07:00
Jeffrey Ventrella
2f943b697a
cleanup
2013-05-22 17:27:48 -07:00
Jeffrey Ventrella
549d3a3671
Merge remote-tracking branch 'upstream/master'
2013-05-22 17:25:06 -07:00
Jeffrey Ventrella
8b49cfbf93
added back transitions to first person
2013-05-22 17:24:46 -07:00
Andrzej Kapolka
a68c8c6389
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-22 17:11:03 -07:00
Andrzej Kapolka
629c7b0146
Send all environment data in the same packet and only send it about once a
...
second.
2013-05-22 17:09:35 -07:00
ZappoMan
da39f28211
Merge pull request #392 from birarda/oculus
...
fix broken head rotation set based on copy return
2013-05-22 16:51:13 -07:00
Stephen Birarda
9657265c24
remove a debug line from setHeadFromGyros
2013-05-22 16:50:17 -07:00
Stephen Birarda
a1b556d6a2
space out if
2013-05-22 16:49:26 -07:00
Stephen Birarda
4738fc888b
return Avatar Head by reference so setters actually do something
2013-05-22 16:43:41 -07:00
Andrzej Kapolka
b6e78064d8
Disable the righting for now, as well as the "floor" (whose presence makes us
...
slide, since the gravity vector isn't pointing straight down).
2013-05-22 16:29:13 -07:00
Andrzej Kapolka
96fdc015c5
Fix for OS X; the structure wasn't being zero-initialized as I expected.
2013-05-22 16:12:14 -07:00
Jeffrey Ventrella
4940a6ae9a
Merge remote-tracking branch 'upstream/master'
2013-05-22 15:51:03 -07:00
Jeffrey Ventrella
0b014c5635
cleaned up some stuff
2013-05-22 15:50:36 -07:00
Philip Rosedale
56a0471e5f
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-22 15:45:21 -07:00