Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-22 14:13:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
79542 commits 75 branches 59 tags 1.2 GiB
Commit graph

6327 commits

Author SHA1 Message Date
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
Zach Fox
78fdd2d673 Fix BUGZ-336 2019-05-23 14:25:06 -07:00
Zach Fox
da011fd042 Fix BUGZ-312; fix BUGZ-311 2019-05-23 13:37:25 -07:00
Zach Fox
4bbbaa8c19 Merge branch 'master' of github.com:highfidelity/hifi into SUI/audioListFixes 2019-05-23 09:39:38 -07:00
Zach Fox
934ea76966
Merge pull request #15613 from zfox23/SUI/newAudioProperties 
Fix the janky audio output settings UI
 2019-05-22 16:45:02 -07:00
Zach Fox
d75fe04038 Fix BUGZ-311 2019-05-22 16:24:40 -07:00
Zach Fox
8df706abcb Handle the case when the user doesn't have any avatars yet 2019-05-22 15:51:46 -07:00
Zach Fox
3ed47b4f23 Show error states in Avatar app (BUGZ-310) 2019-05-22 15:45:18 -07:00
Zach Fox
46ee148a69 Fix a bug and remove magic numbers 2019-05-22 15:24:33 -07:00
Zach Fox
3a4bf2e8f7 Fix the janky audio output settings UI 2019-05-22 14:27:06 -07:00
Zach Fox
ddb299a387
Merge pull request #15608 from zfox23/SUI/envVol 
Fix environment volume slider (BUGZ-213); optimize sliders
 2019-05-22 14:11:57 -07:00
Zach Fox
30c13fd988 Fix environment volume slider (BUGZ-213); optimize sliders 2019-05-22 12:01:38 -07:00
Zach Fox
6f7557b00d Implement BUGZ-305 and BUGZ-306 2019-05-22 09:56:28 -07:00
SamGondelman
b92e26722c rebake default skybox 2019-05-21 15:58:46 -07:00
SamGondelman
a672b79cd8 add version to default skybox 2019-05-21 15:35:43 -07:00
Zach Fox
5749392e83 New bg color; Final status indicator design; Fixed HMD icon 2019-05-21 14:10:27 -07:00
Zach Fox
15bdb66943 Integrate Status into top bar; improve Audio settings; improve spacing between settings 2019-05-17 17:25:48 -07:00
Zach Fox
e40e34856b Remove some extra menus from top bar; Only show VR button if headset connected 2019-05-17 13:28:59 -07:00
Zach Fox
70a4d6e8d5 Implement Performance settings and VR mode top bar switch 2019-05-16 16:15:05 -07:00
Zach Fox
90a5b25600 A bunch of changes here 2019-05-16 14:18:04 -07:00
Zach Fox
a9bc7c8806 Images, not glyphs 2019-05-15 17:14:02 -07:00
Zach Fox
966965af5b
Merge pull request #15538 from zfox23/simplifiedUI 
Simplified UI v1
 2019-05-14 17:45:30 -07:00
Howard Stearns
a9635a2c9a
Merge pull request #15551 from roxanneskelly/queueDepthDebug 
Queue depth debugging code
 2019-05-14 17:32:53 -07:00
Howard Stearns
ee97e2faa1
Merge pull request #15559 from SimonWalton-HiFi/avatar-theft-challenge 
Allow for delayed challenges if salt is empty
 2019-05-14 16:53:12 -07:00
Zach Fox
971e07c646 update spacing between settings 2019-05-14 16:44:25 -07:00
Zach Fox
bbd3d0fab5 Remove settings subtitles 2019-05-14 16:39:48 -07:00
Roxanne Skelly
a7595496f6 CR fixes 2019-05-14 16:39:39 -07:00
Zach Fox
e3bec7ef2a CR Round 1 - thanks Milad 2019-05-14 16:29:03 -07:00
Roxanne Skelly
fad7fa4c07 Merge branch 'master' of https://github.com/highfidelity/hifi into queueDepthDebug 2019-05-14 16:25:10 -07:00
Simon Walton
e768beb9b1 Allow for delayed challenges if salt is empty 2019-05-14 15:53:35 -07:00
Brad Hefta-Gaub
7440ef3cf3
Merge pull request #15506 from SaracenOne/unify_primitives 
Case 19510: Unify cube and sphere edit menu entries into one.
 2019-05-14 15:31:06 -07:00
