Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-13 06:47:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
79869 commits 76 branches 59 tags 1.2 GiB
Commit graph

29823 commits

Author SHA1 Message Date
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
Andrew Meadows
ce96ea5bf8 more correct rebuild OtherAvatar detailed pickable shapes 2019-06-17 11:20:42 -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
David Rowe
351bb3b934 Fix JSDoc naming of some Test API functions 2019-06-15 10:44:55 +12:00
Sam Gateau
c0d64ce4e2 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-06-13 18:43:34 -07:00
Shannon Romano
491af66a0e
Merge pull request #15767 from sethalves/fix-drawcalls-stat 
BUGZ-686: fix drawcalls stat broken in pr-15721
 2019-06-13 17:57:01 -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
Sam Gateau
4ba34f9a85 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-06-13 17:42:52 -07:00
Sam Gateau
5288314d02 Drafting ways to rescale in forward 2019-06-13 17:42:32 -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
Seth Alves
431ff0d1de fix drawcalls stat broken in pr-15721 2019-06-13 15:35:08 -07:00
Shannon Romano
b4f708f4ad
Merge pull request #15755 from samcake/nut 
BUGZ-637: Detecting the problematic GPU on MAC not running properly Deferred render method right now
 2019-06-13 14:32:36 -07:00
Shannon Romano
a37ce9f89d
Merge pull request #15754 from AndrewMeadows/fix-crash-bugz512 
BUGZ-512: avoid MacOS crash on shutdown: destroy WebSurfaces before exit
 2019-06-13 12:13:04 -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
431ec0bfd0
Merge pull request #15760 from zfox23/SUI/betterHomeBookmark 
BUGZ-671: Make 'Your Profile' Home button go to bookmark 'hqhome'
 2019-06-13 10:49:58 -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
luiscuenca
20b17291b4 Reset detailed motion states when the workload zone changes 2019-06-13 09:05:55 -07:00
Sam Gateau
fbab3fcde9 Merge branch 'master' of github.com:highfidelity/hifi into nut 2019-06-12 19:15:25 -07:00
Sam Gateau
b2feb0f920 Add specific caps for the render method deferred from the platform profiler, to prevent bad choice on mac book air 2019-06-12 16:48:36 -07:00
Andrew Meadows
eee52deefe destroy WebSurfaces on shutdown 2019-06-12 16:07:15 -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
Brad Hefta-Gaub
35cdd19456
Merge pull request #15721 from sethalves/quiet-asan-gpu-stats 
BUGZ-623: Quiet asan gpu stats
 2019-06-12 09:02:13 -07:00
David Rowe
29079b9221 Miscellaneous JSDoc improvement 2019-06-12 19:15:29 +12:00
David Rowe
93d42917b0 Revise JSDoc for new MyAvatar signals 2019-06-12 19:15:14 +12:00
Shannon Romano
b9e2443451
Merge pull request #15700 from ctrlaltdavid/DOC-63 
DOC-63: Tablet JSDoc
 2019-06-11 16:51:08 -07:00
Shannon Romano
453085f992
Merge pull request #15741 from huffman/feat/set-and-get-bookmarks 
BUGZ-484: Add --setBookmark and getAddress API
 2019-06-11 15:31:41 -07:00
jennaingersoll
1935b49538
Merge pull request #15676 from ctrlaltdavid/DOC-33 
DOC-33: MyAvatar API JSDoc catch-up
 2019-06-11 15:05:06 -07:00
Ryan Huffman
a1b7392854 Add --setBookmark and getAddress API 2019-06-11 14:10:09 -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
Seth Alves
cd1c782aa8 fix warning 2019-06-11 12:54:40 -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
9932b1da57
Merge pull request #15734 from zfox23/SUI/recommendedGraphics 
Implement BUGZ-633: Change 'Graphics Preset'
 2019-06-11 11:24:52 -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
dante ruiz
01fab12942 fixing interface and laucnher script argument 2019-06-11 09:18:20 -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
Andrew Meadows
250a4490d2
Merge pull request #15728 from hyperlogic/bug-fix/adjust-run-fwd-animations 
Adjust run and jog anims to better align head with 1p camera
 2019-06-10 17:37:33 -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
