RebeccaStankus
|
ecbcb6a178
|
Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd
|
2019-08-08 11:16:31 -07:00 |
|
Anthony Thibault
|
ab63aecf29
|
Merge pull request #16042 from luiscuenca/randomAnimDif
DEV-327: Prevent AnimRandomSwitch from repeating same animation twice in a row
|
2019-08-08 09:38:22 -07:00 |
|
Ken Cooke
|
f445737550
|
Merge pull request #16040 from kencooke/audio-webrtc-improvements
Better detection of audio clipping during echo cancellation
|
2019-08-08 09:17:58 -07:00 |
|
luiscuenca
|
597cff335a
|
Reserve vector size
|
2019-08-08 08:40:00 -07:00 |
|
luiscuenca
|
3a22db0a13
|
Last state for all node types
|
2019-08-08 06:25:04 -07:00 |
|
luiscuenca
|
473af995d6
|
Fix warnings
|
2019-08-07 16:53:08 -07:00 |
|
luiscuenca
|
74eacf2346
|
Make sure random switch does not repeat previous state
|
2019-08-07 15:08:44 -07:00 |
|
Shannon Romano
|
a097d567ca
|
Merge pull request #16017 from roxanneskelly/bugz1046
BUGZ-1046 - send entity packets reliably for initial query
|
2019-08-07 14:16:19 -07:00 |
|
Sabrina Shanman
|
0728df8a8f
|
Merge pull request #16025 from sabrina-shanman/picks_debug
(BUGZ-1059) Improve debug API for picks/pointers
|
2019-08-07 12:01:26 -07:00 |
|
Brad Hefta-Gaub
|
9702fb48b6
|
Merge pull request #16039 from zfox23/enterEntityOnReload
Fix BUGZ-1197 (and others): Ensure enterEntity is emitted when avatar is inside entity and script is reloaded
|
2019-08-07 11:49:44 -07:00 |
|
Zach Fox
|
b45e670d21
|
Fix BUGZ-1197 (and others): Ensure enterEntity is emitted when avatar is inside entity and script is reloaded
|
2019-08-07 13:55:16 -04:00 |
|
sabrina-shanman
|
66dbb08b01
|
Be explicit about pickType/pointerType being returned when getting script parameters
|
2019-08-07 10:44:43 -07:00 |
|
Roxanne Skelly
|
2e5127fa98
|
Merge branch 'master' of https://github.com/highfidelity/hifi into bugz1046
|
2019-08-07 10:40:23 -07:00 |
|
sabrina-shanman
|
3985261c91
|
Remove locks on getters/setters for PickQuery::_scriptParameters
|
2019-08-07 10:14:35 -07:00 |
|
sabrina-shanman
|
4cb925e973
|
Fix jsdoc for getPointerScriptParameters
|
2019-08-07 10:04:44 -07:00 |
|
sabrina-shanman
|
8cde93973d
|
Disambiguate pick and pointer types in the returned properties
|
2019-08-07 09:56:23 -07:00 |
|
milad
|
b8c5192d7a
|
add images
|
2019-08-06 19:59:10 -07:00 |
|
milad
|
c2fddbf03a
|
cut down files
|
2019-08-06 19:55:48 -07:00 |
|
Shannon Romano
|
ba7f9f410b
|
Merge pull request #16036 from luiscuenca/WLFixAutoCopy
BUGZ-1185: WL Fix update process
|
2019-08-06 18:16:04 -07:00 |
|
luiscuenca
|
ecd078f6d3
|
Retry self copy if the old launcher is still shutting down.
|
2019-08-06 16:39:31 -07:00 |
|
milad
|
75708170dd
|
Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd
|
2019-08-06 13:23:32 -07:00 |
|
milad
|
82f6c29923
|
updated emoji size info
|
2019-08-06 13:23:10 -07:00 |
|
Shannon Romano
|
93d5d9bd3f
|
Merge pull request #15988 from ctrlaltdavid/DOC-98
DOC-98, DOC-114: PlatformInfo API changes JSDoc
|
2019-08-06 13:22:36 -07:00 |
|
Shannon Romano
|
9e0e6f9d5e
|
Merge pull request #16003 from ctrlaltdavid/DOC-84
DOC-84: Update JSDoc with glTF
|
2019-08-06 13:22:04 -07:00 |
|
milad
|
f1ff9207f9
|
removing empty js file
|
2019-08-06 13:20:15 -07:00 |
|
Shannon Romano
|
8c981140b0
|
Merge pull request #16005 from ctrlaltdavid/DOC-61
DOC-61: Render API JSDoc
|
2019-08-06 13:18:17 -07:00 |
|
milad
|
c20933b813
|
removed saved emoji called and also add more info to description
|
2019-08-06 13:16:58 -07:00 |
|
milad
|
1a95c126c3
|
working version but taking a snapshot of added emoji code before removing for handoff
|
2019-08-06 13:13:38 -07:00 |
|
Zach Fox
|
8b85bbfe67
|
Merge pull request #16034 from zfox23/masterGPU
BUGZ-1103: Use 'Master GPU' information in About screen
|
2019-08-06 12:31:54 -07:00 |
|
jennaingersoll
|
f487d094fe
|
Merge pull request #15959 from ctrlaltdavid/DOC-124
DOC-124: Tidy JSDoc from some recent API changes
|
2019-08-06 11:57:28 -07:00 |
|
Zach Fox
|
2a4c0a3ecd
|
BUGZ-1103: Use 'Master GPU' information in About screen
|
2019-08-06 14:13:31 -04:00 |
|
Shannon Romano
|
f02b76fed0
|
Merge pull request #16011 from ctrlaltdavid/DOC-60
Case 22106: DebugDraw JSDoc
|
2019-08-06 10:47:43 -07:00 |
|
milad
|
77023b281b
|
Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd
|
2019-08-06 09:27:49 -07:00 |
|
Shannon Romano
|
9d3d5b7701
|
Merge pull request #15992 from hyperlogic/feature/reaction-fixes
Refined reaction and sitting animations
|
2019-08-06 09:15:44 -07:00 |
|
milad
|
5e12f4c42a
|
Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd
|
2019-08-05 19:01:20 -07:00 |
|
David Rowe
|
2939610eae
|
Fix link to TextEffect type
|
2019-08-06 11:00:24 +12:00 |
|
David Rowe
|
1abf0eb207
|
Merge branch 'master' into DOC-124
# Conflicts:
# libraries/entities/src/EntityItemProperties.cpp
|
2019-08-06 10:59:50 +12:00 |
|
David Rowe
|
8ea4ee6d48
|
Doc review
|
2019-08-06 10:42:17 +12:00 |
|
Andy Howell
|
7aaecd9cdc
|
Merge pull request #16030 from danteruiz/fix-updater
fix updater typo
|
2019-08-05 15:42:00 -07:00 |
|
David Rowe
|
26a04e56eb
|
Merge branch 'master' into DOC-98
|
2019-08-06 10:33:12 +12:00 |
|
Ken Cooke
|
6fd3214f48
|
Merge pull request #16029 from kencooke/audio-device-format-robustness
BUGZ-1171: Fix audio output not working (alternate fix)
|
2019-08-05 14:19:46 -07:00 |
|
Zach Fox
|
26e0a5dfd8
|
Merge pull request #16028 from zfox23/shieldIcon_master
RC84: Fix BUGZ-1131: Add Shield icon back to HUD for Metaverse users
|
2019-08-05 13:36:58 -07:00 |
|
sabrina-shanman
|
30482c2db4
|
Give the pointer its own copy of the script parameters in case its pick is deleted
|
2019-08-05 13:36:15 -07:00 |
|
dante ruiz
|
7ab8a6b8d1
|
fixing typo
|
2019-08-05 13:16:08 -07:00 |
|
David Rowe
|
f97417932c
|
Fix typo
|
2019-08-06 08:08:08 +12:00 |
|
David Rowe
|
419044021b
|
Merge branch 'master' into DOC-61
|
2019-08-06 08:03:12 +12:00 |
|
Anthony J. Thibault
|
640c058591
|
Code review feedback
|
2019-08-05 12:52:42 -07:00 |
|
Ken Cooke
|
86adc6099b
|
Attempt audio device format with native sample rate and channels forced to 2/1 before failing
|
2019-08-05 12:14:45 -07:00 |
|
Zach Fox
|
34bc71fba9
|
Fix BUGZ-1131: Add Shield icon back to HUD for Metaverse users
|
2019-08-05 15:12:29 -04:00 |
|
sabrina-shanman
|
715f6a4473
|
Mark BaseNestableTransformNode::toVariantMap with override
|
2019-08-05 12:02:24 -07:00 |
|