Roxanne Skelly
265bafecba
More CR Fixes
2018-10-04 15:36:31 -07:00
Dante Ruiz
651f37aceb
Merge branch 'interstitialMerged' of github.com:wayne-chen/hifi into interstitialMerged
2018-10-04 15:01:39 -07:00
Dante Ruiz
bda9735b5d
fix loading progress
2018-10-04 15:01:16 -07:00
Wayne Chen
2e3566bc73
hide overlays after clicking on them
2018-10-04 14:24:43 -07:00
John Conklin II
afe6d97b00
Merge pull request #14100 from danteruiz/soft-entities-updates
...
update soft entities and fix deadlock from qml.
2018-10-04 13:33:34 -07:00
John Conklin II
84178faee3
Merge pull request #14137 from hyperlogic/bug-fix/glitchy-movement-for-avatars
...
Bug fix for rotation culling in AvatarData::toByteArray()
2018-10-04 13:12:28 -07:00
divya
7aa715c383
Merge pull request #14141 from luiscuenca/transitFirstPacketFix
...
Fix avatars transit on domain enter
2018-10-04 13:08:59 -07:00
John Conklin II
48242534df
Merge pull request #14000 from sabrina-shanman/stt_parenting2
...
New Pick Parenting for Ray Picks and Parabola Picks
2018-10-04 12:39:45 -07:00
Roxanne Skelly
f74d9ada20
Code review fix
2018-10-04 12:38:34 -07:00
Dante Ruiz
613a6ab8cd
removing unneeded code
2018-10-04 12:18:18 -07:00
sam gateau
ddbaa96fd1
Merge branch 'black-bis' of github.com:samcake/hifi into black-bis
2018-10-04 11:49:36 -07:00
sam gateau
8a05cc2ede
FIx the bad world position evaluation in the new all in one call
2018-10-04 11:49:11 -07:00
Roxanne Skelly
442171e007
Merge branch 'master' of https://github.com/highfidelity/hifi into sysTraySetup
2018-10-04 11:33:39 -07:00
Roxanne Skelly
ee3fd81070
Code review fixes from birarda
2018-10-04 11:33:01 -07:00
SamGondelman
4024f2a180
fix various resourcecache bugs
2018-10-04 11:29:22 -07:00
Wayne Chen
c785efec84
removing extraneous bool
2018-10-04 10:56:04 -07:00
Wayne Chen
0a7102b4d3
Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged
2018-10-04 08:59:26 -07:00
NissimHadar
ed94ffa384
Can extract filename after selecting zipped results and temporary folder.
2018-10-04 08:54:34 -07:00
Wayne Chen
22a9030fb5
hiding text overlays when out of error state
2018-10-03 17:54:55 -07:00
Wayne Chen
d6af09ca62
ignoring entities in interstitial/saving address on 404 error
2018-10-03 17:40:42 -07:00
NissimHadar
2cb0b2ea8d
WIP - adding AWS interface.
2018-10-03 17:19:45 -07:00
David Rowe
3bc1c2963d
Fix HUD laser while in Shapes app
2018-10-04 13:15:33 +13:00
Sam Gondelman
4e96c3297b
Merge branch 'master' into scriptvec3
2018-10-03 17:14:15 -07:00
luiscuenca
a05e493e06
Long distance avatars should not be new
2018-10-03 17:09:51 -07:00
NissimHadar
b962212ca0
Enable repo fields in 'Create'
2018-10-03 16:52:00 -07:00
NissimHadar
318e83e500
Disable "RunNow" button while running tests
...
Check if Interface test scripts ran to completion.
2018-10-03 16:45:01 -07:00
NissimHadar
5c7b4338b6
Change threshold from 0.95 to 0.935
2018-10-03 16:43:09 -07:00
NissimHadar
ce4233ba21
Removed erroneous underscore
2018-10-03 16:42:02 -07:00
luiscuenca
bb98457d09
Fix avatars transit on domain enter
2018-10-03 16:23:09 -07:00
Dante Ruiz
676293c880
trying another fix
2018-10-03 16:19:47 -07:00
Sam
87efeb1a70
make sure that we compile, dah
2018-10-03 16:15:07 -07:00
sam gateau
81e0d5ced0
Merge branch 'black-bis' of github.com:samcake/hifi into black-bis
2018-10-03 16:03:33 -07:00
sam gateau
702d26d2bd
Addressing the bug on Mac AMD
2018-10-03 16:03:09 -07:00
Roxanne Skelly
2876338a97
Display up to 30 submenus for GOTO
2018-10-03 15:35:19 -07:00
Wayne Chen
f875bfd0d8
Merge pull request #6 from danteruiz/revert-loagic-chnage
...
Reverting bad logic
2018-10-03 15:32:58 -07:00
Dante Ruiz
b46d2319b1
fix spelling error
2018-10-03 15:22:53 -07:00
Dante Ruiz
78268001c4
reverting logic change
2018-10-03 15:13:42 -07:00
David Rowe
209d1535c2
Fix HUD laser while in Create app
2018-10-04 10:42:17 +13:00
NissimHadar
f0aa11605e
Merge branch 'master' of https://github.com/highfidelity/hifi into addDailyTests
2018-10-03 13:55:11 -07:00
Roxanne Skelly
397fe2a534
Code Review Fixes
2018-10-03 13:53:46 -07:00
Dante Ruiz
5734c24af4
another PR fix
2018-10-03 13:52:40 -07:00
Roxanne Skelly
79b11296f1
Checkpoint sys tray submenus
2018-10-03 13:45:39 -07:00
Sam Gateau
b1883ac1c4
Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis
2018-10-03 13:43:48 -07:00
John Conklin II
4d7b2bb429
Merge pull request #14113 from Atlante45/feat/audio-mixer-throttle-equation
...
Audio Mixer Scaling
2018-10-03 13:17:28 -07:00
Anthony Thibault
c0ae95f853
Bug fix for rotation culling in AvatarData::toByteArray()
...
The commit 5a0de0f103
inadvertently introduced a regression in how the AvatarMixer and clients encode AvatarData packets.
When encoding packets that with the cullSmallChanges flag set to true, we only include rotations that have changed significantly from the previous packet.
A bug was introduced that incorrectly preformed the comparison to detect changed rotations, this needs to handle the case when
two quaternions are almost equal but have negative signs. Previously, this was preformed with an absolute value after the 4-component dot product.
In commit 5a0de0f103
, this absolute value was removed, causing the culling to happen much more frequently.
This PR re-introduces that absolute value.
2018-10-03 12:54:49 -07:00
Sam Gateau
c194e795ac
Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis
2018-10-03 12:12:15 -07:00
sabrina-shanman
2ef85dfdba
Merge branch 'master' into stt_parenting2
2018-10-03 11:39:00 -07:00
John Conklin II
4805d3564a
Merge pull request #14075 from ctrlaltdavid/M18586
...
Teleport with play area
2018-10-03 11:02:33 -07:00
Thijs Wenker
66c533b557
move export selection button to bottom of the list
2018-10-03 19:35:03 +02:00
Wayne Chen
efeb598495
fixing bug with hover overlay
2018-10-03 10:12:07 -07:00