Andrew Meadows
dbce976887 fix another crash in MyAvatar::getAvatarEntitiesVariant() 2019-06-10 15:34:18 -07:00
Sabrina Shanman
2b90d841b7
Merge pull request #15722 from sabrina-shanman/crash_no-display-plugin 
(BUGZ-563) Fix crash using null DisplayPlugin in GraphicsEngine
 2019-06-10 14:54:11 -07:00
sabrina-shanman
a400cea040 Fix crash when using null DisplayPlugin in GraphicsEngine during shutdown 2019-06-10 14:00:05 -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
c39218c1f4 Addressing the review comment about an if else statement syntax 2019-06-10 11:59:09 -07:00
Anthony Thibault
5ea65c0a5a
Merge pull request #15717 from annabrewer/qml-stackview-push-workaround 
BUGZ-297: QT - Crash when opening a menu that spawns a desktop popup window while in VR (running scripts, settings, etc)
 2019-06-10 11:01:10 -07:00
Sam Gateau
32399997b1 Merge branch 'master' of github.com:highfidelity/hifi into nut 2019-06-10 10:52:53 -07:00
Sam Gondelman
53e6e00773
Merge branch 'master' into uber 2019-06-10 10:36:54 -07:00
Shannon Romano
69094aa8f3
Merge pull request #15715 from kencooke/audio-injecctor-shutdown-crashfix 
BUGZ-399: Fix shutdown crash in AudioInjectorManager::stop()
 2019-06-10 10:12:26 -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
Shannon Romano
e213fd6b5e
Merge pull request #15712 from amerhifi/master 
case BUGS:560 . wrapping dependencyManager::get<ddeFacetracker>with ifdef
 2019-06-07 18:59:34 -07:00
Ken Cooke
9d57f5ac62 Defer DependencyManager::destroy<AudioInjectorManager>() until all ScriptAudioInjectors have been destroyed 2019-06-07 18:35:39 -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
PrestonB1123
059d931d17
Merge pull request #15711 from PrestonB1123/removingShortcuts 
DEV-108: Removed ctrl+b and ctrl+n as shortcuts
 2019-06-07 16:26:38 -07:00
amer cerkic
b57e4869c8 removed debug info 2019-06-07 16:26:21 -07:00
amer cerkic
da071abd8b wrapping the dependencyManager::get<> call with ifdef to prevent the log from constantly spitting out that instance does not exist 2019-06-07 16:25:04 -07:00
Preston Bezos
a0753f6393 removed ctrl+b and ctrl+n as shortcuts 2019-06-07 15:41:44 -07:00
Shannon Romano
e4b26656d4
Merge pull request #15703 from amerhifi/master 
case : BUGZ 560: disabling dde initialization due to random crashes while closing down…
 2019-06-07 15:15:46 -07:00
amer cerkic
f2c6cb79f7 if formatting 2019-06-07 14:17:49 -07:00
amer cerkic
049ff8e618 fixed last space 2019-06-07 14:11:13 -07:00
amer cerkic
c61f0bcf3e more vs cleanup 2019-06-07 14:07:06 -07:00
amer cerkic
64534913af more vs changes udo 2019-06-07 13:59:18 -07:00
amer cerkic
fd7dd7948f reverted vs spacing changes 2019-06-07 13:41:14 -07:00
amer cerkic
9498e0a462 addressing comment concerning preferences 2019-06-07 12:47:04 -07:00
Preston Bezos
e89f499c1a this should work 2019-06-07 12:02:15 -07:00
Preston Bezos
4eccb7a124 Revert "made one more change to get rid of ubuntu warning" 
This reverts commit e7255298de.
 2019-06-07 12:00:36 -07:00
Preston Bezos
e7255298de made one more change to get rid of ubuntu warning 2019-06-07 11:59:26 -07:00
Preston Bezos
27de181d0c Merge branch 'master' of github.com:highfidelity/hifi into logspam 2019-06-07 11:54:48 -07:00
Preston Bezos
ad562b8f91 really need to stop clanging myself 2019-06-07 11:22:11 -07:00
Preston Bezos
e63d98e137 fixed a couple of doc errors and accounted for some edge cases 2019-06-07 11:09:21 -07:00
Preston Bezos
3ab4be6b8d I got clanged 2019-06-07 10:42:31 -07:00
amerhifi
b1df463f56 disabling dde initialization due to random crashes while closing down the socket connection on mac 2019-06-07 10:16:36 -07:00
Shannon Romano
1e827a925a
Merge pull request #15699 from SamGondelman/avatarPick 
BUGZ-373, BUGZ-407: Put avatar spheres in R3 in simulation
 2019-06-07 09:59:42 -07:00
