Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-25 09:49:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
80673 commits 74 branches 59 tags 1.2 GiB
Commit graph

6494 commits

Author SHA1 Message Date
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
Zach Fox
73db19464f DEV-194: Iterate on PTT Ducking Slider design 2019-07-01 11:28:48 -07:00
Preston Bezos
ef674a5934 removed permission for qml to access webcam and mic 2019-06-28 15:23:50 -07:00
Zach Fox
8af469992e BUGZ-858: Implement 'Reduce Other Volume While Pushing-to-Talk' option 2019-06-27 15:55:58 -07:00
dooglifeSF
7856ab611f rig shoulder rotation order fixed, animations batch converted and polished, json updated with new ranges for side steps, tabs converted to spaces 2019-06-27 11:37:05 -07:00
Zach Fox
6e4b9c1723
Merge pull request #15774 from PrestonB1123/iconChanges 
New Top Bar Icons
 2019-06-26 11:01:12 -07:00
Preston Bezos
f0dd28e71a removed extra line 2019-06-26 09:54:43 -07:00
dooglifeSF
9f8d1dd51d Merge branch 'master' into idles_talks_locomotion_improvements 2019-06-26 09:31:23 -07:00
Preston Bezos
bd3fe8a092 fixed conflict and spacing 2019-06-26 09:12:32 -07:00
Sam Gateau
48f9c33bdd
Merge pull request #15822 from samcake/yellow 
BUGZ-664: Introduce scaling of rendering for forward renderer
 2019-06-25 14:27:17 -07:00
Zach Fox
b7a3d82f0f DEV-170: Increase the speed of the animation when clicking between tabs in Settings 2019-06-25 11:30:25 -07:00
Preston Bezos
1481c7424f changed ptt muted icon 2019-06-25 11:02:44 -07:00
Preston Bezos
5686f51171 fixed hmd settings buttons spacing 2019-06-25 09:19:30 -07:00
Sam Gateau
b0ebcc745d Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-06-24 15:36:28 -07:00
Zach Fox
3e2e020731 BUGZ-746: About tab: Better CPU/GPU info reporting; New copied info (including OS version) 2019-06-24 12:48:13 -07:00
Sam Gateau
aa160c4d0f Improving presentation of stats & debug information 2019-06-21 16:17:28 -07:00
dooglifeSF
3d92875eb5 add spine twist during transitions in/out of alt idle to help when talking is overlayed 2019-06-21 10:39:53 -07:00
dooglifeSF
e25913f136 fix finger collapse in talks and idles - caused by finger joints bending more than 90 degrees in Y 2019-06-20 16:05:18 -07:00
Anthony J. Thibault
3a6d8dc383 Disable handTouch.js to prevent finger twitching 
This PR disables handTouch.js.
handTouch.js allows the fingers to animate on the surface of an object.
However, it can sometimes detect collisions with walls or tables when the avatar is standing next to them.
We will more properly fix handTouch.js in a future PR, but for now we will disable the functionality.

Also, a small bug fix was made to the Rig to prevent the idleOverlayAlpha from exceeding the 0.0 to 1.0 range.
This can cause the fingers to bend incorrectly for a moment.

Also, three new items were added to the Developer > Show Animation Stats panel.

* Joint Override Count: displays the current count of joints that are overriden by MyAvatar.setJointRotation() JS API calls.
* Flow: displays if flow is active of disabled.
* Network Graph: displays if the network anim graph, used for teleportation, is enabled or disabled.

https://highfidelity.atlassian.net/browse/BUGZ-154
 2019-06-20 15:52:36 -07:00
