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
