Commit graph

6688 commits

Author SHA1 Message Date
luiscuenca
ea23a82f33
Make mouse pitch less sensitive 2019-09-26 15:14:47 -07:00
luiscuenca
1b064a0ebe
Fix Q key on first person cam. Let camera control flying Y axis 2019-09-26 14:29:01 -07:00
dooglifeSF
0fa7220750 tilt head down slightly to minimize crazy eyes 2019-09-25 15:27:11 -07:00
dooglifeSF
a8fa3a136c emote revisions, json tuning 2019-09-25 14:47:07 -07:00
luiscuenca
0aab2ed07f
Disable head look at when pointing 2019-09-25 12:37:24 -07:00
milad
aba6a28d54 updated camera modes 2019-09-25 11:05:32 -07:00
milad
39d96b76a6 fixed help text 2019-09-25 08:41:38 -07:00
luiscuenca
7c4fe39918
Add point directional blending node to animation json 2019-09-24 18:24:27 -07:00
luiscuenca
ad79393e1f
Implement point at directional blend and API 2019-09-24 17:55:38 -07:00
milad
677dbe59cc fixed qml typo 2019-09-24 16:47:07 -07:00
milad
edb135776a Added selfie view and updated help 2019-09-24 16:44:34 -07:00
Shannon Romano
73c558bc51
Merge pull request #16237 from dooglifeSF/emotes_interrupt_settle
Transition between walk/emote should be faster
2019-09-24 15:49:31 -07:00
RebeccaStankus
982bdf5c98 Prereq work for 'Reduce User Friction' 2019-09-23 16:49:16 -07:00
dooglifeSF
7307bea16f speed up interpolation of point, rework point animation, add transitions for emotes to idle from settle 2019-09-23 16:45:35 -07:00
dante ruiz
b478a22ed2 fix edge case 2019-09-20 15:25:10 -07:00
Shannon Romano
bd488f0196
Merge pull request #16144 from luiscuenca/addLookAtThirdCamera
DEV-391: Keyboard Input Controls Camera Not Avatar Orientation
2019-09-20 13:03:03 -07:00
Anthony Thibault
fecef584c9
Merge pull request #16226 from danteruiz/fix-snap-html-issue
BUGZ-1522: Snap app on tablet is blocked when saving/canceling out of its Settings page
2019-09-20 12:39:01 -07:00
dante ruiz
fe2a4c3600 fix fix-snap-html-issue 2019-09-19 18:20:08 -07:00
Zach Fox
97ef2c030e
Merge pull request #16223 from zfox23/simplifiedGoToIteration
Whoops! New placeholder text color
2019-09-19 16:40:48 -04:00
Zach Fox
10352f1cb2 New placeholder text color 2019-09-19 13:38:37 -07:00
luiscuenca
279e25ca70
Merge master 2019-09-19 13:21:49 -07:00
Zach Fox
a472e723e2
Merge pull request #16222 from zfox23/simplifiedGoToIteration
BUGZ-1529: Iteration on JumpTo Field visuals/interaction states
2019-09-19 16:13:21 -04:00
Zach Fox
5077089518 BUGZ-1529: Iteration on JumpTo Field visuals/interaction states. NOTE - need to fix placeholder text swap 2019-09-19 11:15:53 -07:00
luiscuenca
6d98537a20
Clean up code and refactor avatar-animation.json 2019-09-19 10:45:20 -07:00
Zach Fox
5e96ce8822 DEV-152: Implement 'Smooth/Snap Turn' setting in SimplifiedUI > Settings > VR 2019-09-19 09:48:11 -07:00
luiscuenca
fc223e4cb6
Reverse the up/down arrow keys if in selfie mode 2019-09-18 17:15:25 -07:00
luiscuenca
7bc8e6b237
Solved some sitting and sound issues while looking at 2019-09-18 17:00:10 -07:00
Shannon Romano
e7001c3f1b
Merge pull request #16157 from sethalves/vive-pro-groundwork
DEV-605: Vive pro groundwork
2019-09-18 16:36:12 -07:00
Shannon Romano
0be972062d
Merge pull request #16207 from hyperlogic/bug-fix/sitting-bug-fixes
Sit bug fixes
2019-09-18 16:20:51 -07:00
Zach Fox
f92c5d0882 DEV-576: Allow users to type HiFi locations into the SimplifiedUI top bar just like GOTO 2019-09-18 14:39:11 -07:00
Zach Fox
59184edc89 DEV-521: Update Emoji window's search field to display emoji's name during hover 2019-09-18 13:37:46 -07:00
luiscuenca
1054e8fcde
Selfie camera and updated camera menus 2019-09-17 17:15:16 -07:00
Anthony J. Thibault
1157d59f67 Sit bug fixes
* You should not be able to move after being seated, even if you switch seats.
* You should not be able to jump out of the chair by holding the space bar.
* Fixed small issue with the sitting to standing transition being delayed. (causing the user to look
  like there were sitting in mid-air)  This was due to a missing transition in the animation.json