Sam Gateau
07ddc535a0 Merge branch 'master' of github.com:highfidelity/hifi into nut 2019-06-07 09:32:50 -07:00
SamGondelman
3bb645b2d7 put avatar spheres in r3 in simulation 2019-06-06 17:17:18 -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
d406e52d71 Messing around 2019-06-06 16:37:49 -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
Preston Bezos
a7a765b025 added a couple more notifies and fixed a couple of jsdocs 2019-06-06 16:23:54 -07:00
Zach Fox
b737e31421
Merge pull request #15696 from zfox23/emitWhenDocking 
Fix BUGZ-201: Prevent MUTED banner from being cut off when muted on startup
 2019-06-06 15:45:32 -07:00
Preston Bezos
36e1366cc4 added Notifies to various QProperties in order to remove warnings in interface logs 2019-06-06 14:51:43 -07:00
Zach Fox
a7ad087bd0 Fix BUGZ-201: Prevent MUTED banner from being cut off when muted on startup 2019-06-06 14:23:18 -07:00
Sabrina Shanman
73ac38a6a6
Merge pull request #15686 from samcake/nut 
BUGZ-442: Adding extra check when setting Performance & render api enums
 2019-06-06 13:58:09 -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
sabrina-shanman
833946ceb3 Clean up transition naming 2019-06-06 13:25:06 -07:00
Sam Gateau
ae4edebcbc Merge branch 'master' of github.com:highfidelity/hifi into nut 2019-06-06 12:29:33 -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
Sam Gateau
afdc323622 Merge branch 'nut' of github.com:samcake/hifi into nut 2019-06-05 17:56:34 -07:00
Sam Gateau
9bc6c3bfcd INtroduce range check for int value against the several enums we exposed through the js api for REnder and PErformance settings 2019-06-05 17:56:14 -07:00
David Rowe
caf29dc45a Doc review 2019-06-06 11:24:10 +12:00
Shannon Romano
7e572cbfbc
Merge pull request #15682 from zfox23/NUI/systemSoundsLabel 
BUGZ-530: Rename 'System Sounds' to 'UI FX'
 2019-06-05 15:16:42 -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
David Rowe
6299d38673 Distinguish between Uuid API and Uuid type in JSDoc 2019-06-05 14:39:05 +12:00
David Rowe
f91c6dec3a Miscellaneous fixes noticed in passing 2019-06-05 08:38:52 +12:00
David Rowe
231d1373b6 Update MyAvatar, Avatar JSDoc per recent changes 2019-06-05 08:38:34 +12:00
Seth Alves
c5eb9c03d5 fix uninitialized read 2019-06-04 13:00:26 -07:00
Seth Alves
06436e6a7d quiet build warning 2019-06-04 13:00:26 -07:00
Sam Gateau
f51e491d85 Removing the atomics and fixing mistakes pointed out inreview 2019-06-04 10:11:12 -07:00
SamGondelman
6111c8a108 initial work on combining shader variants 2019-06-03 19:36:01 -07:00
Sam Gateau
2a4d0cfaec Addressing the initialization bug not applying REnderMethod properly, Adjusting RefrehRateProfile to Realtime in High performancePreset 2019-06-03 18:06:28 -07:00
Sam Gateau
db04f61c5b Merge branch 'master' of github.com:highfidelity/hifi into nut 2019-06-03 09:37:13 -07:00
Sam Gateau
54d1705f06 Testing a different approach 2019-05-31 18:42:26 -07:00
Sam Gondelman
d94b685c94
Merge pull request #15661 from SamGondelman/avatarCrash 
BUGZ-478: Fix address manager crash
 2019-05-31 16:01:07 -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
SamGondelman
e29bf376a4 fix address manager crash 2019-05-31 14:01:58 -07:00
Zach Fox
aefda30cf9
Merge pull request #15658 from zfox23/homeButton 
DEV-92: Add a Home button to the Avatar app
 2019-05-31 13:25:30 -07:00
