Atlante45
|
c2e2682eff
|
Fix "Reset Settings" window poping up every time
|
2017-05-19 10:50:23 -07:00 |
|
Chris Collins
|
76a025aade
|
Merge pull request #10507 from Atlante45/merge-back
Merge Stable back into master
|
2017-05-19 06:58:10 -07:00 |
|
Atlante45
|
ee9b98ffd7
|
Merge branch 'stable' of https://github.com/highfidelity/hifi
|
2017-05-18 17:11:45 -07:00 |
|
Zach Fox
|
48200fbd07
|
Merge pull request #10501 from zfox23/snapshots_disableWhileProcessing
Prevent another GIF from being captured while one is processing
|
2017-05-18 15:53:57 -07:00 |
|
Ryan Huffman
|
72af4219b8
|
Merge pull request #10499 from huffman/fix/ktx-progressive-image-size
Fix ktx image size in progrssively loaded cubemaps
|
2017-05-18 15:26:52 -07:00 |
|
Chris Collins
|
625bcdfd7e
|
Merge pull request #10498 from highfidelity/RC-39.3-HOTFIX
Build 39.3 Hotfix for T-Pose avatars
|
2017-05-18 14:57:57 -07:00 |
|
Zach Fox
|
8efac1e7f1
|
Prevent another GIF from being captured while one is processing
|
2017-05-18 14:30:08 -07:00 |
|
Zach Pomerantz
|
c5a0a1af2f
|
Merge pull request #10429 from zzmp/audio/close-device
Close audio device when switching outputs
|
2017-05-18 17:18:53 -04:00 |
|
Clément Brisset
|
55b5f08714
|
Merge pull request #10465 from Atlante45/fix/domain-settings
Fix domain settings not getting cleared on re-assignment
|
2017-05-18 14:16:35 -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 |
|
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 |
|
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 |
|
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 |
|
Zach Pomerantz
|
e8ab780899
|
include details in critical variantMap parsing error
|
2017-05-17 21:32:13 -04: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 |
|
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
|
ab3ea65d54
|
Simply add protections when accessing the mip bytes of a texture when provided from a KtxStorage
|
2017-05-17 12:36:12 -07:00 |
|
Atlante45
|
0d77977936
|
Enable Map/List storage in the settings
|
2017-05-17 12:11:15 -07:00 |
|
Seth Alves
|
9b1fe60b7c
|
suppress frequest log-spam from constraints.
|
2017-05-17 11:55:31 -07:00 |
|
Seth Alves
|
3570bd905e
|
update for spring to tractor name-change
|
2017-05-17 11:55:23 -07:00 |
|
Zach Fox
|
bb3f9e9033
|
Merge pull request #10479 from zfox23/PAL_ImproveDisplayNameField
Improve robustness of display name focus in PAL
|
2017-05-17 11:47:57 -07:00 |
|
Seth Alves
|
8a88b30da7
|
Merge pull request #10468 from AndrewMeadows/cleanup-actions
cleanup Actions and Constraints part-1
|
2017-05-17 11:33:53 -07:00 |
|
Andrew Meadows
|
82c7188376
|
Merge pull request #10470 from huffman/fix/ktx-cubemaps
Fix progressive loading of KTX cubemaps
|
2017-05-17 11:23:24 -07:00 |
|
Andrew Meadows
|
97ed719506
|
cap scripted linear and angular velocity inputs
|
2017-05-17 10:40:45 -07:00 |
|
Thijs Wenker
|
2d6c6af37f
|
Merge pull request #10381 from Triplelexx/21297
DNM 21297 - Edit.js: Make the default particle system attractive
|
2017-05-17 15:55:40 +02:00 |
|
Triplelexx
|
c678fd67ed
|
change default particle texture to production
|
2017-05-17 14:52:11 +01:00 |
|
Thijs Wenker
|
278bc610d4
|
Merge pull request #10466 from misslivirose/feat-find-entities-by-type
Add function findEntitiesByType EntityScriptingInterface
|
2017-05-17 15:06:04 +02:00 |
|
Brad Hefta-Gaub
|
764bfe94f5
|
Merge pull request #10336 from trentpolack/feature/snap-turn-smoothing-21270
Feature/snap turn smoothing 21270
|
2017-05-16 21:05:38 -07:00 |
|