dooglifeSF
12b7cb0262 merge dooglifeSF master into branch Merge branch 'master' into idles_talks_locomotion_improvements 2019-06-20 09:01:59 -07:00
dooglifeSF
3eef23fe98 change base idle more frequently, add more motion to idle02, improve head movements in talks, add head movement to talk_armsdown 2019-06-19 16:19:42 -07:00
RebeccaStankus
30dd667b17 Changed qml import method 2019-06-19 10:40:32 -07:00
RebeccaStankus
feaea12b24 Merge branch 'master' of github.com:highfidelity/hifi into migrateEditFiles 2019-06-19 10:14:04 -07:00
dooglifeSF
4be42a4b9b Merge branch 'master' into idles_talks_locomotion_improvements 2019-06-19 09:57:04 -07:00
dooglifeSF
255777c82d bring latest changes to idles, locomotion and animation json into hifi from hifi-animation 2019-06-19 09:49:42 -07:00
Zach Fox
18f703ee43 BUGZ-732: Enable text selection by mouse in Profile/Display Name field 2019-06-18 14:11:14 -07:00
Zach Fox
f6822f17a9 Add computer description 2019-06-18 12:43:45 -07:00
Zach Fox
bd02a5eafd Better text formatting 2019-06-18 12:29:52 -07:00
Zach Fox
4670c11397 Tighten up the graphics on level 3 2019-06-18 12:26:03 -07:00
Zach Fox
ec4fc672b6 Better design; Interface version 2019-06-18 12:09:37 -07:00
Zach Fox
34def0fd6b DEV-145: About screen for platform info 2019-06-18 11:09:15 -07:00
dooglifeSF
ae2c381aaa Merge branch 'master' into idles_talks_locomotion_improvements 2019-06-18 09:42:18 -07:00
RebeccaStankus
cd508a5475 Merge branch 'master' of github.com:highfidelity/hifi into migrateEditFiles 2019-06-18 09:10:41 -07:00
RebeccaStankus
5a49ac9a22 moved files 2019-06-17 16:45:54 -07:00
Zach Fox
32aec78ea2
Merge pull request #15782 from zfox23/SUI/resizeSignal 
BUGZ-699: Make PSFListModel fetch early when making container bigger
 2019-06-17 15:27:21 -07:00
Zach Fox
9cb4ad61ee BUGZ-699: Make PSFListModel fetch early when making container bigger 2019-06-17 15:06:20 -07:00
Preston Bezos
538b15dd57 caught a couple of edge cases for mic states 2019-06-17 13:20:25 -07:00
Preston Bezos
7879dbf687 changed width of ptt muted icon 2019-06-17 13:13:43 -07:00
Zach Fox
1d2ed1985f DEV-142 & DEV-140: Scrollbars in Your Profile and Settings 2019-06-17 12:35:45 -07:00
Preston Bezos
bd78dd96a0 replaced icons with icons that are on the whole pixel so as not to cause blur 2019-06-17 11:05:47 -07:00
dooglifeSF
1c1807a80c Merge branch 'master' into idles_talks_locomotion_improvements 2019-06-17 10:44:11 -07:00
Preston Bezos
a954ef6068 Merge branch 'master' of github.com:highfidelity/hifi into iconChanges 2019-06-17 10:43:43 -07:00
Preston Bezos
d9f1aa73ba switched top bar icons and changes input device meter to be in icon instead of in bar 2019-06-17 09:12:32 -07:00
dooglifeSF
51b5f6093a locomotion and idles bug fixes, json updated with correct values, AnimStats.cpp on screen debug text timeout pushed to 20 seconds 2019-06-17 08:58:15 -07:00
Shannon Romano
e6ea4839e0
Merge pull request #15770 from zfox23/SUI/autoChangeAvatar3 
BUGZ-658: Actually write some code that doesn't let the user switch avatar models to Woody
 2019-06-13 17:55:59 -07:00
Shannon Romano
d6859a42d9
Merge pull request #15762 from annabrewer/quest-login-keybrd 
BUGZ-531: Quest tablet login missing keyboard
 2019-06-13 16:44:49 -07:00
