Commit graph

1150 commits

Author SHA1 Message Date
Zach Fox
5ea3c5dffd Skipped this line 2017-02-01 18:13:24 -08:00
Zach Fox
4af5118654 First pass 2017-02-01 17:04:21 -08:00
Seth Alves
ac475300f6 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-30 08:15:29 -08:00
Thijs Wenker
a2da1e3dc1 Merge branch 'master' into fix-ac-playback-audio 2017-01-27 21:00:57 +01:00
Seth Alves
fa61bbe2a6 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-26 18:21:39 -08:00
Thijs Wenker
cdc0f3ddd2 - make AC recording audio play with right encoding
- spelling fix
2017-01-27 01:19:11 +01:00
ZappoMan
af426063ac fix bad merge 2017-01-26 15:19:25 -08:00
ZappoMan
4c80422a73 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-26 14:34:58 -08:00
Seth Alves
db38503d57 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-26 13:48:59 -08:00
Andrew Meadows
b8afc87ad9 remove cruft 2017-01-26 08:35:26 -08:00
Andrew Meadows
e65d9309b3 remove cruft: Avatar::setShouldDie() 2017-01-26 08:35:26 -08:00
Andrew Meadows
88bf126168 remove old avatar culling and LOD logic 2017-01-26 08:35:25 -08:00
ZappoMan
1309af6d7a CR feedback 2017-01-24 12:47:47 -08:00
ZappoMan
44b8a57ed3 more CR feedback 2017-01-24 12:18:33 -08:00
ZappoMan
8b662647bd CR feedback 2017-01-24 12:01:57 -08:00
ZappoMan
0655b47dd7 fix warnings 2017-01-23 16:44:55 -08:00
ZappoMan
6801099cd9 more cleanup 2017-01-23 16:03:07 -08:00
ZappoMan
81b5a3c585 more cleanup 2017-01-23 15:12:54 -08:00
ZappoMan
5f9f051c3c more tweaks 2017-01-23 15:01:50 -08:00
ZappoMan
e0bad95257 some cleanup 2017-01-23 13:18:55 -08:00
ZappoMan
29fff2e556 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-23 13:09:59 -08:00
ZappoMan
292d472a59 checkpoint - got first cut at distance based rotation tolerance working 2017-01-23 13:06:29 -08:00
Seth Alves
b57803057d Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-18 06:38:44 -08:00
ZappoMan
6e5e9d3492 more work 2017-01-16 18:28:01 -08:00
Zach Fox
e98a40c30e Does this work? 2017-01-16 14:43:30 -08:00
Zach Fox
3b56f46206 Style changes 2017-01-16 13:18:24 -08:00
Zach Fox
32e330320e Cleanup after rebase 2017-01-16 11:26:57 -08:00
Zach Fox
2f176f50fa Another checkpoint 2017-01-16 10:44:54 -08:00
ZappoMan
c9c311e275 checkpoint for distance joints 2017-01-15 11:47:48 -08:00
ZappoMan
3a9a6e8283 local position tweaks 2017-01-13 09:09:29 -08:00
ZappoMan
ee4df20df3 duh 2017-01-12 19:27:28 -08:00
ZappoMan
2e48444422 hack 2017-01-12 19:03:58 -08:00
ZappoMan
aed1b69ee0 make the avatar bounding box be avatar local and only change when it actually changes 2017-01-12 17:19:06 -08:00
ZappoMan
dd85cd9558 one more shot at kens way 2017-01-12 08:48:33 -08:00
ZappoMan
0e600fc8fd more audio loudness tweaks 2017-01-12 07:56:09 -08:00
ZappoMan
fe06dfdca7 tweak audioLoudness packing 2017-01-11 18:58:43 -08:00
ZappoMan
0661531e3a try another version of an 8bit audio loudness 2017-01-11 17:51:12 -08:00
ZappoMan
407ad633e0 more cleanup use kens 1 byte audio gain 2017-01-11 11:01:49 -08:00
Anthony J. Thibault
9db6806026 In desktop mode, tablet is in front of camera.
* added a new fauxJointIndex for the camera. CAMERA_MATRIX_INDEX = -7
  this can be used to attach objects to the camera.
* WebTablet.js has been changed to detect when entering and exiting HMD mode
  to move the tablet appropriately.

There's a known bug with the tablet entity position lagging the camera by one frame.
2017-01-10 11:31:45 -08:00
ZappoMan
182edf0e9a change avatarOrientation to use SixByteQuat packing 2017-01-10 09:41:11 -08:00
ZappoMan
8bbfb51419 some cleanup 2017-01-10 08:37:01 -08:00
ZappoMan
eadb1758f9 adding some rate debugging 2017-01-09 17:07:47 -08:00
ZappoMan
13198fd949 add datarate 2017-01-09 13:57:59 -08:00
Brad Hefta-Gaub
ef7b9bfde0 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-09 10:07:05 -08:00
Brad Hefta-Gaub
785582057e more comments 2017-01-08 20:35:52 -08:00
Brad Hefta-Gaub
251495978c more work on delta sending 2017-01-05 19:46:19 -08:00
Zach Fox
495925a017 This behavior was harder to change than expected... 2017-01-05 16:58:32 -08:00
Brad Hefta-Gaub
5acae04420 fix some warnings 2017-01-04 19:40:03 -08:00
Brad Hefta-Gaub
acca9dbe87 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
Conflicts:
	libraries/networking/src/udt/PacketHeaders.cpp
	libraries/networking/src/udt/PacketHeaders.h
2017-01-04 18:07:22 -08:00
Brad Hefta-Gaub
99f180f945 more hacking 2016-12-29 08:16:19 -08:00