Brad Hefta-Gaub
f7f17cfbff
Merge pull request #15659 from sabrina-shanman/bug_mac_framerate_minimized 
(BUGZ-416) Fix Application not checking window minimize state properly
 2019-05-31 13:22:56 -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
sabrina-shanman
fa79d0ec18 Fix Application not checking window minimize state properly 2019-05-31 11:36:52 -07:00
Zach Fox
8e5c94abb0 BUGZ-447: New performance preset API 2019-05-31 11:08:51 -07:00
Andrew Meadows
297517c85d minimize lock duration 2019-05-31 11:06:16 -07:00
Andrew Meadows
5f9262cf5e change data member names to not poke other devs in the eye 2019-05-31 11:03:11 -07:00
Sam Gateau
4e2480d032 cleaning up case of enum names and aligning the PerformancePreset with the PlatformTier 2019-05-31 00:00:44 -07:00
Sam Gateau
916ff31cf6 adjust the preset options 2019-05-30 17:51:21 -07:00
Andrew Meadows
0c916e0c03 guard MyAvatar::_scriptEngine with mutex 2019-05-30 16:08:47 -07:00
Sam Gateau
bb7a182544 Merge branch 'nut' of github.com:samcake/hifi into nut 2019-05-30 12:03:58 -07:00
Sam Gateau
b88deb52b0 Cleaning up the interface for the Performance PRESET and the associated debug ui 2019-05-30 12:03:44 -07:00
Sam Gateau
3100fe4833 Merge branch 'master' of github.com:highfidelity/hifi into nut 2019-05-29 19:11:11 -07:00
Sam Gateau
a212a8a36a COnnect the profile tier to the performance setting and assign on first run or after reset... 2019-05-29 17:49:17 -07:00
Dante Ruiz
b0ace1c098
Merge pull request #15646 from huffman/feat/get-home-bookmark 
DEV-62: Add getHomeLocationAddress to bookmark API
 2019-05-29 17:35:40 -07:00
Sam Gateau
48ecb4265c re declare q_enum on platformProfile 2019-05-29 16:43:28 -07:00
Sam Gateau
2a42fb16da Merge branch 'master' of github.com:highfidelity/hifi into nut 2019-05-29 15:56:30 -07:00
Sam Gateau
bf7617ea8e INtroducing the PerformanceManager 2019-05-29 15:47:14 -07:00
Ryan Huffman
344410ea79 Add getHomeLocationAddress to bookmark API 2019-05-29 15:45:22 -07:00
Simon Walton
ecc3312114 Use unique_ptr for temp signature array 2019-05-29 12:17:07 -07:00
Sam Gateau
aedc631c45 Gathering all the needed settings in one place 2019-05-28 21:55:17 -07:00
Sam Gateau
0862e40b41 Adding ui to debug render settings 2019-05-28 18:01:39 -07:00
Shannon Romano
24049a4321
Merge pull request #15631 from SamGondelman/questKeyboard 
BUGZ-413: Re-enable Quest 3D Keyboard
 2019-05-28 15:55:25 -07:00
Shannon Romano
d065847bee
Merge pull request #15638 from samcake/nut 
case BUGZ-191: Implement patform tier profile from platform description
 2019-05-28 15:28:05 -07:00
Zach Fox
9c960f901c
Merge pull request #15641 from zfox23/BUGZ-146 
Fix BUGZ-146: Clicking on the gear icon causes three click sounds
 2019-05-28 15:02:23 -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
Sam Gateau
546639fdfe Adding a script and ui to check the values returned by the PlatformInfo ui 2019-05-26 12:30:50 -07:00
Sam Gateau
5001a04326 Updating the platform lib, implementing the first version of the profiler and exposing all these through the PlatformInfoScriptingInterface 2019-05-25 15:53:54 -07:00
Andrew Meadows
5988f8cce6 avoid calling removeOwnershipData() from multiple threads 2019-05-24 16:12:21 -07:00
Amer
9b26f70e2f
Merge pull request #15633 from amerhifi/master 
BUGZ 220: Docked Widget Whitelisting
 2019-05-24 15:52:18 -07:00