Zach Fox
503fc18d70 Make this slightly more robust 2019-06-13 16:08:29 -07:00
Zach Fox
fcda85a3d1
Merge pull request #15759 from zfox23/SUI/autoSwitchAvatar2 
BUGZ-658: Don't let the user switch avatar models to Woody
 2019-06-13 10:55:55 -07:00
Zach Fox
289e948d6b BUGZ-671: Make 'Your Profile' Home button go to bookmark 'hqhome' 2019-06-13 10:27:18 -07:00
Zach Fox
4ccd7bd808 BUGZ-658: Don't let the user switch avatar models to Woody 2019-06-13 10:17:14 -07:00
Anna
4b30065ad1 fixed keyboard on quest login and cleaned up qml files 2019-06-12 15:17:37 -07:00
Preston Bezos
038747e645 Merge branch 'master' of github.com:highfidelity/hifi into moreToolbarTinkering 2019-06-12 14:55:37 -07:00
Preston Bezos
34e9acc0b5 better fix for the toolbar remnant 2019-06-12 14:31:43 -07:00
Zach Fox
6fed581452 DEV-128: Update settings screen with latest design 2019-06-12 14:22:02 -07:00
Zach Fox
fade8f9c04 It works! 2019-06-12 12:47:48 -07:00
Zach Fox
51c2cc793a Tinkering with toolbar visibility signal - not quite working 2019-06-12 10:26:32 -07:00
Shannon Romano
b9e2443451
Merge pull request #15700 from ctrlaltdavid/DOC-63 
DOC-63: Tablet JSDoc
 2019-06-11 16:51:08 -07:00
Zach Fox
a88023469b
Merge pull request #15737 from zfox23/SUI/developerMenu 
DEV-122: Add a developer menu in Settings
 2019-06-11 13:32:14 -07:00
Zach Fox
7bdd3084e9 DEV-122: Add a developer menu in Settings 2019-06-11 12:56:14 -07:00
Zach Fox
97c4726e1e
Merge pull request #15736 from zfox23/SUI/autoSelectAvatar 
BUGZ-610: Auto-select the first avatar from your inventory if you have avatars in your inventory
 2019-06-11 11:50:55 -07:00
Zach Fox
db2ce822b7 BUGZ-610: Auto-select the first avatar from your inventory if you have avatars in your inventory 2019-06-11 10:52:45 -07:00
Zach Fox
2d4ba92eeb Implement BUGZ-633: Change 'Graphics Preset' 2019-06-11 09:58:01 -07:00
Zach Fox
b62ab2ea82
Merge pull request #15731 from zfox23/SUI/forwardKeyEvents 
Implement BUGZ-226: Forward keypresses made while Top Bar is in focus
 2019-06-11 07:52:11 -07:00
Zach Fox
9a926abd76 Implement BUGZ-226: Forward keypresses made while Top Bar is in focus 2019-06-10 20:27:03 -07:00
Anthony J. Thibault
7ce5f7ac0b Adjust run and jog anims to better align head with 1p camera 
Added adjust forward run and jog animations to better align with first person camera.
In some instances, such as looking down, you could sometimes see your body lead your camera.

https://highfidelity.atlassian.net/browse/BUGZ-240
 2019-06-10 16:27:03 -07:00
Shannon Romano
1748d0527f
Merge pull request #15698 from samcake/nut 
BUGZ-544: Refine the LOD manager target rate with the Refreshrate current target
 2019-06-10 13:10:56 -07:00
Sam Gateau
32399997b1 Merge branch 'master' of github.com:highfidelity/hifi into nut 2019-06-10 10:52:53 -07:00
Anna
fd872009fe added workaround for bug in Qt StackView push method 2019-06-10 09:25:12 -07:00
Anna
67775c59f1 Merge branch 'master' of github.com:highfidelity/hifi 2019-06-10 08:55:48 -07:00
Anthony Thibault
d6331d1bf6
Merge pull request #15714 from hyperlogic/bug-fix/settings-on-tablet 
Fix crash using Settings in the Tablet in VR
 2019-06-07 18:15:56 -07:00
