Commit graph

5277 commits

Author SHA1 Message Date
Kasen IO
2590dfbaa7 Remove unused tests for backgroundColor. 2020-08-15 00:57:10 -04:00
Kasen IO
cd5bdf6160 Added transparent + colored background web entity capability dynamically. 2020-08-15 00:56:19 -04:00
Kasen IO
1601ea9231 Just to prove it works... needs to be done better. 2020-08-07 15:08:00 -04:00
Kasen IO
d89cf867d2 Center error text correctly. 2020-08-05 02:41:39 -04:00
kasenvr
b948f24a56
Apply suggestions from code review
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
2020-08-05 02:31:26 -04:00
kasenvr
4d3ca2fdc5
Apply suggestions from code review
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
2020-08-05 02:31:10 -04:00
Kasen IO
2881f1147f Metaverse login display working correctly. 2020-08-05 00:09:09 -04:00
Kasen IO
d81ec3a4b8 Domain login display working correctly. 2020-08-04 23:46:39 -04:00
Kasen IO
0e8f019b8a Further things kinda working. 2020-08-04 20:00:24 -04:00
Kasen IO
ffce0a9d27 Update QML. 2020-08-04 19:12:31 -04:00
Kasen IO
09f2153057 Update login QML to display domain URL. 2020-08-04 15:48:10 -04:00
Kasen IO
f066eccba0 Merge branch 'oauth2-wordpress' into feature/oauth2-kalila 2020-08-04 14:17:48 -04:00
HifiExperiments
0d62798860 Merge remote-tracking branch 'upstream/master' into parenting 2020-08-04 08:52:13 -07:00
David Rowe
3a43283e7b Provide domain name to domain login dialog 2020-08-04 19:42:02 +12:00
Kasen IO
482922d986 First pass at making login dialog more clear. 2020-08-04 01:28:19 -04:00
David Rowe
56ba137ee3 Get OAuth2 URL from server settings 2020-07-31 20:48:27 +12:00
David Rowe
361ab97d83 Fix saving metaverse login 2020-07-25 20:53:23 +12:00
David Rowe
0618427d0f Wire up domain login dialog 2020-07-25 20:40:52 +12:00
David Rowe
fec0e7a8bc Merge branch 'feature/oauth2-kalila' into feature/oauth2-login-display 2020-07-25 16:53:43 +12:00
kasenvr
ec09f1a9d9
Merge pull request #550 from ctrlaltdavid/feature/resolution-scale-max
Increase graphics settings' resolution scale item maximum to 2.0
2020-07-24 01:11:29 -04:00
Kasen IO
d7c0493b7a Updated login QML to handle domain logins. 2020-07-23 22:14:21 -04:00
kasenvr
80d3e3c455
Merge pull request #520 from kasenvr/fix/move-user-agent
Fix/move user agent
2020-07-23 17:13:18 -04:00
Kasen IO
647b45323e Update user agents. 2020-07-21 02:36:38 -04:00
kasenvr
de082ce61d
Update TabletConnectionFailureDialog.qml 2020-07-18 14:26:26 -04:00
kasenvr
a973855085
Update ConnectionFailureDialog.qml 2020-07-18 14:25:50 -04:00
David Rowe
233deae44d Increase graphics settings' resolution scale item maximum to 2.0 2020-07-18 20:50:52 +12:00
Kasen IO
ddbed5e702 Update the connection failure dialog 'go to' -> 'explore' 2020-07-17 04:24:47 -04:00
HifiExperiments
ed5c84548c Merge remote-tracking branch 'upstream/master' into parenting 2020-07-16 13:33:46 -07:00
David Rowe
8dd8ebcbaf Merge branch 'master' into feature/eye-tracking-option
# Conflicts:
#	plugins/openvr/src/ViveControllerManager.cpp
2020-07-11 08:14:13 +12:00
HifiExperiments
c9684b8c6d Merge remote-tracking branch 'upstream/master' into parenting 2020-07-10 11:43:03 -07:00
kasenvr
ab95e109ca
Merge pull request #468 from JulianGro/move-audio
Little "Audio" settings UI improvements
2020-07-09 17:15:35 -04:00
David Rowe
6e1af6df73 Update copyright notices 2020-07-10 07:18:29 +12:00
Julian Groß
6737068b02 Test 2020-07-07 00:28:19 +02:00
David Rowe
52389e5804 Add correct privacy policy URL 2020-07-05 11:17:56 +12:00
motofckr9k
bb91c1c89b Fix blocks 2020-07-03 10:22:06 +02:00
HifiExperiments
37ce2996c8 Merge remote-tracking branch 'upstream/master' into parenting 2020-07-01 14:56:36 -07:00
David Rowe
06010dbcae Fix position of recommended puck placement dialog 2020-06-27 15:54:28 +12:00
David Rowe
258fc8a2f4 Improve some text and make checkboxes square 2020-06-27 15:54:15 +12:00
David Rowe
2e9a8e2b33 Add option to enable Vive PRO Eye eye tracking 2020-06-27 15:14:21 +12:00
David Rowe
147bea6ba9 Fix indentation 2020-06-22 21:12:46 +12:00
Julian Groß
5b0855fa6e
Fix indentation 2020-06-22 06:18:05 +02:00
Julian Groß
3fe1dddee2
Replace tabs with spaces 2020-06-22 04:19:10 +02:00
Julian Groß
ef5d6bfc2f
Remove unnessesary copyright 2020-06-22 04:11:34 +02:00
Julian Groß
34887ec604
Remove unnessesary whitespaces 2020-06-22 04:10:21 +02:00
motofckr9k
56362461fc Fix "or" not dissappearing in popup window 2020-06-21 05:51:37 +02:00
motofckr9k
75f6246ac9 Move them even closer 2020-06-21 03:16:19 +02:00
motofckr9k
41563b14a8 Move signUpContainer closer to loginContainer 2020-06-21 03:05:54 +02:00
motofckr9k
3da755fb95 Change button text, and move it to answer "Don't have an account?" 2020-06-21 02:53:05 +02:00
motofckr9k
e8a3009b96 Remove color from dismissButton 2020-06-21 01:51:05 +02:00
motofckr9k
bf230a415a Initial commit 2020-06-21 01:51:04 +02:00
motofckr9k
878c6c68c8 Fix inputView if statement 2020-06-19 23:46:04 +02:00
motofckr9k
3aefa6ad9c Remove if statements that are not needed anymore 2020-06-19 23:37:26 +02:00
motofckr9k
0c8cc0a806 Try to remove empty space when "Test your voice" button is not visible 2020-06-19 23:32:52 +02:00
motofckr9k
845cc4454c Add Vircadia contributors line 2020-06-19 21:47:09 +02:00
motofckr9k
4a0d011b53 Shorten PushToTalk text on vr, since it didn't fit into the window 2020-06-19 21:39:53 +02:00
motofckr9k
d4f79413eb Fix seperator and move up inputLevel 2020-06-19 21:27:41 +02:00
motofckr9k
ee6de9e868 Move "Test your voice" and "Test your sound" to top of their category 2020-06-19 21:10:48 +02:00
motofckr9k
8284dd16cf Revert last commit and add spacer item to bottom. 2020-06-19 20:19:03 +02:00
motofckr9k
b0eb08c03f Try to add bottom margin 2020-06-19 19:54:49 +02:00
motofckr9k
6b8519c7ff Fix "Test your sound" 2020-06-19 19:38:03 +02:00
motofckr9k
eaf2ce89e0 Actually move it up this time 2020-06-19 19:23:51 +02:00
motofckr9k
37bded0a9b Move volume control up from bottom 2020-06-19 18:48:43 +02:00
Julian Groß
18318fdf71
Merge branch 'v2020.2.2-rc' into rebrand 2020-06-18 09:16:47 +02:00
motofckr9k
256b466e84 Add vircadia-banner.svg for login dialogs 2020-06-18 09:12:01 +02:00
HifiExperiments
56d359f2ba Merge remote-tracking branch 'upstream/master' into parenting 2020-06-14 17:30:26 -07:00
kasenvr
d52a21c515
Merge pull request #437 from kasenvr/fix/overlay-login-branding
Update login overlay to Vircadia.
2020-06-11 17:17:49 -04:00
kasenvr
80fc2d8332
Merge pull request #426 from ctrlaltdavid/fix/wearables-text-unreadable
Fix visibility of values in Wearables dialog
2020-06-11 17:15:49 -04:00
motofckr9k
3d05cdd61e Merge remote-tracking branch 'refs/remotes/kasen/master'
Conflicts:
	BUILD_WIN.md
	CODING_STANDARD.md
	LICENSE
	cmake/installer/installer-header.bmp
	cmake/installer/installer.ico
	cmake/installer/uninstaller-header.bmp
	interface/resources/images/about-vircadia.png
	interface/resources/images/vircadia-logo.svg
	interface/resources/qml/LoginDialog.qml
	interface/resources/qml/dialogs/TabletLoginDialog.qml
	interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml
	interface/src/Application.cpp
	pkg-scripts/athena-server.spec
	scripts/system/more/app-more.js
	scripts/system/more/css/styles.css
	scripts/system/more/more.html
