Shannon Romano
8c981140b0
Merge pull request #16005 from ctrlaltdavid/DOC-61
...
DOC-61: Render API JSDoc
2019-08-06 13:18:17 -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
9d3d5b7701
Merge pull request #15992 from hyperlogic/feature/reaction-fixes
...
Refined reaction and sitting animations
2019-08-06 09:15:44 -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
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
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
Shannon Romano
f29284198c
Merge pull request #15978 from roxanneskelly/bugz829
...
BUGZ-829 DEV-168 - domain backup/content management improvements
2019-07-29 15:28:49 -07:00
Anthony J. Thibault
e205d90df6
Hooked up random positive & negative emote animations.
2019-07-29 15:01:10 -07:00
milad
2ea8b9efa4
changed root to micBar which had the gated property
2019-07-29 14:05:55 -07:00
Amer
7bc0ea27d0
Merge pull request #15995 from amerhifi/master
...
BUGZ 1029: changing raw pointer to unique pointer with custom deleter
2019-07-29 13:04:58 -07:00
Howard Stearns
b17e796f0f
Merge pull request #15994 from howard-stearns/steam-store-commerce
...
steam gets the oculus store commerce treatment
2019-07-29 12:06:29 -07:00
Anthony J. Thibault
6e6440232c
Updated avatar-animation.json from animedit tool
2019-07-29 10:49:34 -07:00
amer cerkic
85fa510d38
addressing comment
2019-07-29 10:28:31 -07:00
Shannon Romano
75146a104d
Merge pull request #15982 from sabrina-shanman/bug_lod_too-low
...
(BUGZ-1040) Fix LOD randomly being too low in simplified UI
2019-07-29 09:45:19 -07:00
amer cerkic
b3ea9d0de7
addressing commetn
2019-07-29 09:40:58 -07:00
amer cerkic
854f89cace
addressing comment
2019-07-29 09:39:31 -07:00
amer cerkic
1f4b149f75
Merge branch 'master' of https://github.com/highfidelity/hifi
2019-07-29 09:36:03 -07:00
Anna
6a6b2f6d27
added tone mapping back
2019-07-26 18:55:08 -07:00
Anthony J. Thibault
2f949a4d4d
Disable head ik while reacting
...
Also, split getReactions() API into two calls
* getTriggerReactions() - lists all reactions that can be triggered with MyAvatar.triggerReaction().
* getBeginReactions() - lists all reactions that can be used with MyAvatar.beginReaction() and MyAvatar.endReaction().
2019-07-26 15:26:43 -07:00
amer cerkic
de0b038ee1
trunked to a lambda for simplicity
2019-07-26 13:52:38 -07:00
Anthony Thibault
5375e53ecb
Merge pull request #15974 from luiscuenca/avatarSitAPI
...
DEV-269: First Class Sitting API
2019-07-26 13:36:00 -07:00
amer cerkic
087b19d64d
removed extra space
2019-07-26 13:15:01 -07:00
amer cerkic
b2e07fd990
changing raw pointer to unique pointer with custom deleter
2019-07-26 13:02:59 -07:00