Anna
0b282b201c typo fix 2019-06-07 18:01:47 -07:00
Sam Gateau
2d9a7f7c4f Refined the capping of the LOD Target Rate to be the lower REfreshrate when FOcus-inactive, this prevent the panic attacks of the LOD system on low end hardware 2019-06-07 17:00:37 -07:00
Anthony J. Thibault
00bba828ee Fix crash using Settings in the Tablet in VR 
This was introduced in Qt5.12.3.  There are several issues in their bug tracker about this issue.

https://bugreports.qt.io/browse/QTBUG-75516
https://bugreports.qt.io/browse/QTBUG-75335

To workaround this, we call Qt.createComponent() manually, instead of letting StackView do it for us.
 2019-06-07 16:41:56 -07:00
Preston Bezos
a0753f6393 removed ctrl+b and ctrl+n as shortcuts 2019-06-07 15:41:44 -07:00
PrestonB1123
f3f0c4de43
Merge pull request #15688 from PrestonB1123/PushToTalk 
DEV-94: Push to Talk
 2019-06-06 16:49:08 -07:00
Sam Gateau
4c18ce7ae6
Merge pull request #15693 from sabrina-shanman/bug_avatar_res-state 
(BUGZ-559) Improve transition debugging and transition clean-up
 2019-06-06 16:35:04 -07:00
David Rowe
beb70988c3 Tablet and related JSDoc 2019-06-07 08:34:53 +12:00
sabrina-shanman
971d563f49 Add debug icons for transitions 2019-06-06 13:25:06 -07:00
Zach Fox
fa2217c188 DEV-113: Remove headphones icon from status indicator in top bar 2019-06-06 12:20:43 -07:00
Preston Bezos
2592784814 Changed InputDeviceButton to unmute on push and hold while in push to talk mode 2019-06-06 09:19:32 -07:00
Zach Fox
326d1615e0 Change old UI too 2019-06-05 14:07:10 -07:00
Zach Fox
0ba849d65b BUGZ-530: Rename 'System Sounds' to 'UI FX' 2019-06-05 13:25:28 -07:00
Brad Hefta-Gaub
52d02f61a1
Merge pull request #15657 from zfox23/newPerformanceAPI 
BUGZ-447: Use new performance preset API
 2019-05-31 15:31:07 -07:00
Zach Fox
97bd0d5413 Make this work! 2019-05-31 12:50:32 -07:00
Zach Fox
7b04a6d361 Sounds 2019-05-31 12:39:13 -07:00
Zach Fox
8b085c79ad Can't use window.location in QML 2019-05-31 12:36:28 -07:00
Zach Fox
b9b320d01c DEV-92: Add a Home button to the Avatar app 2019-05-31 11:43:13 -07:00
Zach Fox
8e5c94abb0 BUGZ-447: New performance preset API 2019-05-31 11:08:51 -07:00
Zach Fox
92b944464a Fix BUGZ-146: Clicking on the gear icon causes three click sounds 2019-05-28 12:41:58 -07:00
Zach Fox
6cf2145c16 Fix BUGZ-312; BUGZ-311 2019-05-24 12:58:38 -07:00
Zach Fox
51d22c1988 Fix BUGZ-344 2019-05-24 12:12:55 -07:00
Sam Gateau
a5d17883d0
Merge pull request #15602 from SamGondelman/tests 
BUGZ-21, Case 22219: Fix skyboxes/ambient maps on AMD
 2019-05-24 11:29:04 -07:00
Shannon Romano
aaf4bef34e
Merge pull request #15625 from zfox23/SUI/BUGZ-336 
Fix BUGZ-336: Microphone test does not stop unless you press the button to "stop test"
 2019-05-23 15:17:37 -07:00