Seth Alves
|
f35796259b
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-imported-children-querybox
|
2017-05-18 13:20:50 -07:00 |
|
Seth Alves
|
ec02887ae6
|
attempt to get imported entities into the correct octree-element
|
2017-05-18 13:20:44 -07:00 |
|
Atlante45
|
9044cb40d5
|
Compress Default Skybox with BC7
|
2017-05-18 13:13:40 -07:00 |
|
Atlante45
|
a8b1a29a4a
|
Add support for BC7 compression
|
2017-05-18 13:11:41 -07:00 |
|
samcake
|
9c154122d3
|
Introdicing the format factor and merging with master becasue of protocol change...
|
2017-05-18 13:08:13 -07:00 |
|
samcake
|
396924b4a5
|
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
|
2017-05-18 13:06:05 -07:00 |
|
David Kelly
|
df5928c04a
|
remove clockSkew, reference new version for Avatar packets
|
2017-05-18 11:47:53 -07:00 |
|
David Kelly
|
1fcf3b3a5f
|
Switch from timestamp to sequence id for avatar identity
|
2017-05-18 11:47:44 -07:00 |
|
Zach Fox
|
8213a1b280
|
First pass - checking performance
|
2017-05-18 11:47:27 -07:00 |
|
howard-stearns
|
7ec073dce4
|
Ensure avatar identity packet at mixer.
|
2017-05-18 11:47:07 -07:00 |
|
Ryan Huffman
|
6d2d838510
|
Fix ktx image size in progrssively loaded cubemaps
The size being written was the full image size (size of all faces), when
it should have been the face size.
|
2017-05-18 11:46:14 -07:00 |
|
Anthony J. Thibault
|
87adeb0565
|
apply flexCoeff to tip of joint chain as well.
|
2017-05-18 11:26:49 -07:00 |
|
Anthony J. Thibault
|
abe19310da
|
WIP: checkpoint of ik changes
|
2017-05-18 11:26:48 -07:00 |
|
Andrew Meadows
|
8d3285f733
|
verify _rig is valid in Model::deleteGeometry()
|
2017-05-18 11:11:50 -07:00 |
|
David Kelly
|
c2b140cc03
|
Merge pull request #10489 from davidkelly/dk/sequenceNumberForAvatarIdentity
Switch from timestamp to sequence id for avatar identity
|
2017-05-18 10:09:42 -07:00 |
|
samcake
|
2c6e10fbe1
|
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
|
2017-05-18 09:21:02 -07:00 |
|
Seth Alves
|
b8567e0550
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-imported-children-querybox
|
2017-05-18 09:10:58 -07:00 |
|
Dante Ruiz
|
90ddc16d09
|
add calibration data to filters
|
2017-05-18 17:07:28 +01:00 |
|
Brad Hefta-Gaub
|
fbc32e5ba1
|
Merge pull request #10485 from samcake/orange
Add protections when accessing the mip bytes of a texture when provided from a KtxStorage
|
2017-05-18 08:47:58 -07:00 |
|
Chris Collins
|
9dcb3a3845
|
Merge pull request #10495 from highfidelity/RC-39.2-Hotfix
Build 39.1 Hotfix for 30 second wifi check causing an issue with Audio
|
2017-05-18 05:39:44 -07:00 |
|
David Rowe
|
017f5f5781
|
Temporary fix for recordings not playing back properly
|
2017-05-18 16:54:32 +12:00 |
|
David Rowe
|
f6c1fa4213
|
Merge branch 'master' into 21359
|
2017-05-18 16:40:20 +12:00 |
|
Brad Hefta-Gaub
|
014fd710de
|
Merge pull request #10490 from Atlante45/feat/settings-map
Enable Map/List storage in the settings
|
2017-05-17 21:24:04 -07:00 |
|
Brad Hefta-Gaub
|
e0b264cfd5
|
Merge pull request #10494 from sethalves/fix-nana
fix nan
|
2017-05-17 21:22:17 -07:00 |
|
Stephen Birarda
|
00fb328f2f
|
set wireless scan interval to -1
|
2017-05-17 21:07:57 -07:00 |
|
Seth Alves
|
b05cb4af3b
|
fix nan
|
2017-05-17 20:51:34 -07:00 |
|
Zach Pomerantz
|
bbe0d76258
|
Merge pull request #10493 from zzmp/log/variant-parse-error
include details in critical variantMap parsing error
|
2017-05-17 22:07:25 -04:00 |
|
David Rowe
|
26e390fa89
|
Tidy code setting head orientation
|
2017-05-18 13:55:06 +12:00 |
|
Zach Pomerantz
|
e8ab780899
|
include details in critical variantMap parsing error
|
2017-05-17 21:32:13 -04:00 |
|
samcake
|
80b6fd65ae
|
Cleaning up counters and naming schemes...
|
2017-05-17 18:31:28 -07:00 |
|
David Rowe
|
f00232ab6d
|
Fix avatar eyelids and blinking in recording playback
Reinstates conditions to not calculate eye movements if face / eye
trackers are connected; they're considered connected for recording
playback.
|
2017-05-18 13:30:29 +12:00 |
|
David Rowe
|
223b1a858b
|
Fix avatar eye look-at in recording playback
|
2017-05-18 12:27:31 +12:00 |
|
Howard Stearns
|
95111d24b2
|
Merge branch 'master' into dk/sequenceNumberForAvatarIdentity
|
2017-05-17 17:09:47 -07:00 |
|
Brad Hefta-Gaub
|
c07eb3e45e
|
Merge pull request #10471 from hyperlogic/feature/ik-flex-coeff
Flex and weight IK tuning parameters
|
2017-05-17 16:48:50 -07:00 |
|
Seth Alves
|
0dc355cf86
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-imported-children-querybox
|
2017-05-17 16:43:50 -07:00 |
|
Seth Alves
|
d2f1cb9d8b
|
Merge branch 'fix-imported-children-querybox' of github.com:sethalves/hifi into fix-imported-children-querybox
|
2017-05-17 16:43:39 -07:00 |
|
Brad Hefta-Gaub
|
93f3b2df45
|
Merge pull request #10491 from birarda/bug/bearer-timeout
disable the bearer poll timeout
|
2017-05-17 16:24:17 -07:00 |
|
Anthony J. Thibault
|
0018224fef
|
moar warning fixes
|
2017-05-17 16:23:39 -07:00 |
|
Andrew Meadows
|
09433a93ba
|
Merge pull request #10477 from AndrewMeadows/correct-avatar-mass
More correct avatar mass
|
2017-05-17 16:22:06 -07:00 |
|
Brad Hefta-Gaub
|
0d3f7058ec
|
Merge pull request #10483 from AndrewMeadows/cap-velocities
cap scripted linear and angular velocity inputs
|
2017-05-17 16:15:42 -07:00 |
|
Stephen Birarda
|
2ac5fbf91d
|
set wireless scan interval to -1
|
2017-05-17 15:33:52 -07:00 |
|
Anthony J. Thibault
|
78dd30f656
|
macosx warning fix
|
2017-05-17 15:22:39 -07:00 |
|
Zach Fox
|
c5a5cad76d
|
Merge pull request #10487 from zfox23/removeExtraneousSendIdentity
Remove extraneous calls to sendIdentityPacket()
|
2017-05-17 15:20:09 -07:00 |
|
David Kelly
|
057718bde3
|
remove clockSkew, reference new version for Avatar packets
|
2017-05-17 15:14:56 -07:00 |
|
Howard Stearns
|
a09e625f78
|
Merge pull request #10486 from howard-stearns/ensure-identity-packet-at-mixer
Ensure avatar identity packet at mixer.
|
2017-05-17 14:43:07 -07:00 |
|
David Kelly
|
689a0b5bad
|
Switch from timestamp to sequence id for avatar identity
|
2017-05-17 14:22:36 -07:00 |
|
Zach Fox
|
d4752926b8
|
First pass - checking performance
|
2017-05-17 13:51:27 -07:00 |
|
howard-stearns
|
0f0ad11344
|
Ensure avatar identity packet at mixer.
|
2017-05-17 13:47:24 -07:00 |
|
Chris Collins
|
039fdc821f
|
Merge pull request #10484 from sethalves/fix-suppress-frequest-constraint-log-spam
Fix suppress frequest constraint log spam
|
2017-05-17 13:10:27 -07:00 |
|
samcake
|
b19b0007c8
|
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
|
2017-05-17 13:02:37 -07:00 |
|