Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-30 13:42:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
82832 commits 71 branches 56 tags 1.2 GiB
Commit graph

5087 commits

Author SHA1 Message Date
Zach Fox
10352f1cb2 New placeholder text color 2019-09-19 13:38:37 -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
Zach Fox
5e96ce8822 DEV-152: Implement 'Smooth/Snap Turn' setting in SimplifiedUI > Settings > VR 2019-09-19 09:48:11 -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
Zach Fox
60f4189eb3 BUGZ-1485: Fix Copyright date in About dialog 2019-09-17 11:36:12 -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
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
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
RebeccaStankus
33b78bea4f Changed textField module sounds 2019-09-09 10:36:35 -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
Brad Davis
31340d278a Add test for local file access 2019-08-29 13:45:43 -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
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
Zach Fox
330b8ceb91 Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd 2019-08-22 10:24:00 -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
bb97b4f866 Fix BUGZ-1303: Make 'View All Controls' go to knowledge base 2019-08-20 11:17:05 -07:00
Zach Fox
0cc28c58ae DEV-415: Implement Support tab in Help app 2019-08-20 10:54:58 -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
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
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
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
sabrina-shanman
8347d9d23e Update LODManager setter in TabletLODTools.qml 2019-08-08 13:59:50 -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
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
2a4c0a3ecd BUGZ-1103: Use 'Master GPU' information in About screen 2019-08-06 14:13:31 -04:00
milad
d1efbc051a working UI 2019-08-04 15:11:55 -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
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
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
milad
2ea8b9efa4 changed root to micBar which had the gated property 2019-07-29 14:05:55 -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
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
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
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
1cd136f178 Fix BUGZ-814 in VR mode: Add a top margin to tablet graphics settings 2019-07-16 15:15:08 -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
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
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
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
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
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
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
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
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
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