Commit graph

80180 commits

Author SHA1 Message Date
Anna
d3107efb82 added optional output buffer to ToneMapAndResampleTask 2019-07-29 16:27:54 -07:00
Roxanne Skelly
b4fee1140c BUGZ-319 - Add 'Installed By' username to installed content section on
settings.
2019-07-29 16:25:51 -07:00
Anthony J. Thibault
6f3bb749e2 Added new applaud, point and raisehand reactions. 2019-07-29 16:17:50 -07:00
David Rowe
ade85ad8c0 Update API JSDoc with glTF 2019-07-30 10:41:07 +12: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
Anna
3a437cf190 fix on android, merge android and windows forward pipelines 2019-07-29 14:59:15 -07:00
milad
2ea8b9efa4 changed root to micBar which had the gated property 2019-07-29 14:05:55 -07:00
Anna
2fca77867b broken on android again somehow 2019-07-29 13:45:08 -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
Anna
db49a0b9d6 fixed some typos from merge 2019-07-29 11:55:12 -07:00
Roxanne Skelly
4722f55c51 Merge branch 'master' of https://github.com/highfidelity/hifi into bugz829 2019-07-29 10:50:45 -07:00
Anthony J. Thibault
6e6440232c Updated avatar-animation.json from animedit tool 2019-07-29 10:49:34 -07:00
Anna
0cc8c1f434 making my changes work on android 2019-07-29 10:43:20 -07:00
Howard Stearns
6691f68428
Merge pull request #15996 from SimonWalton-HiFi/avatar-verification-more-diagnostics
BUGZ-1101: Improved diagnostics for avatar-verify failures in mixer
2019-07-29 10:33:04 -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
luiscuenca
8fde82dafc Renamed variables 2019-07-29 07:57:54 -07:00
Sam
767f413a2c merging the various job/task/switch congif into one 2019-07-29 00:07:16 -07:00
luiscuenca
5e81f3684f fix self install flow and progress bar 2019-07-27 20:57:43 -07:00
luiscuenca
d54bb02f47
Fix installer process windows 2019-07-27 08:53:32 -07:00
Anna
8aef9db4b9 works on android! 2019-07-26 20:09:18 -07:00
Anna
6a6b2f6d27 added tone mapping back 2019-07-26 18:55:08 -07:00
dante ruiz
7ed13a2ba2 auto-updater 2019-07-26 17:41:46 -07:00
Roxanne Skelly
701c457ad4 Fix issue where reset of server was prematurely causing the drop of
an ajax connection which was causing an error popup.
2019-07-26 16:57:05 -07:00
David Rowe
9e5cf5fe75 Config.h is now exposed as the Workload API 2019-07-27 11:50:07 +12:00
Simon Walton
d9572d9e8c Improved avatar-verify diagnostics 2019-07-26 15:35:09 -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
Sam Gateau
7486e906eb
Merge pull request #15983 from samcake/toulouse
BUGZ-1080: Changing the default Intel GPU platform profile from mid to low
2019-07-27 00:13:45 +02:00
Roxanne Skelly
03b146cfb2 fix issue with .json.gz files failing to upload properly 2019-07-26 13:55:59 -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
Ryan Huffman
2de26ff653
Merge pull request #15993 from luiscuenca/WLDisplayErrorWhenNotConnected
BUGZ-815: WL Display error when connection fails
2019-07-26 13:23:14 -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
Anna
0d2b2a2aef added tone mapping config 2019-07-26 12:53:18 -07:00
Howard Stearns
6ef0821801 steam gets the oculus store commerce treatment 2019-07-26 12:44:48 -07:00
luiscuenca
c77da03535
Display error when connection fails 2019-07-26 12:01:33 -07:00
Anna
16595d9412 created tonemapandresample 2019-07-26 11:56:25 -07:00
MiladNazeri
e6e771df7b
Merge pull request #15977 from MiladNazeri/permissionsUIFix
[DEV-190] + [DEV-191] :: Permissions UI
2019-07-26 11:25:18 -07:00
Zach Fox
1a81765d71
Merge pull request #15989 from MiladNazeri/nametagDisplayRenderingFix
[BUGZ-1073] - Add extra padding to the nametag
2019-07-26 10:22:37 -07:00
Simon Walton
2ebc6e66fe Merge remote-tracking branch 'upstream/master' into scriptaudioinjector-delete-via-signal
Need 985 PR.
2019-07-26 09:53:23 -07:00
Roxanne Skelly
908cb8156b fix coding standards issue 2019-07-26 09:40:17 -07:00
Brad Davis
11d7890f48 BUGZ-964: fix for incorrect color curve when rendering 3D into QML 2019-07-25 18:24:53 -07:00
Roxanne Skelly
b770ff7b79 BUGZ-829 - error handling for web uploaded model files 2019-07-25 18:14:11 -07:00
Simon Walton
a9d3413626 Delete script audio-injector wrapper when wrapped object goes 2019-07-25 17:51:01 -07:00