Commit graph

77588 commits

Author SHA1 Message Date
Brad Davis
58abfb44c4 Globally disallow use of the camera or microphone by hosted web content 2019-03-31 11:14:29 -07:00
raveenajain
269b910d24 update variables, loops 2019-03-29 18:25:17 -07:00
Shannon Romano
6ccf16dfe5
Merge pull request #15288 from roxanneskelly/Case21726
Case 21726 - Domain lost recent entity edits upon restart
2019-03-29 17:06:31 -07:00
Shannon Romano
c5e7c63d38
Merge pull request #15289 from roxanneskelly/Case20499
Case 20499 - Scripts that use AppUI don't call `that.onClosed()` if the script is restarted while the app is open
2019-03-29 17:05:21 -07:00
Wayne Chen
c4cccc6ef7
fix opacity for containing mouse only 2019-03-29 17:04:44 -07:00
Shannon Romano
dbecf1f611
Merge pull request #15292 from thoys/fix/avatarTools/fbxCasing
Case 20625: On avatar project creation, the .fbx filter for selecting an FBX is case-sensitive.
2019-03-29 17:04:37 -07:00
Shannon Romano
53c7ade542
Merge pull request #15178 from amantley/fbxJointParentBug
Fix for FBX Root Being Given Non-Zero Parent
2019-03-29 17:02:02 -07:00
SamGondelman
8d2495ef7a vive coordinates in clip space 2019-03-29 16:24:04 -07:00
Wayne Chen
426ffe5a14
Fixing typo 2019-03-29 15:38:42 -07:00
danteruiz
db17f094da adding entities to fade out list; 2019-03-29 15:23:16 -07:00
Shannon Romano
f926298020
Merge pull request #15297 from NissimHadar/21984-fixNitpickCMake
Case 21988: Use place holder instead of RCC file.
2019-03-29 13:16:56 -07:00
Shannon Romano
df97f595f2
Merge pull request #15279 from kitely/allow-emails-with-plus-sign
case 21982: Allow logging-in with an email that contains a '+' sign
2019-03-29 13:04:11 -07:00
NissimHadar
4e4526fbb2 Use place holder instead of RCC file.
(cherry picked from commit 709515dd74)
2019-03-29 13:02:24 -07:00
NissimHadar
709515dd74 Use place holder instead of RCC file. 2019-03-29 11:48:15 -07:00
Sam Gondelman
968dbb825a
Merge pull request #15243 from SamGondelman/proceduralTime
Case 21876: New procedural uniforms for time, iEntityTime and iLocalCreatedTime
2019-03-29 11:35:41 -07:00
Shannon Romano
ec44f5fddf
Merge pull request #15156 from NissimHadar/21660-updateNitpickForQuest
Case 21660: unique command line to run Interface on Quest - v3.1.5
2019-03-29 11:09:36 -07:00
SamGondelman
33b3e2afac try to fix build errors? 2019-03-29 10:57:01 -07:00
Shannon Romano
c4925ddfa0
Merge pull request #15259 from SimonWalton-HiFi/avatar-hero-zone-improvements
Avatar hero zone improvements
2019-03-29 10:49:06 -07:00
Shannon Romano
ac0130d4c7
Merge pull request #15234 from SimonWalton-HiFi/clear-connection-on-add-node
When adding new Node clear any dangling Connection objects
2019-03-29 10:46:22 -07:00
Wayne Chen
2622408792 warn when muted only affects hmd 2019-03-29 10:45:40 -07:00
Shannon Romano
a83b90cdc6
Merge pull request #15044 from sethalves/lock-wearables
case 21149: add a button to Avatar panel to lock or unlock wearables; allow others to grab unlocked wearables
2019-03-29 10:41:21 -07:00
Wayne Chen
3c65b92ff5 moving text position higher 2019-03-29 10:41:16 -07:00
John Conklin II
56dde6e240
Merge pull request #15235 from Atlante45/fix/traits
Case 21108: Make traits easier to extend
2019-03-29 10:37:55 -07:00
Wayne Chen
248f9ba375 adding mute overlay back into HMD and have warn when muted disable in desktop 2019-03-29 10:32:13 -07:00
luiscuenca
a7c36c9505 Merge branch 'master' into kdopsRotOffsetFix 2019-03-29 10:29:30 -07:00
Ken Cooke
201d115cb6
Merge pull request #15274 from kencooke/audio-server-echo-fix
Case 21947: Fix the audio level of server echo
2019-03-29 10:12:37 -07:00
Ryan Huffman
bcb38b6626 Add damping to new dynamic entities in Create 2019-03-29 09:01:42 -07:00
Olivier Prat
7455ddb7ba Created Image class to encapsulate some transforms with QImage 2019-03-29 12:23:44 +01:00
raveenajain
b283bb303d jenkins warning fixes 2019-03-28 17:55:51 -07:00
Simon Walton
bc7fb10ab9 Fixes from review 2019-03-28 17:54:35 -07:00
Thijs Wenker
7e21a3f372 disable case sensitivity in file browsers (allow .fbx .fBx .FBX instead of only .fbx) 2019-03-29 01:48:57 +01:00
Thijs Wenker
687409b756 ignore case for .fbx file extension in AvatarDoctor 2019-03-29 01:46:57 +01:00
luiscuenca
bea45e67cb Fix multisphere scale, desyncronize visualization and support joint scaling 2019-03-28 17:38:17 -07:00
danteruiz
b9d04c6ebb adding entity to a faded list 2019-03-28 16:42:29 -07:00
Wayne Chen
3241d2f960 don't allow clicking on push to talk in MicBarApplication 2019-03-28 16:24:37 -07:00
Wayne Chen
f2b0e47c39 changing opacity 2019-03-28 16:19:35 -07:00
Roxanne Skelly
44b92c542b Case 20499 - Scripts that use AppUI don't call that.onClosed() if the
script is restarted while the app is open
2019-03-28 16:05:24 -07:00
raveenajain
5480c9f5ca skinning, skeleton for models, avatar 2019-03-28 15:27:49 -07:00
Roxanne Skelly
88b7687183 Case 21726 - Domain lost recent entity edits upon restart
When an entity server starts up, grabs the version of the models.json
file locally, and then queries the domain server for its copy of the
models.json file...iff the domain server version is newer.