amerhifi
5a3585ea5b adressing pr comments 2019-05-24 14:36:42 -07:00
amerhifi
6f04e039fe adding whitelisting for dockedWidgets 2019-05-24 14:12:24 -07:00
SamGondelman
41e486b120 re-enable quest keyboard 2019-05-24 13:14:54 -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
amerhifi
ee3e2f0dd7 merge master 2019-05-24 11:00:30 -07:00
amerhifi
bd88a68a0f testing context passing to dockWidget via whitelisting. 2019-05-24 10:58:13 -07:00
Brad Hefta-Gaub
5765957fe1
Merge pull request #15618 from luiscuenca/addCredentials 
Pass tokens as params for automatic login
 2019-05-24 09:13:53 -07:00
luiscuenca
050682c84c
Keep logged in after first run 2019-05-23 19:53:37 -07:00
luiscuenca
42c1f4be33
fix typo and entry on first run when --url is set 2019-05-23 17:07:06 -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
Anthony Thibault
fecd488b4b
Merge pull request #15623 from AndrewMeadows/plug-otherAvatar-resource-leak 
BUGZ 345: avoid resource leak in AvatarManger::_otherAvatarsToChangeInPhysics
 2019-05-23 14:51:29 -07:00
Zach Fox
78fdd2d673 Fix BUGZ-336 2019-05-23 14:25:06 -07:00
Andrew Meadows
940c122f46 clear _otherAvatarsToChangeInPhysics after processing it 2019-05-23 13:38:54 -07:00
Zach Fox
da011fd042 Fix BUGZ-312; fix BUGZ-311 2019-05-23 13:37:25 -07:00
luiscuenca
8db3d03772
add display name as param 2019-05-23 10:21:47 -07:00
Zach Fox
4bbbaa8c19 Merge branch 'master' of github.com:highfidelity/hifi into SUI/audioListFixes 2019-05-23 09:39:38 -07:00
luiscuenca
6d824ff22d
Fix logout 2019-05-22 20:27:42 -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
8a2132ca9b
Merge pull request #15616 from zfox23/SUI/errorStatesAvatar 
Define/show some error states in the Avatar app
 2019-05-22 16:44:38 -07:00
Brad Hefta-Gaub
74770eb54a
Merge pull request #15614 from ctrlaltdavid/M22513 
Case 22513: Selection JSDoc
 2019-05-22 16:38:21 -07:00
Zach Fox
d75fe04038 Fix BUGZ-311 2019-05-22 16:24:40 -07:00
luiscuenca
206e353264
Pass tokens as params for automatic login 2019-05-22 16:18:30 -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
David Rowe
2c591ba196 Doc review 2019-05-23 10:18:03 +12:00
David Rowe
04573da96b Selection JSDoc revision 2019-05-23 09:51:30 +12:00
Zach Fox
0c90b7c4c2 JSdocs 2019-05-22 14:51:11 -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
257ac12bf9
Merge pull request #15606 from zfox23/SUI/bugFixes1 
Simplified UI - two quick fixes.
 2019-05-22 12:53:26 -07:00
jennaingersoll
38a379cb38
Merge pull request #15605 from ctrlaltdavid/M22528 
Case 22528: Snapshot JSDoc
 2019-05-22 12:27:33 -07:00
jennaingersoll
416e2799ad
Merge pull request #15604 from ctrlaltdavid/M22527 
Case 22527: Settings JSDoc
 2019-05-22 12:08:27 -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
David Rowe
a246e40815 Fix taking snapshot example 2019-05-22 14:14:06 +12:00
David Rowe
30da972a14 Snapshot JSDoc 2019-05-22 14:13:42 +12:00
David Rowe
1f3bffca4a Settings JSDoc polish 2019-05-22 12:08:14 +12:00
Roxanne Skelly
bad421cb59 Fix crash when adding a tracked entity to the safe landing code 
when it's not been fully set up yet.
 2019-05-21 16:58:49 -07:00
Zach Fox
39d32025a3
Merge pull request #15601 from zfox23/SUI/integratedStatusEtc 
Simplified UI: Updates! (See Description)
 2019-05-21 16:15:09 -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
Shannon Romano
fa7a998cca
Merge pull request #15600 from roxanneskelly/bugz223 
BUGZ-223 - Physics was not starting in TheSpot-dev
 2019-05-21 15:15:16 -07:00
Sam Gateau
98e426ac9f
Merge pull request #15590 from SamGondelman/settings 
BUGZ-284: Add shadows, AA, and AO to RenderScriptingInterface
 2019-05-21 15:08:02 -07:00