2019-09-17 13:40:43 -07:00
Zach Fox
60f4189eb3 BUGZ-1485: Fix Copyright date in About dialog 2019-09-17 11:36:12 -07:00
Seth Alves
943348ba51 input action channels for eyes and eyelids and fingers. connect eyelid input actions to blendshapes. 2019-09-17 09:43:20 -07:00
Shannon Romano
dd0b527d63
Merge pull request #16185 from huffman/fix/hifi-log-login
BUGZ-1441: Update logo on login popup
Build failure is on Android not communicated to Docker.
2019-09-16 13:15:58 -07:00
Shannon Romano
79d845d127
Merge pull request #16190 from danteruiz/fix-html
BUGZ-1398: HMD Tablet Apps blocked by Web access error
2019-09-13 12:35:29 -07:00
danteruiz
8491a37923 fixing WebEntities html 2019-09-13 09:57:51 -07:00
Ryan Huffman
5370e67507 Update logo on login popup 2019-09-12 14:48:21 -07:00
Zach Fox
a5504c3780
Merge pull request #16176 from MiladNazeri/BUGZ-1456/HMD-audio-setting-shows-up-when-desktop-mode
BUGZ-1456/HMD-audio-setting-shows-up-when-desktop-mode
2019-09-11 15:05:44 -07:00
luiscuenca
7c7c3cd223
merge master 2019-09-11 14:07:19 -07:00
Shannon Romano
65d0bb1342
Merge pull request #15906 from kasenvr/kpi-v1-modkit-rc
Kasen Plugin Infrastructure v½ Codename "Modkit Mini"
2019-09-11 13:04:01 -07:00
MiladNazeri
a9da5b8f16
Update interface/resources/qml/hifi/audio/Audio.qml
Co-Authored-By: Zach Fox <fox@highfidelity.com>
2019-09-11 12:45:18 -07:00
MiladNazeri
d95a803324
Update interface/resources/qml/hifi/audio/Audio.qml
Co-Authored-By: Zach Fox <fox@highfidelity.com>
2019-09-11 12:44:59 -07:00
milad
3cf56210b2 modified Audio.qml to handle desktop audio level meter visible 2019-09-11 12:30:24 -07:00
Zach Fox
50ba55a988 Protect against engine not returning a valid CPU/GPU object 2019-09-10 13:03:40 -07:00
Zach Fox
e52d65a7bc BUGZ-1451: Update links in controller reference 2019-09-10 11:31:51 -07:00
Zach Fox
eb286d992e
Merge pull request #16160 from RebeccaStankus/emojiDoubleClickSound
Emoji app duplicates sound on opening from toolbar
2019-09-09 11:27:26 -07:00
RebeccaStankus
33b78bea4f Changed textField module sounds 2019-09-09 10:36:35 -07:00
luiscuenca
3b8d3f987d
Add animation 2019-09-06 14:31:53 -07:00
luiscuenca
0e4e09acb5
Add blending 2019-09-06 14:30:10 -07:00
luiscuenca
189ddf39e2
Merge branch 'master' into addLookAtThirdCamera 2019-09-06 14:29:51 -07:00
dooglifeSF
422ad52a87 Add one more sitting emote: clap03, touch up two of the standing clap anims, adjust frame ranges 2019-09-06 13:57:33 -07:00
luiscuenca
78eee5961c
Fix key mapping for new camera 2019-09-05 18:05:46 -07:00
dooglifeSF
b5d2675a05 Merge branch 'master' into Sitting_emote_variants 2019-09-05 16:45:24 -07:00
dooglifeSF
5061aca487 Update sitting_emote_raisehand03_all.fbx 2019-09-05 16:44:13 -07:00
dooglifeSF
9cfa4753d9 sitting emote acknowledge and dismiss added, also went through emote_agree set and pushed them per Josh feedback. Fixed point glitch stand/sit 2019-09-05 15:31:07 -07:00
humbletim
271fac4bca Merge remote-tracking branch 'upstream/master' into kasenvr-kpi-v1-modkit-rc-merge 2019-09-05 09:46:21 -04:00
milad
5fdcf0ecaf updated setting name and changed default value to true for show tray 2019-09-04 12:59:17 -07:00
milad
669fef763a removed logs 2019-09-03 18:11:56 -07:00
milad
44e518f5a1 working fix 2019-09-03 18:06:25 -07:00
dooglifeSF
6b3dfd6d56 sitting emote raised hand 03 wip 2019-09-03 16:53:36 -07:00
Jamil Akram
a9d8f105ae
Merge pull request #16112 from dooglifeSF/Anim_memory_reduction
Anim memory reduced ~10mb by removing static channels
2019-09-03 10:08:02 -07:00
Bradley Austin Davis
8e3b337a6e
Merge pull request #16120 from jherico/fix/bugz-1365
BUGZ-1365: prevent server scripts from accessing local files in HTML controls
2019-08-30 13:10:09 -07:00
Brad Davis
31340d278a Add test for local file access 2019-08-29 13:45:43 -07:00
dooglifeSF
974b18b16b Export one more that used to be hosted. I moved it to the source repo. 2019-08-28 14:16:57 -07:00
dooglifeSF
577a82f750 Export animations, remove static channels. Remove unused joints. Exclude all scene data from fbx. 2019-08-28 10:10:39 -07:00
dooglife@gmail.com
01b912210a json tuning to minimize the double-blend reduced animation effect, and to address some Joshua feedback 2019-08-23 15:06:31 -07:00
dooglife@gmail.com
e8492beb4a Merge branch 'master' into tweak_sit_pose 2019-08-23 14:21:09 -07:00
Shannon Romano
86518d222d
Merge pull request #16089 from RebeccaStankus/MuteIssues
Push To Talk Bugs 1207/1208
2019-08-23 10:42:16 -07:00
dooglife@gmail.com
fed14ac588 Merge branch 'master' into tweak_sit_pose 2019-08-23 09:34:45 -07:00
dooglife@gmail.com
01e98e194a animation tuning pass 2019-08-22 16:48:41 -07:00
Andy Howell
f5767168ed
Merge pull request #16035 from MiladNazeri/emojiAppAdd
Using my superpowers to get this in the build.
2019-08-22 16:10:22 -07:00
RebeccaStankus
6e96b800b6 Engine handles turning PTT off if unmuting 2019-08-22 13:22:45 -07:00
Zach Fox
7c4a0545c4 BUGZ-1327: Fix PTT icon when PTTing and clipping 2019-08-22 12:51:34 -07:00
dooglife@gmail.com
75dd4d8da9 json tuning, adding cheer/disbelief anim block-ins, BUG: these are tposing here so do not merge - this is a test 2019-08-22 11:50:22 -07:00
Zach Fox
330b8ceb91 Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd 2019-08-22 10:24:00 -07:00
dooglife@gmail.com
ec06a02fdf Merge branch 'master' of https://github.com/highfidelity/hifi into tweak_sit_pose 2019-08-21 08:46:59 -07:00
Zach Fox
70b3f44f8c Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd 2019-08-20 14:04:35 -07:00
RebeccaStankus
cc22386f06 CR feedback changes 2019-08-20 13:29:02 -07:00
Zach Fox
780a081d16 Remove unused TabletAddressDialog internal property, fixing BUGZ-1294 2019-08-20 12:05:00 -07:00
Zach Fox
41d992a307
Merge pull request #16078 from zfox23/helpSupport1
DEV-412: Implement Support tab in Help app
2019-08-20 11:57:44 -07:00
dooglifeSF
8d05d9e5d4 fix the worst of the mismatched emote poses for the eval mtg 2019-08-20 11:57:20 -07:00
Zach Fox
bb97b4f866 Fix BUGZ-1303: Make 'View All Controls' go to knowledge base 2019-08-20 11:17:05 -07:00
Anthony Thibault
2b74e2a7fa
Merge pull request #16066 from hyperlogic/bug-fix/sit-bug-fixes
Avatar sitting bug fixes
2019-08-20 11:09:25 -07:00
Zach Fox
0cc28c58ae DEV-415: Implement Support tab in Help app 2019-08-20 10:54:58 -07:00
dooglifeSF
8a3b93b913 add 3 sits with different hand placements for eval - also 2 new sit emotes 2019-08-20 10:35:56 -07:00
RebeccaStankus
e48e733343 Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd 2019-08-20 09:01:18 -07:00
Zach Fox
78edfb9af9 Remove 'About' tab from Settings 2019-08-19 17:22:38 -07:00
Zach Fox
b40d5658e3 Moved a timer from JS to QML; progress circle on Emote Indicator 2019-08-19 15:12:48 -07:00
Jamil Akram
a3919af747
Merge pull request #16062 from dooglifeSF/animation_json_tuning
Tuning pass on anim-graph, using the new blend modes and engine features
2019-08-19 14:02:37 -07:00
Zach Fox
14a04dfb1a Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd 2019-08-19 13:52:35 -07:00
Zach Fox
35a2cb7f27 BUGZ-1295: Fix typo in Help > Controls > Turn Right 2019-08-19 13:08:42 -07:00
Zach Fox
42705c2fea
Combine conditional statements 2019-08-19 11:04:54 -07:00
Zach Fox
2b86947d4a Mipmap images; better padding 2019-08-19 10:32:08 -07:00
Zach Fox
3de9f44bf3 It's working 2019-08-16 16:00:30 -07:00
Zach Fox
4c006c50aa Controls almost done 2019-08-16 15:53:30 -07:00
Anthony J. Thibault
381f7c6bc4 Avatar sitting bug fixes
* Added seatedToIdle transition, to make transition quicker to better match the capsule physics.
* Made switching into and out of instantly set animVar for the animation graph, previously it was delayed by 100 ms.
* Created "isNotSeated" anim var for exiting the seated state.
* MyAvatar::beginSit & MyAvatar::endSit no longer calls goToPosition, instead MyAvatar::slamPosition is called.
* MyAvatar::slamPosition will cause the AvatarTransit class to NOT play the teleport anticipation/reaction animation.
  Note: This does not prevent other clients from interpolating the position when entering the seat, but it prevents the teleport reaction animation from playing.
