Commit graph

77572 commits

Author SHA1 Message Date
Roxanne Skelly
b841125b19 Case 19858 - crashpad_handler is duplicated outside of the Interface/Sandbox applications on MacOS 2019-04-02 16:42:09 -07:00
danteruiz
ff3e5bbc61 make sure to delete avatar when thier is no reason 2019-04-02 16:20:10 -07:00
raveenajain
fcc7e9af30 minor syntax fix 2019-04-03 00:09:36 +01:00
Anthony Thibault
dd2f8ff2d6
Merge pull request #15309 from hyperlogic/bug-fix/case22010
Case 22010: Bump protocol number to fix joint order mismatch
2019-04-02 16:06:11 -07:00
raveenajain
7e5375d40a Merge branch 'master' of https://github.com/highfidelity/hifi into gltf_skinning 2019-04-02 23:38:19 +01:00
Ryan Huffman
6a16a37339
Merge pull request #15286 from huffman/fix/oven-query-param-in-model-url
Case 20928: Fix some URLs with query params not working with model baker
2019-04-02 15:03:59 -07:00
Ryan Huffman
ea2e62c1ca
Merge pull request #15293 from huffman/fix/damping-on-new-dynamic-entities
Case 20826: Add damping to new dynamic entities in Create
2019-04-02 14:28:35 -07:00
Anthony J. Thibault
782b8f5da6 Case 22010: Bump protocol number to fix joint order mismatch
The joint order change was introduced in PR #15178, to fix an FBX Serializer bug.
2019-04-02 13:26:50 -07:00
Roxanne Skelly
cf9fe00fd6 Merge branch 'master' of https://github.com/highfidelity/hifi into Case20410 2019-04-02 13:21:52 -07:00
Roxanne Skelly
2d71ec1c75 Case20410 Automatic Content Archives doesn't restore correctly with old Tutorial content set
The tutorial content set had a content set Id of Null, which caused a failure
to parse the content set.
2019-04-02 13:19:06 -07:00
raveenajain
1435245279 root cluster 2019-04-02 21:18:16 +01:00
NissimHadar
0ace57b396 Tested on Mac. 2019-04-02 13:04:14 -07:00
David Back
8de75604cf
Merge pull request #15270 from dback2/avatarExporterWarningFixes
Case 20964, 21758: Avatar Exporter v0.4.1 - bone rule fixes
2019-04-02 12:20:39 -07:00
NissimHadar
3060835029 Merge branch '22021-specificThresholdsPerGPUVendor-v3.2.0' of github.com:NissimHadar/hifi into 22021-specificThresholdsPerGPUVendor-v3.2.0 2019-04-02 12:04:36 -07:00
NissimHadar
0e0714c398 Can detect GPU and set combo default. 2019-04-02 11:57:55 -07:00
raveenajain
8439019c4e update use of vectors 2019-04-02 19:56:17 +01:00
Shannon Romano
c5c643f90e
Merge pull request #15304 from kitely/fix-invoke-adddelete-wearable
case 22001: Fixed calls to addingWearable() and deletingWearable()
2019-04-02 09:09:57 -07:00
NissimHadar
efd9a8935e Clean-up. 2019-04-02 08:59:05 -07:00
Sam Gondelman
414a39bd8a
Merge branch 'master' into particleShapes 2019-04-01 22:20:13 -07:00
Shannon Romano
cf7eeb7355
Merge pull request #15285 from danteruiz/avatar-fading
Case 21415: Avatars stay behind after they disconnect
2019-04-01 18:04:42 -07:00
danteruiz
8115ef6d36 addressing more requested changes 2019-04-01 16:46:15 -07:00
Shannon Romano
c865969b5f
Merge pull request #15306 from highfidelity/wayne-chen-patch-1
Case 22014: Audio Mic Bar not muting/unmuting correctly
2019-04-01 16:26:20 -07:00
danteruiz
fcb838a71f addressing review requests 2019-04-01 15:43:04 -07:00
Shannon Romano
1bfa0397f0
Merge pull request #15048 from wayne-chen/newAudioMuteStates
Case 21899: New Audio Mute States
2019-04-01 15:27:03 -07:00
r3tk0n
4fb7bbabe1 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-04-01 14:52:21 -07:00
Wayne Chen
8df34e5d59
fixing on clicked for audio mic bar 2019-04-01 14:50:16 -07:00
Wayne Chen
a9802570d7
Merge pull request #15305 from wayne-chen/repositionPeopleAppAudioQml
Case 22003: Reuse Blank Space from Volume Slider
2019-04-01 14:23:27 -07:00
Shannon Romano
04eac57950
Merge pull request #15300 from jherico/fix/web_camera_master
Case 21993: Globally disallow use of the camera or microphone by hosted web content
2019-04-01 14:05:22 -07:00
raveenajain
ce6f2b7bcc Merge branch 'master' of https://github.com/highfidelity/hifi into gltf_skinning 2019-04-01 21:48:55 +01:00
raveenajain
2920fdc966 variables, cluster size 2019-04-01 21:09:14 +01:00
Wayne Chen
abe5748e60
Merge branch 'master' into newAudioMuteStates 2019-04-01 12:24:46 -07:00
Wayne Chen
afdf95c894
remove unused slotted function 2019-04-01 12:20:55 -07:00
Wayne Chen
eba1f271ef
Merge pull request #15253 from wayne-chen/fixPTTMacAudio-master
Case 21892: Mac Audio Push To Talk fix
2019-04-01 12:19:10 -07:00
Wayne Chen
0a8d195f6f adding top padding for my name card 2019-04-01 11:32:52 -07:00
Wayne Chen
0d83e622ff Revert "Attempt to add acceleration curve." (#23)
This reverts commit 9ea476ea89.
2019-04-01 13:47:49 -04:00
Oren Hurvitz
0b822b2cbc Fixed calls to addingWearable() and deletingWearable().
The calls used a parameter type of QUuid instead of EntityItemID. This resulted in the following warnings in the log:

[04/01 18:16:11.012] [WARNING] [default] [53296] QMetaObject::invokeMethod: No such method EntityScriptingInterface::addingWearable(QUuid)
[04/01 18:16:11.012] [WARNING] [default] [53296] Candidates are:
[04/01 18:16:11.012] [WARNING] [default] [53296]     addingWearable(EntityItemID)
2019-04-01 18:26:00 +03:00
Olivier Prat
e2bc80b46f Fixed for debug 2019-04-01 15:07:29 +02:00
Olivier Prat
4e39a063f7 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2019-04-01 11:08:41 +02:00
Brad Davis
7d4e59bfe3 Force packet version change 2019-03-31 16:44:23 -07:00
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