Zach Fox
5749392e83 New bg color; Final status indicator design; Fixed HMD icon 2019-05-21 14:10:27 -07:00
Roxanne Skelly
10db88c07b Fix ubuntu warning 2019-05-21 12:32:01 -07:00
Anthony Thibault
0e87ab6e55
Merge pull request #15598 from SamGondelman/skeletonModelURL 
BUGZ-283: Fix MyAvatar.skeletonModelURL
 2019-05-21 12:05:30 -07:00
Roxanne Skelly
dddb171b52 BUGZ-223 - Physics was not starting in TheSpot-dev 
This was caused by two issues involving the SafeLanding system:
* Race condition on domain load
The domain is hard-reset twice during typical start, first after
login completes, and second, when ice/domain renegotiation occurs
Entities added during the first reset caused an add to the safe landing
system which, because those adds were queued, possibly happened after
the second hard reset.

Second, Safe landing checks whether physics is ready on entities before
letting physics start.  Physics is ready when the entities have a
physics shape associated with them if they're static meshes.  The
physics shape is only generated if the entity is in Region 1 or 2.
Safe landing, however, was not checking the region of the entity
and was therefore waiting on entities that were not in region 1 or 2
 2019-05-21 11:23:04 -07:00
Sam Gateau
54c14340ef
Merge pull request #15597 from amerhifi/master 
Case BUGZ-277 :  Android build error (on windows host) stat properties missing (please review suggestion)
 2019-05-21 11:11:29 -07:00
SamGondelman
264051ed6d fix myavatar setSkeletonModelURL 2019-05-21 10:40:58 -07:00
Shannon Romano
8d36b90b8b
Merge pull request #15594 from huffman/feat/appconfig 
DEV-54: Add support for application config
 2019-05-21 10:01:19 -07:00
amerhifi
b3285050ed moving the properties out of the define since the values are going to be the same either way 2019-05-21 09:43:09 -07:00
Zach Fox
e79518e092 Merge branch 'master' of github.com:highfidelity/hifi into SUI/integratedStatusEtc 2019-05-21 09:28:02 -07:00
amerhifi
56d8e0123f resolving qt moc error with propertie missing for android 2019-05-21 09:19:56 -07:00
Ryan Huffman
d9f164ba3b Add support for application config 2019-05-20 22:00:26 -07:00
Anthony Thibault
952df9f77d
Merge pull request #15510 from AndrewMeadows/22007-hifiQtBuildv2 
Case 22007: vcpkg update for Qt
 2019-05-20 15:08:14 -07:00
Andrew Meadows
e8b0084fdb
Merge pull request #15588 from sabrina-shanman/bug_myavatar_res-state 
(BUGZ-262) Add debug tool for transitions
 2019-05-20 14:31:05 -07:00
SamGondelman
2e666836c7 add more options to render scripting interface 2019-05-20 13:42:53 -07:00
Andrew Meadows
f2f11b9509 only build qt.conf for DEV macos and unix builds 2019-05-20 15:00:07 -04:00
sabrina-shanman
fa7621896a Add debug icon which shows on render items with transitions 2019-05-20 11:58:01 -07:00
Zach Fox
9deccd3ba7 Merge branch 'master' of github.com:highfidelity/hifi into SUI/integratedStatusEtc 2019-05-20 09:36:13 -07:00
Andrew Meadows
9b78edd062 more correct qt.conf for Linux and MacOS dev environment 2019-05-20 11:50:09 -04:00
Zach Fox
15bdb66943 Integrate Status into top bar; improve Audio settings; improve spacing between settings 2019-05-17 17:25:48 -07:00
Howard Stearns
5fbb788492
Merge pull request #15582 from howard-stearns/put-DomainServerCheckIn-on-NodeList-thread 
put DomainServerCheckIn on NodeList thread
 2019-05-17 16:49:12 -07:00
Sam Gondelman
ca537ef16a
Merge pull request #15584 from SamGondelman/loadingSphere 
BUGZ-132: Fix avatar loading spheres
 2019-05-17 16:24:12 -07:00
SamGondelman
3273f46179 fix avatar loading spheres 2019-05-17 15:29:27 -07:00
Brad Hefta-Gaub
b5da7f00de
Merge pull request #15581 from zfox23/SUI/menuAndVRButton 
Simplified UI V1: Remove some extra menus from top bar; Only show VR button if headset connected at startup
 2019-05-17 14:41:04 -07:00
