RebeccaStankus
|
ecbcb6a178
|
Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd
|
2019-08-08 11:16:31 -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 |
|
sabrina-shanman
|
66dbb08b01
|
Be explicit about pickType/pointerType being returned when getting script parameters
|
2019-08-07 10:44:43 -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
|
75708170dd
|
Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd
|
2019-08-06 13:23:32 -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 |
|
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
|
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 |
|
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
|
1abf0eb207
|
Merge branch 'master' into DOC-124
# Conflicts:
# libraries/entities/src/EntityItemProperties.cpp
|
2019-08-06 10:59:50 +12: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 |
|
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 |
|
Zach Fox
|
34bc71fba9
|
Fix BUGZ-1131: Add Shield icon back to HUD for Metaverse users
|
2019-08-05 15:12:29 -04:00 |
|
Anthony J. Thibault
|
704a2d2ac9
|
Merge branch 'master' into feature/reaction-fixes
|
2019-08-05 09:43:32 -07:00 |
|
Anthony J. Thibault
|
649ef6c721
|
Added sitting idle variation and removed rejected emote variations.
|
2019-08-05 09:42:01 -07:00 |
|
sabrina-shanman
|
64fb046a33
|
Simplify naming for script functions to get list of picks/pointers
|
2019-08-05 09:25:32 -07:00 |
|
milad
|
d1efbc051a
|
working UI
|
2019-08-04 15:11:55 -07:00 |
|
David Rowe
|
e2748a861a
|
Merge branch 'master' into DOC-98
# Conflicts:
# libraries/platform/src/platform/backend/Platform.cpp
|
2019-08-03 11:22:23 +12:00 |
|
sabrina-shanman
|
20fa78e51d
|
Fix some dates and no newline at EOF
|
2019-08-02 16:13:07 -07:00 |
|
sabrina-shanman
|
f7c324c017
|
Improve pick/pointer debugging. Use unsigned int in Graphics api for compatibility
|
2019-08-02 16:10:39 -07:00 |
|
MiladNazeri
|
ae7b415152
|
Merge pull request #16008 from HifiExperiments/text
Supporting text effects + fonts on Text Entities
|
2019-08-02 14:25:28 -07:00 |
|
MiladNazeri
|
76e9f8896c
|
Merge pull request #16021 from kencooke/audio-volume-control-persist
BUGZ-352: Persist the audio volume settings across sessions
|
2019-08-02 10:34:44 -07:00 |
|
Anthony J. Thibault
|
31762a0c80
|
Bug fixes in seated reactions
|
2019-08-02 10:17:59 -07:00 |
|
Bradley Austin Davis
|
543f07b6ae
|
Merge pull request #16018 from jherico/fix/dev-279
DEV-279: Add rendering API information to the platform JSON object
|
2019-08-02 10:16:06 -07:00 |
|
Anthony J. Thibault
|
c8e4536bba
|
Hooked up variations of seated while talking and stubs for reactions while seated.
|
2019-08-02 10:11:38 -07:00 |
|
Ken Cooke
|
437d0ea928
|
Save and restore the audio gain settings
|
2019-08-02 06:46:34 -07:00 |
|
David Rowe
|
789f9c7d67
|
Merge branch 'master' into DOC-124
# Conflicts:
# interface/src/scripting/Audio.h
|
2019-08-02 20:34:09 +12:00 |
|
Shannon Romano
|
2f6d79fb45
|
Merge pull request #15920 from annabrewer/combine-tone-map-resample
BUGZ-965: Standardize and shorten deferred/forward and desktop/android pipelines
|
2019-08-01 17:39:38 -07:00 |
|
Brad Davis
|
06ad461c32
|
PR feedback
|
2019-08-01 16:57:54 -07:00 |
|
Brad Davis
|
bfe42215aa
|
DEV-279: Add rendering API information to the platform JSON object
|
2019-08-01 14:29:03 -07:00 |
|
Anthony J. Thibault
|
f843c01b35
|
added missing seated idle pose
|
2019-08-01 13:09:02 -07:00 |
|
Anthony J. Thibault
|
a2e37b7275
|
talking/reactions while seated, work in progress check in
|
2019-08-01 13:05:15 -07:00 |
|
Seth Alves
|
d8b940cc96
|
add control to enable/disable acoustic echo cancellation to simplified UI
|
2019-07-30 14:09:34 -07:00 |
|
Seth Alves
|
8ec4505b95
|
add an on/off control for audio echo cancelation to Audio Settings page. It's not yet hooked to anything.
|
2019-07-30 14:09:32 -07:00 |
|
Anthony J. Thibault
|
ee4bb233b9
|
Bug fix for head nod not going back to idle.
|
2019-07-30 12:56:43 -07:00 |
|
Anna
|
f58400950a
|
made color format for resolve FB a parameter, reverted name of tonemapping task to preserve back compatibility
|
2019-07-30 11:57:01 -07:00 |
|
Shannon Romano
|
fe900cf55f
|
Merge pull request #15991 from jherico/fix/bugz-964
BUGZ-964: fix for incorrect color curve when rendering 3D into QML
|
2019-07-30 11:52:58 -07:00 |
|
HifiExperiments
|
078ca7edea
|
supporting text effects + fonts on text entities
|
2019-07-30 09:59:45 -07:00 |
|
MiladNazeri
|
b81d0ecce3
|
Merge pull request #16002 from MiladNazeri/addNewTextSizeAPI
[BUGZ-972] :: changed root to micBar which had the gated property
|
2019-07-30 09:59:40 -07:00 |
|
Anthony J. Thibault
|
4f5d0d1c0f
|
Updated a negative reaction animation.
|
2019-07-29 16:49:16 -07:00 |
|
David Rowe
|
833bbf1cce
|
Render API JSDoc
|
2019-07-30 11:36:56 +12:00 |
|
Anthony J. Thibault
|
6f3bb749e2
|
Added new applaud, point and raisehand reactions.
|
2019-07-29 16:17:50 -07:00 |
|