Zach Fox
f9b51df296 Reduce size of output muted overlay; restore scroll to 0 on settings tab switch 2019-05-14 15:05:26 -07:00
Zach Fox
f43c376a6a Tweak top bar 2019-05-14 12:41:56 -07:00
Zach Fox
8724cf4edf UIT TextField 2019-05-14 12:27:33 -07:00
Zach Fox
2080aa6676 Some fun motion for experimentation 2019-05-14 11:56:07 -07:00
Zach Fox
cf46f3c9d4 CheckBox UIT and CheckBox added to Avatar app 2019-05-14 11:50:07 -07:00
Zach Fox
89006cd9c5 Hide controls in top left; don't remove certain menus; fixup slider UIT 2019-05-13 17:26:19 -07:00
Zach Fox
7bb2d6871b Simlpified Slider (not totally working; position is off) 2019-05-13 15:58:04 -07:00
Roxanne Skelly
72fe3a66f5 Debugging code to monitor the queue depth for a few critical threads 2019-05-13 15:56:55 -07:00
Zach Fox
f799f96fba simplifiedUI UIT switch 2019-05-13 13:04:12 -07:00
Zach Fox
feb5021372 UIT RadioButton 2019-05-13 11:07:39 -07:00
Zach Fox
112e13383b Dock it! 2019-05-10 12:03:29 -07:00
Zach Fox
314c04ab96 Simplified UI v1 2019-05-10 10:49:25 -07:00
Wayne Chen
845ad38106
Merge pull request #15503 from wayne-chen/useThresholdMutedWarning 
Case 22447: The "MUTED" indicator (which warns when talking while muted) constantly flickers
 2019-05-06 13:55:59 -07:00
Saracen
43ddf7ca23 Unify cube and sphere edit menu entries into one. 2019-05-02 22:40:11 +01:00
Wayne Chen
d31ed9ac22 adding timer for muted warning 2019-05-02 12:23:58 -07:00
Simon Walton
60389017a4 Merge from master, including avatar protocol change 
Tony had added HandController version-type.
 2019-04-26 18:51:41 -07:00
Simon Walton
1fe8f4332f Fixes to banner; swap out avatar on client; reviewer comments; other WIP 2019-04-26 18:45:48 -07:00
Sam Gateau
c647bbcb16
Merge pull request #15400 from danteruiz/throttle-refresh-rate 
Case 22253: Refresh Rate Controller
 2019-04-26 12:04:39 -07:00
danteruiz
b60e35040e another round of CR 2019-04-26 10:08:06 -07:00
Anthony Thibault
93b03a588f
Merge pull request #15445 from amantley/AnimRandomSwitchSquash 
AnimRandomSwitch class for random idle implementation
 2019-04-26 10:06:37 -07:00
Angus Antley
395a4cc9c4 added final animations and json to the resource 2019-04-25 19:14:31 -07:00
Shannon Romano
d0108301a0
Merge pull request #15410 from wayne-chen/fixMuteWarningSwitchText 
Case 22297: Fix Mute Warning Switch Text
 2019-04-25 17:11:45 -07:00
danteruiz
9e1671a1bf making requested changes 2019-04-25 16:02:12 -07:00
Angus Antley
27ed468946 made changes requested 2019-04-25 14:42:41 -07:00
Simon Walton
f3efee56c0 Merge remote-tracking branch 'upstream/master' into avatar-verification 2019-04-25 13:40:27 -07:00
Sam Gondelman
ef64de7c04
Merge branch 'master' into openurl 2019-04-25 13:21:27 -07:00
Thijs Wenker
cdcdae2fda
Merge pull request #15393 from ctrlaltdavid/M22188 
Update Record app per Marketplace certification requirements
 2019-04-25 20:00:13 +02:00
Angus Antley
baca58360e updated json and talk_righthand anim 2019-04-25 09:50:12 -07:00
Angus Antley
ea173b8d61 more time for talk ease in and updated json random choice times 2019-04-24 21:29:55 -07:00
Simon Walton
de97af5c02 Minimal working version for avatar's client 
Also merge of Wayne's proof-of-concept
 2019-04-24 17:42:51 -07:00
SamGondelman
31b3f0e8f1 possible fix for openUrl exploit 2019-04-24 16:39:31 -07:00
Shannon Romano
404be42bfb
Merge pull request #15409 from wayne-chen/fixShieldIconBehavior 
Case 22290: Fixing Shield Icon Behavior in Desktop Mode
 2019-04-24 16:35:02 -07:00
Dante Ruiz
0bdc37859d Refresh Rate Controller 2019-04-24 16:16:08 -07:00
Angus Antley
eb0506ee12 updated json 2019-04-24 14:58:30 -07:00
Angus Antley
45f4cb2018 added animation files and updated ease in function in rig 2019-04-24 14:56:38 -07:00
amantley
7f3101eefb working on the ease in function for the talk idle 2019-04-23 18:13:15 -07:00
Wayne Chen
464e5924d6 changing method name to reflect recent change in code 2019-04-23 16:59:12 -07:00