Howard Stearns
f1e8343b30 put DomainServerCheckIn on NodeList thread 2019-05-17 14:30:30 -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
Simon Walton
024dfbf8b7
Merge pull request #15563 from SimonWalton-HiFi/avatar-banner-emissive 
Make avatar-theft banner emissive
 2019-05-17 10:03:37 -07:00
David Rowe
4ce2c39d0a Revise display plugin JSDoc in the Window API 2019-05-17 21:34:36 +12:00
Sam Gateau
ffbe055fa8
Merge pull request #15569 from SamGondelman/switch 
BUGZ-187: Proper Render Scripting Interface with renderMethod property
 2019-05-16 18:29:18 -07:00
Zach Fox
c0037c3445
Merge pull request #15576 from zfox23/finishSettings 
Simplified UI v1: Implement Performance settings and VR mode top bar switch
 2019-05-16 17:01:04 -07:00
SamGondelman
db813fab6a threadsafe setRenderMethod 2019-05-16 16:48:23 -07:00
Brad Hefta-Gaub
1ac1735d55
Merge pull request #14533 from SamGondelman/oculusHome 
Case 22439: Fix HMD auto switch detection
 2019-05-16 16:26:04 -07:00
Zach Fox
70a4d6e8d5 Implement Performance settings and VR mode top bar switch 2019-05-16 16:15:05 -07:00
SamGondelman
451c52fa47 merge with master 2019-05-16 16:02:52 -07:00
SamGondelman
fee20d9e46 render scripting interface + renderMethod control 2019-05-16 16:01:21 -07:00
Zach Fox
fd5128f40f
Merge pull request #15573 from zfox23/SUI/imagesNoGlyphs 
Simplified UI v1 Improvements
 2019-05-16 15:14:03 -07:00
Zach Fox
90a5b25600 A bunch of changes here 2019-05-16 14:18:04 -07:00
Clément Brisset
d8ac589c36
Merge pull request #15570 from SimonWalton-HiFi/avatar-challenge-guard 
Add guard for Client-challenging Node not connected
 2019-05-16 13:57:40 -07:00
Simon Walton
e3e2bbc056 Add guard for challenging Node disappearing 2019-05-16 12:36:54 -07:00
Andrew Meadows
c660ddd1af Merge master into 22007-hifiQtBuildv2 2019-05-16 12:31:39 -07:00
Sam Gateau
6b3707873b
Merge pull request #15562 from jherico/bugz-133 
BUGZ-133: Expose additional functionality to QML/Scripts
 2019-05-16 12:03:22 -07:00
Zach Fox
ccaabbd9ae Merge branch 'master' of github.com:highfidelity/hifi into SUI/imagesNoGlyphs 2019-05-16 10:57:44 -07:00
Brad Davis
6a0b479041 Fix warning and build failures 2019-05-16 10:53:29 -07:00
Brad Davis
9bcc23f0c4 PR comments 2019-05-16 09:40:22 -07:00
Sam Gateau
edbd354760 Instead of returning the main window dimension (modulo the height of the menu bar) let s return the size of the actual 3d viewport widget 2019-05-15 17:57:53 -07:00
Zach Fox
a9bc7c8806 Images, not glyphs 2019-05-15 17:14:02 -07:00
Zach Fox
ee9d3d3ae1
Merge pull request #15567 from zfox23/dockedWindowEventBridge 
Fix JS to QML event bridge messages with Docked Windows
 2019-05-15 16:28:43 -07:00
Zach Fox
0400bc6da0 Fix JS to QML event bridge messages with Docked Windows 2019-05-15 15:36:28 -07:00
Sam Gateau
04c139c172 Merge branch 'master' of github.com:highfidelity/hifi into coco 2019-05-15 15:01:46 -07:00
Sam Gateau
4e1b01177f Capping the LOD MAnager target FPS by the refresh rate current rate 2019-05-15 15:01:13 -07:00
Andrew Meadows
4cf9673dbb Merge master into 22007-hifiQtBuildv2 2019-05-15 14:10:30 -07:00
Brad Hefta-Gaub
4e8d3470d6
Merge pull request #15512 from amerhifi/feature/platform 
case lily-29:  Feature/platform. Creating a single point api to get system info
 2019-05-15 14:04:43 -07:00