2020-06-10 02:49:13 +02:00
Kasen IO
a75c43e073 Update login overlay to Vircadia. 2020-06-08 23:39:23 -04:00
Kasen IO
c55f365af4 Fix tablet login dialog logo size. 2020-06-07 20:47:53 -04:00
Kasen IO
085b9e11c5 Fix tabletAboutDialog fit for logo. 2020-06-06 20:21:17 -04:00
Kasen IO
fda40d56d4 Merge branch 'master' into feature/further-rebranding 2020-06-06 18:43:03 -04:00
Kasen IO
01b02881dc Height, width, and centering updates. 2020-06-06 18:40:19 -04:00
David Rowe
8494e6e6b5 Fix visibility of values in Wearables dialog 2020-06-06 15:15:03 +12:00
Kasen IO
6c6a405020 Add periods and remove double copyright in tabletaboutdialog.qml 2020-05-25 16:41:16 -04:00
Kasen IO
a4bf1c4d82 Update copyright headers. 2020-05-25 15:59:43 -04:00
motofckr9k
d406b81b47 Big rebrand 2020-05-22 20:35:27 +02:00
Kasen IO
ce1a1faf79 Fix copyright headers + some docs. 2020-05-20 15:02:03 -04:00
kasenvr
7996698c8f
Merge branch 'master' into fix/other-renamings 2020-05-18 15:10:32 -04:00
Kasen IO
f908d5bb0a Undo logo change. 2020-05-17 22:20:02 -04:00
d19c474d65 Rebrand login screens for Vircadia. 2020-05-17 15:17:26 -05:00
187a2749c3 Rebrand the About dialog to Vircadia.
Also removes trailing whitespace from Menu.cpp.
2020-05-17 14:26:45 -05:00
Kasen IO
f4bcc82dd6 Corrections. 2020-05-16 02:27:45 -04:00
HifiExperiments
ebc9dae78d
Merge branch 'master' into parenting 2020-05-07 13:35:32 -07:00
David Rowe
5e997d7b60 Fix up Vircadia URLs 2020-04-27 20:38:23 +12:00
David Rowe
2d070e630b Merge branch 'master' into fix/jsdoc-fixes
# Conflicts:
#	interface/resources/qml/hifi/avatarapp/MessageBoxes.qml
#	interface/resources/qml/hifi/commerce/checkout/Checkout.qml
#	interface/resources/qml/hifi/commerce/purchases/Purchases.qml
#	interface/src/Application.cpp
2020-04-26 20:38:43 +12:00
David Rowe
ffeb37e7aa Merge remote-tracking branch 'hifi/master' into merge-hifi-master
# Conflicts:
#	CMakeLists.txt
#	README.md
#	cmake/externals/glad32es/CMakeLists.txt
#	cmake/externals/glad41/CMakeLists.txt
#	cmake/externals/glad45/CMakeLists.txt
#	cmake/externals/polyvox/CMakeLists.txt
#	cmake/externals/quazip/CMakeLists.txt
#	cmake/externals/vhacd/CMakeLists.txt
#	cmake/init.cmake
#	cmake/ports/hifi-deps/CONTROL
#	cmake/ports/sdl2/CONTROL
#	cmake/ports/sdl2/disable-hidapi-for-uwp.patch
#	cmake/ports/sdl2/enable-winrt-cmake.patch
#	cmake/ports/sdl2/fix-arm64-headers.patch
#	cmake/ports/sdl2/fix-x86-windows.patch
#	cmake/ports/sdl2/portfile.cmake
#	cmake/ports/sdl2/vcpkg-cmake-wrapper.cmake
#	cmake/ports/tbb/portfile.cmake
#	hifi_vcpkg.py
#	interface/src/avatar/MyAvatar.h
#	libraries/avatars-renderer/src/avatars-renderer/Avatar.h
#	libraries/avatars/src/AvatarData.h
#	libraries/entities-renderer/src/RenderableEntityItem.h
#	libraries/entities/src/EntityItem.cpp
#	libraries/entities/src/EntityItem.h
#	libraries/fbx/src/GLTFSerializer.cpp
#	libraries/graphics-scripting/src/graphics-scripting/Forward.h
#	libraries/networking/src/AddressManager.cpp
#	libraries/networking/src/DomainHandler.h
#	libraries/procedural/src/procedural/ProceduralMaterialCache.cpp
#	libraries/render-utils/src/HighlightEffect.cpp
#	libraries/render-utils/src/MeshPartPayload.cpp
#	libraries/render-utils/src/Model.cpp
#	libraries/render-utils/src/RenderShadowTask.cpp
#	libraries/script-engine/src/WebSocketClass.cpp
2020-04-09 16:46:27 +12:00
Kasen IO
9dce990e8f Help dialog updated. 2020-04-07 18:48:24 -04:00
Kasen IO
115c40bd54 Lots of renamings, more to come. 2020-04-07 04:56:02 -04:00
HifiExperiments
eb26d9b4e3 working on parenting fixes 2020-04-06 13:41:01 -07:00
kasenvr
cb0a080be1
Merge pull request #113 from ctrlaltdavid/fix/missing-scrollbars
Always display vertical scrollbar in Settings dialogs that scroll
2020-02-19 16:32:53 -05:00
kasenvr
78e3d65031
Merge pull request #145 from vegaslon/feature/AvatarAppThumbnail
feature: Allow users to set avatar thumbnails that show in avatar app.
2020-02-12 08:59:23 -05:00
Vegaslon
c2b375862c Style changes as requested 2020-02-11 21:50:40 -05:00
Vegaslon
6db15510db Change name of variable and fix indention 2020-02-10 16:20:22 -05:00
Kasen IO
08ec9ef3b7 Various URL updates + window title update. 2020-02-05 15:25:51 -05:00
Vegaslon
e74fccb49d Allow users to set avatar thumbnails that show in avatar app. 2020-02-01 08:54:06 -05:00
Kasen IO
428a5b65ff Lint 2020-01-27 13:13:36 -05:00
kasenvr
fc73f76ab7
Update interface/resources/qml/hifi/dialogs/security/EntityScriptQMLWhitelist.qml
Co-Authored-By: HifiExperiments <53453710+HifiExperiments@users.noreply.github.com>
2020-01-25 19:02:01 -05:00
Kasen IO
aa0c225809 Merge branch 'kasen/core' into fix/whitelist-qml-adds 2020-01-24 19:55:23 -05:00
David Rowe
7ed117dfcb Replace links to docs.highfidelity.com 2020-01-24 10:18:55 +13:00
Kasen IO
1979a4bd94 Further housekeeping. :) 2020-01-23 03:15:18 -05:00
Kasen IO
c121a8ef2a Housekeeping. 2020-01-23 03:06:58 -05:00
David Rowe
cfde36c9f5 Fix up scrollbars and separators 2020-01-23 11:25:48 +13:00
Kasen IO
7a985b445e removed extra debug, added debug for user awareness. 2020-01-22 14:53:55 -05:00
Kasen IO
98473abbb4 QML works, C++ works but does a manual set to true, does not see updates from QML set setting. 2020-01-22 11:29:37 -05:00
David Rowe
6c81f597af Display vertical scrollbar in Settings dialogs that scroll 2020-01-22 20:55:50 +13:00
Kasen IO
bd066adbf6 Whitelist toggle not working c++ side. 2020-01-20 16:03:48 -05:00
David Rowe
eae3336f57 Fix up docs links 2020-01-20 15:06:32 +13:00
NexPro
203c371a01 Re-branding of help dialogs and tablet login 2020-01-14 00:33:29 +00:00
kasenvr
1133f51971
Merge pull request #70 from Nex-Pro/kasen/core
Rebranding of login dialogs etc. QML
2020-01-13 09:42:09 -05:00
96dc01fcc6 Made requested changes to About dialog.
Removed dash from "open source"
Fixed missing and unecessary periods.
2020-01-12 12:47:17 -06:00
00855cba3d Redo the About menu dialog
Change project name, remove references to EOS blockchain, add Project Athena copyright, add attribution to Opus.
2020-01-10 16:09:20 -06:00
NexPro
80e4e47cd8 updated TOS link. Changed incorrect filename in comment. 2020-01-09 10:20:28 +00:00
NexPro
769d2050c7 Additional re-branding of QML dialogs 2020-01-08 17:41:58 +00:00
NexPro
2a8b92e683 Updated interface login page 2020-01-08 16:21:25 +00:00
kasenvr
19bca588ca
Merge pull request #58 from ctrlaltdavid/fix/avatar-packager-update
Update Avatar Packager
2020-01-07 22:43:34 -05:00
kasenvr
be08a949c2
Merge pull request #67 from FluffyJenkins/feature/fixedClaraRubbish
Fixed clara rubbish
2020-01-07 21:44:23 -05:00
Fluffy Jenkins
e488a66840 changed quote types 2020-01-07 20:59:00 +00:00
Fluffy Jenkins
ead359ce67 Fixed clara rubbish 2020-01-07 05:14:38 +00:00
David Rowe
1d9aec6fec Improve order of dialog contents 2020-01-05 18:24:56 +13:00
David Rowe
977d498004 Add an "Open Project Folder" button 2020-01-05 17:53:36 +13:00
David Rowe
30c63fc305 Remove "Upload" button and associated items 2020-01-05 17:11:23 +13:00
David Rowe
cd6669ec8b Comment out the "Video" button 2020-01-05 17:00:40 +13:00
David Rowe
d79c87b2d4 Change Avatar Package docs links 2020-01-05 16:59:51 +13:00
Kasen IO
7489505f99 Updated whitelist info and name to include QML. 2019-12-26 22:27:58 -05:00
Kasen IO
d4c3504c8d Updated about dialog (old logo still there), application name, and readme.md 2019-12-14 23:12:54 -05:00
kasenvr
b470a765aa
Merge pull request #9 from kasenvr/feature/quality-of-life-k2
Feature/quality of life k2
2019-12-10 21:10:06 -05:00
Kasen IO
297e039de5 Added a confirmation message + instructions to the QML. 2019-12-09 19:57:57 -05:00
Kasen IO
5fe27cdfc9 Added github link to about 2019-12-08 23:50:09 -05:00
Kasen IO
fe66dc82f3 scriptengine pulls from inferface.json correctly, removed extra debug, fixed QML to load to textarea correctly. 2019-12-08 23:11:21 -05:00
Kasen IO
f49e64b99f Cleaned out extra commented code. 2019-12-08 21:12:20 -05:00
Kasen IO
2e36c40912 added QML + C++ system for whitelists 2019-12-07 21:37:23 -05:00
David Rowe
dd64ecbdf2 Use the new property 2019-12-07 08:29:21 +13:00
Anthony J. Thibault
befbdcef48 Upgraded OSC plugin with changes from ARKit blendshape work. 2019-11-19 13:13:56 -08:00
Brad Hefta-Gaub
63b21af562
Merge pull request #16506 from ctrlaltdavid/DEV-2764
DEV-2764, DEV-2113: Remove Avatar app links to AvatarIsland and BodyMart
2019-11-19 12:05:10 -08:00
Brad Hefta-Gaub
69af66195c
Merge pull request #15334 from SaracenOne/screen_name_at_signup_push
case 22189: Add display name field to the log in screen.
2019-11-19 12:02:31 -08:00
David Rowe
60d2845953 Remove further related dead code 2019-11-19 10:31:54 +13:00
David Rowe
748999b8d6 Remove reference to BodyMart in Avatar app 2019-11-19 09:59:59 +13:00
David Rowe
a912e97f1e Remove reference to AvatarIsland in Avatar app 2019-11-19 09:53:58 +13:00
milad
4b06e429d2 Merge branch 'screenshareElectronApp' of github.com:MiladNazeri/hifi into screenshareElectronApp 2019-11-06 17:43:38 -08:00
Zach Fox
c8464786e7 Steps closer... 2019-11-06 17:16:21 -08:00
Zach Fox
ca8a61f085 DEV-2701: Remove the home icon from the profile app 2019-11-06 11:11:57 -08:00
Zach Fox
683c3f1300 An experiment with the top bar. Will you notice? 2019-11-05 09:33:11 -08:00
Maia Hansen
de5570ced8
Merge pull request #16421 from amerhifi/dev-2571new
case DEV-2771: Audio client shutdown lock
2019-10-31 09:50:56 -07:00
amerhifi
ddfbb55e19 fixed old ui filtering of audio devices 2019-10-29 15:36:43 -07:00
Rebecca Stankus
b8d6a2cf0b Added extra attempt to parent interactive window content on creation 2019-10-29 11:20:14 -07:00
Zach Fox
bda1e3f696
Merge pull request #16398 from RebeccaStankus/grayEmoteWindow
Gray emote window
2019-10-28 11:37:17 -07:00
Amer
42234b119f
Merge pull request #16381 from amerhifi/amer-dev471-re
case Dev 471: HMD default audio behavior
2019-10-24 16:23:14 -07:00
Shannon Romano
15f27e53cb
Merge pull request #16372 from ctrlaltdavid/DEV-2055
DEV-2055: Sanitize LODManager.setWorldQualityDetail() parameter value
2019-10-24 15:20:34 -07:00
Rebecca Stankus
9a8fda2705 Feedback changes 2019-10-24 12:07:34 -07:00