There was a bug in this process in that the comparison was made between
the wrong version, specifically the 'file format version' which doesn't
change unless there was a protocol change...and not the data version,
which increments every time a change is made to a domain.

Therefore, the version of the models.json on the domain server was never
downloaded to the entity server, even when it was newer.

It would be newer if the entity server assignment was moved to a machine
with an old version of the models.json file, which was in fact the case
on distributed3 during this period of time.
2019-03-28 13:19:16 -07:00
NissimHadar
171aebd6aa Remove disabling of --url for Android. 2019-03-28 13:04:16 -07:00
NissimHadar
705e6432a7 Merge branch 'master' of github.com:highfidelity/hifi into 21660-updateNitpickForQuest 2019-03-28 12:46:36 -07:00
NissimHadar
d230fc86db CR comments. 2019-03-28 12:23:25 -07:00
Roxanne Skelly
73cf51182e
Merge pull request #15262 from roxanneskelly/Case20832
Case20832- Inventory app Login and Cancel buttons do not respond if user logs out while Inventory is open.
2019-03-28 12:01:24 -07:00
Ryan Huffman
7e805562ef Fix some URLs with query params not working with model baker
After talking with Sabrina, we decided that we could safely leave the
query param and fragment intact for a URL in the model baker.
2019-03-28 11:59:31 -07:00
danteruiz
04d9858f02 fixing remaining issues 2019-03-28 11:43:53 -07:00
Wayne Chen
8627a92f29 adding functions to update variables 2019-03-28 11:29:34 -07:00
David Back
57c3620587 update package 2019-03-28 11:28:14 -07:00
David Back
4ddbdbbb6c fix bone rule warnings 2019-03-28 11:27:47 -07:00
NissimHadar
de1c40e994 Changed version. 2019-03-28 11:27:35 -07:00
Anthony Thibault
65507cfe11
Merge pull request #15180 from luiscuenca/flowCppFixes
Fix Flow touch and scale issues
2019-03-28 11:11:08 -07:00