Brad Davis
8c375db90f Add display plugin introspection to the window scripting interface 2019-05-15 12:55:47 -07:00
Brad Davis
5db78ef2e1 Add scripting to set the refresh rate 2019-05-15 12:55:25 -07:00
jennaingersoll
559a39be56
Merge pull request #15513 from ctrlaltdavid/M22147 
Case 22147: Desktop, Paths, PlatformInfo, Window, and location JSDoc
 2019-05-15 12:17:12 -07:00
Simon Walton
9f245b07c9 Make avatar-theft banner emissive 2019-05-15 10:03:31 -07:00
Andrew Meadows
9884d390b8 fix qt.conf location for MacOS 2019-05-15 09:34:08 -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
David Rowe
997dc963d3 Merge branch 'master' into M22147 2019-05-15 07:59:10 +12:00
David Rowe
d5bb7f25e1 Doc review 2019-05-15 07:56:55 +12: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
Roxanne Skelly
68fb43ec7f Merge branch 'master' of https://github.com/highfidelity/hifi into queueDepthDebug 2019-05-14 10:11:02 -07:00
amerhifi
fe6b2fceed addressing comment in pr. removing extra space added in previous checkin 2019-05-14 09:39:44 -07:00
Zach Fox
c57ddf969a Merge branch 'master' of github.com:highfidelity/hifi into simplifiedUI 2019-05-14 09:32:07 -07:00
amerhifi
a5f4664001 Merge branch 'master' into feature/platform 2019-05-14 09:27:15 -07:00
Shannon Romano
8597a51657
Merge pull request #15556 from jherico/fix/watchdog_spam 
BUGZ-131: Additional silencing of watchdog spam
 2019-05-14 08:10:02 -07:00
amerhifi
2a6dc53395 Merge branch 'master' into feature/platform 2019-05-14 06:18:37 -07:00
Howard Stearns
33f1bd965e
Merge pull request #15549 from SimonWalton-HiFi/call-reset-in-NodeList 
Call correct NodeList::reset() from Application
 2019-05-13 19:49:41 -07:00
Brad Davis
7d8e14f510 Additional silencing of watchdog spam 2019-05-13 18:19:29 -07:00
Seth Alves
8b2d12e2f7 when an avatar entity is deleted, also delete its descendants 2019-05-13 17:33:10 -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
Roxanne Skelly
aa16430cf4 add a comment and kick build servers 2019-05-13 17:25:06 -07:00
jennaingersoll
4c6c0acc56
Merge pull request #15454 from ctrlaltdavid/M22246 
Case 22246: Picks, PickType, RayPick JSDoc update
 2019-05-13 16:16:17 -07:00
Roxanne Skelly
0319e8cc4d Merge branch 'master' of https://github.com/highfidelity/hifi into queueDepthDebug 2019-05-13 16:01:39 -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
Simon Walton
305a215d21 Pass a QObject context for the functor 2019-05-13 15:50:04 -07:00
amerhifi
9652d412ac Merge branch 'master' into feature/platform 2019-05-13 15:39:55 -07:00
David Rowe
70ec84177a Doc review 2019-05-14 10:32:28 +12:00
jennaingersoll
712167c623
Merge pull request #15476 from ctrlaltdavid/M22407 
Case 22407: Quat JSDoc update
 2019-05-13 15:17:58 -07:00
Simon Walton
ede8859cc7 Call correct NodeList::reset() from Application 2019-05-13 14:38:34 -07:00
Andrew Meadows
2d21b5c269 use qt.conf file to find Qt resources 2019-05-13 14:26:16 -07:00
Brad Hefta-Gaub
51f2d1748e
Merge pull request #15544 from sabrina-shanman/bug_avatar_res-state 
(BUGZ-40) Check for possible avatar fade race condition
 2019-05-13 13:41:09 -07:00
Shannon Romano
32d3014d0d
Merge pull request #15301 from SaracenOne/disable_away_on_focus_loss_push_2 
case 22190: Disable triggering away state when interface focus lost
 2019-05-13 13:22:28 -07:00
Shannon Romano
8aee64c102
Merge pull request #15540 from jherico/fix/gl_crash 
BUGZ-125: Error message instead of crash if the GL version is too low
 2019-05-13 13:12:30 -07:00