* Disable leg IK in HMD mode while seated.
2019-08-16 10:57:03 -07:00
Zach Fox
a053f9ed9e Impelement settingChanged; clean up some emoteIndicatorVisible code 2019-08-15 17:00:27 -07:00
Zach Fox
0338b0258c Add Search to Emoji window and clean up some code 2019-08-15 12:21:29 -07:00
Zach Fox
143c3e966c Big optimizations to Emoji window 2019-08-15 10:58:13 -07:00
dooglifeSF
2f3f6be693 Tuning pass on anim-graph, using the new blend modes and engine features. 2019-08-14 15:18:19 -07:00
RebeccaStankus
0645796e74 Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd 2019-08-14 13:28:08 -07:00
RebeccaStankus
8728640f60 Initial CR changes 2019-08-14 12:03:49 -07:00
Zach Fox
52c4d4fe69 better FAQ 2019-08-14 09:31:08 -07:00
Zach Fox
7297ac9a09 Merge branch 'master' of github.com:highfidelity/hifi into helpApp1 2019-08-14 09:11:04 -07:00
Shannon Romano
1011880698
Merge pull request #16049 from sabrina-shanman/ourLODEInvestigation
(BUGZ-1112) Make 20:20 vision equal seeing 1m cube from 400 meters away
2019-08-09 17:28:46 -07:00
Zach Fox
66199297cb button 2019-08-09 12:24:37 -07:00
Zach Fox
dc2e08ef6b Initial integration of browser 2019-08-09 12:05:03 -07:00
sabrina-shanman
49f1ecb1bf Fix new bugs in TabletLODTools.qml 2019-08-09 11:41:11 -07:00
Anthony J. Thibault
733d7455f4 new seated talking anim 2019-08-09 08:52:38 -07:00
Anthony J. Thibault
b4869508a0 updated clap 2019-08-08 14:47:31 -07:00
sabrina-shanman
8347d9d23e Update LODManager setter in TabletLODTools.qml 2019-08-08 13:59:50 -07:00
Anthony J. Thibault
ef81ccafed Hooked up seated clap 2019-08-08 13:02:19 -07:00
Anthony J. Thibault
5d405cac3b Merge branch 'master' into feature/reaction-intro-loop-outro 2019-08-08 09:56:45 -07:00
Anthony J. Thibault
317c2f5219 sitting raise hand 2019-08-08 09:37:03 -07:00
Anthony J. Thibault
e5e012a83e agree, point and disagree sitting emotes 2019-08-07 14:15:29 -07:00
Zach Fox
72e14a32f9 Implement the Help App skeleton; Implement Help App Controls; Implement Help App About 2019-08-07 17:13:20 -04:00
Anthony J. Thibault
147753309f Updated clap02 with new version that is not as slow. 2019-08-06 17:57:27 -07:00
Anthony J. Thibault
3f6b488f27 Added intro-loop-outro phases for raiseHand, applaud and point 2019-08-06 17:39:30 -07:00
sabrina-shanman
bc3acfa3c0 Clean up and re-name to reflect what uses octreeSizeScale and what uses
visibilityDistance
2019-08-06 15:46:10 -07:00
milad
75708170dd Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd 2019-08-06 13:23:32 -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
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
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
milad
d1efbc051a working UI 2019-08-04 15:11:55 -07:00
Anthony J. Thibault
31762a0c80 Bug fixes in seated reactions 2019-08-02 10:17:59 -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
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
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
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
Anthony J. Thibault
6e6440232c Updated avatar-animation.json from animedit tool 2019-07-29 10:49:34 -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
humbletim
058c81aa1a Merge branch 'hifi-master' into kpi-v1-modkit-rc 2019-07-26 01:36:52 -04:00
Kalila R
bac59b52aa Added checkbox for script plugins to security.qml 2019-07-26 01:32:14 -04:00
MiladNazeri
b0723599d8 Update interface/resources/qml/controlsUit/PermissionPopup.qml
Co-Authored-By: Zach Fox <fox@highfidelity.com>
2019-07-25 15:47:48 -07:00
MiladNazeri
b419be97be Update interface/resources/qml/controlsUit/PermissionPopup.qml
Co-Authored-By: Zach Fox <fox@highfidelity.com>
2019-07-25 15:47:24 -07:00
MiladNazeri
cf23b7a303 Update interface/resources/qml/controlsUit/PermissionPopup.qml
Co-Authored-By: Zach Fox <fox@highfidelity.com>
2019-07-25 15:47:17 -07:00
MiladNazeri
20b709b382 Update interface/resources/qml/controlsUit/PermissionPopup.qml
Co-Authored-By: Zach Fox <fox@highfidelity.com>
2019-07-25 15:46:10 -07:00
milad
5083e449b0 cr round 2 2019-07-25 15:42:25 -07:00
milad
2f4566b63c merged master and fixed height 2019-07-25 15:42:03 -07:00
milad
4c0d8b6fda improved layout to match the figment more 2019-07-25 15:42:02 -07:00
milad
993e5db2da changed rectangle to have anchor.fill 2019-07-25 15:42:02 -07:00
milad
2498bf2fd8 Cr changes r1 2019-07-25 15:42:02 -07:00
milad
9f0fc8bd06 removed logs and prototype code 2019-07-25 15:42:02 -07:00
milad
189809dc2c Fixed undefined error when displaying from the dictionary 2019-07-25 15:42:02 -07:00
milad
2b4dd327ec removed log statements 2019-07-25 15:42:01 -07:00
milad
cd5df63f51 working version for all qml web files 2019-07-25 15:41:53 -07:00
milad
fb7a66b110 working version with just flickable 2019-07-25 15:38:23 -07:00
milad
43268c0f65 Working QML window 2019-07-25 15:38:23 -07:00
milad
dec176b921 checking to see if I did something blocking the build 2019-07-25 15:38:22 -07:00
Roxanne Skelly
130e68c9b5 DEV-168 - make interface-installed content sets display info on web
installed content section
2019-07-25 14:37:41 -07:00
Ryan Huffman
de233e456e
Merge pull request #15976 from huffman/feat/serverless-tutorial
DEV-266: Add serverless tutorial
2019-07-25 13:39:03 -07:00
Zach Fox
12a9837a4b
Merge pull request #15984 from zfox23/removeSomeEventBridgeCode
BUGZ-969: Remove some audio-related code that hasn't worked in a while
2019-07-25 12:41:43 -07:00
Zach Fox
6e33f3f23a BUGZ-969: Remove some audio-related code that hasn't worked in a while 2019-07-25 11:49:28 -07:00
Ryan Huffman
2ec87f4e61 Add serverless tutorial 2019-07-24 16:38:03 -07:00
Zach Fox
e1c198903d
Merge pull request #15973 from zfox23/fixGatedLog
BUGZ-972: Fix errant log involving 'gated' property
2019-07-24 11:19:02 -07:00
luiscuenca
015d1951fc
Add sitting clip node 2019-07-24 10:44:33 -07:00
Zach Fox
03b5f9f7f8 BUGZ-972: Fix errant log involving 'gated' property 2019-07-24 10:18:03 -07:00
Zach Fox
b918979fab DEV-301: Adjust size of VR-mode header icon 2019-07-24 10:02:26 -07:00
luiscuenca
e7e864121f
Merge branch 'master' into avatarSitAPI 2019-07-23 14:22:42 -07:00
luiscuenca
9cec979552
Add sit API to MyAvatar 2019-07-23 14:20:54 -07:00
Shannon Romano
266230a53c
Merge pull request #15963 from hyperlogic/feature/avatar-reaction-api
Initial version of Avatar Reaction API
2019-07-23 13:13:31 -07:00
Anthony J. Thibault
687588cde7 Hooked up first-pass reaction animations. 2019-07-23 09:47:37 -07:00
Andrew Meadows
95187f97c8 use bold monospace font for debug stats 2019-07-22 12:38:24 -07:00
Shannon Romano
4f7b865cfe
Merge pull request #15945 from huffman/fix/create-window-not-reopening
BUGZ-998: Fix create window being destroyed when closed
2019-07-19 11:07:02 -07:00
Ryan Huffman
03b8de1ee7 Fix create window being destroyed when closed 2019-07-18 08:43:39 -07:00
milad
a3b8ded56a changed sessionDisplayName logic 2019-07-17 14:17:58 -07:00
Zach Fox
a4f4961dfd
Merge pull request #15941 from zfox23/graphicsSettingsMargin
Fix BUGZ-814 in VR mode: Add a top margin to tablet graphics settings
2019-07-16 15:26:43 -07:00
Zach Fox
1cd136f178 Fix BUGZ-814 in VR mode: Add a top margin to tablet graphics settings 2019-07-16 15:15:08 -07:00
dooglifeSF
413a089402 add teleport.fbx back to avatar/animations
compiled and tested in local sandbox but need to test with Jamil in HMD to see that teleport plays correctly for remote viewer
2019-07-15 13:24:21 -07:00
Zach Fox
5828f46c6b Incorrect ID fixed - thanks Milad 2019-07-12 12:27:55 -07:00
Zach Fox
e0392642f7 Don't enable supersampling from graphics settings 2019-07-12 11:18:34 -07:00
Zach Fox
56a55efbb3 Fix a quick renderer bug 2019-07-11 16:12:40 -07:00
Zach Fox
4c7d0fc6f4 Updated layout 2019-07-11 14:46:05 -07:00
Zach Fox
ce2b7e5baa Finish all of the logic and most of the layout 2019-07-11 12:05:13 -07:00
Zach Fox
2471a3eb72 Merge branch 'master' of github.com:highfidelity/hifi into newGraphicsSettings 2019-07-11 09:02:42 -07:00
Zach Fox
4caa00d6cc Start BUGZ-814: Start working on a new Graphics dialog for Metaverse version of Interface 2019-07-10 16:42:48 -07:00
Howard Stearns
7eaa29c147
Merge pull request #15904 from howard-stearns/new-account-wallets-in-simplified-ui
new-account wallets in simplified UI
2019-07-10 15:09:59 -07:00
Howard Stearns
4191c37f6e indentation 2019-07-09 14:48:17 -07:00
Howard Stearns
79a3d45eae new-account wallets in simplified UI 2019-07-09 14:25:11 -07:00
Zach Fox
d622e53458 Some comments; changed the code to be backwards compatible 2019-07-08 17:10:11 -07:00
Zach Fox
5048b8bd89 Implement DEV-218 & DEV-219 and commit a starting point for the Emote app 2019-07-08 16:46:58 -07:00
Jamil Akram
aa82c4e971
Merge pull request #15806 from dooglifeSF/idles_talks_locomotion_improvements
Idles talks locomotion improvements
2019-07-08 13:30:51 -07:00
Zach Fox
243733028b
Merge pull request #15891 from zfox23/SUI/audioIOAboutSwitch
BUGZ-923: Fix an edge case in Audio I/O devices in Settings -> About
2019-07-05 12:59:56 -07:00
Zach Fox
38ad93a7ed BUGZ-917: Fix log spam in NameCard.qml due to errant line of code 2019-07-05 12:24:05 -07:00
Zach Fox
4223800af7 BUGZ-923: Fix an edge case in Audio I/O devices in Settings -> About 2019-07-05 12:17:28 -07:00
Zach Fox
1f54f3c159 BUGZ-911: Place selected audio I/O information in About tab and in 'Copy to Clipboard' clipboard text 2019-07-03 12:49:23 -07:00
Zach Fox
b8485361ce
Merge pull request #15858 from zfox23/PTTDuckingSlider
DEV-194: Iterate on PTT Ducking Slider design
2019-07-01 12:00:17 -07:00