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
Rebecca Stankus
f8102be74d
Added a timeout to update the content holder parent after interactive window has finished loading
2019-10-24 12:07:25 -07:00
Rebecca Stankus
8e8c157567
Debugging stuff
2019-10-24 12:07:20 -07:00
Rebecca Stankus
83a6155592
Added tons of logging to debug interactive window
2019-10-24 12:06:49 -07:00
Zach Fox
df782edcd9
DEV-2541: Update 'Jump To' top bar expanded text
2019-10-23 11:14:22 -07:00
David Rowe
378c47d16c
Replace world detail quality float with enum
2019-10-22 19:18:11 +13:00
amerhifi
68681fdb2e
Merge branch 'master' into amer-dev471-re
2019-10-21 21:04:24 -07:00
amerhifi
c7e1fdaeac
adding hmd audio device info to deviceslist
...
changing locations
one more
merge
working on the threading issue
changing offices, working on qml
simple qml filtering
fixed spacing problem when item is removed
2019-10-18 15:29:10 -07:00
luiscuenca
63c2b41929
Restate legacy first person camera mode
2019-10-17 13:26:42 -07:00
Zach Fox
1527bf2e11
Merge pull request #16294 from RebeccaStankus/friction
...
First Time User Experience Project
2019-10-15 14:56:25 -07:00
Sabrina Shanman
b8df1c180f
Merge pull request #16343 from jherico/fix/DEV-2375
...
DEV-2375: ensure web entities stop playing audio
2019-10-14 13:04:57 -07:00
Zach Fox
341abb8185
Merge branch 'master' of github.com:highfidelity/hifi into friction
2019-10-14 12:36:35 -07:00
Brad Davis
6c35387b8d
also fix DEV-2083
2019-10-14 10:56:23 -07:00
Brad Davis
95b5c8a905
DEV-2375: ensure web entities stop playing audio
2019-10-14 10:46:32 -07:00
Zach Fox
c8b975b2f1
Merge pull request #16342 from zfox23/newInvalidatedLanguage
...
DEV-2334: New 'Item Invalidated' language in Inventory
2019-10-14 13:28:33 -04:00
Zach Fox
7bd550e37b
DEV-2334: New 'Item Invalidated' language in Inventory
2019-10-14 09:30:44 -07:00
Rebecca Stankus
21503137d4
Added blank placeholder text on focus to text field
2019-10-11 14:42:39 -07:00
Zach Fox
2220234d68
Removed yellow
2019-10-09 14:33:28 -07:00
Zach Fox
bed1192d70
A bunch of fixes, plus added a debug mode Settings switch
2019-10-09 14:18:36 -07:00
Zach Fox
5871e6b83a
Host avatars remotely
2019-10-08 17:39:57 -04:00
Zach Fox
17478af32d
Remove debug code
2019-10-08 17:31:35 -04:00
Zach Fox
42bf2bf30e
All windows 'done' except for final tweaks; debug mode still ON
2019-10-08 13:17:04 -04:00
Zach Fox
a23bee19e8
Controls screen done
2019-10-07 19:52:22 -04:00
RebeccaStankus
2f2b7b0306
Ready for CR Thank you Zach
2019-10-03 17:30:47 -07:00
Zach Fox
33b8942ffd
Changes to Avatar/Profile App complete
2019-10-03 09:41:30 -07:00
Zach Fox
50b06a40d7
Improved random avatar selection logic, plus local avatars
2019-10-01 17:22:24 -07:00
RebeccaStankus
d2e62749c7
Ready for Zach to add default avatar changes
2019-10-01 16:36:06 -07:00
RebeccaStankus
0dfb234089
Finished UI, ready for CR
2019-10-01 09:58:44 -07:00
RebeccaStankus
68f52584cf
Merge branch 'master' of github.com:highfidelity/hifi into friction
2019-09-30 09:19:15 -07:00
David Rowe
cd6d9b57c4
Fix Blocks script displaying a blank page
2019-09-28 11:30:56 +12:00
RebeccaStankus
de4e8b9cc4
Merge branch 'master' of github.com:highfidelity/hifi into friction
2019-09-27 09:16:26 -07:00
RebeccaStankus
f4ecd3dcd8
Working on initial/second launch
2019-09-27 09:15:39 -07:00
milad
aba6a28d54
updated camera modes
2019-09-25 11:05:32 -07:00
milad
39d96b76a6
fixed help text
2019-09-25 08:41:38 -07:00
milad
677dbe59cc
fixed qml typo
2019-09-24 16:47:07 -07:00
milad
edb135776a
Added selfie view and updated help
2019-09-24 16:44:34 -07:00
RebeccaStankus
982bdf5c98
Prereq work for 'Reduce User Friction'
2019-09-23 16:49:16 -07:00
dante ruiz
b478a22ed2
fix edge case
2019-09-20 15:25:10 -07:00
Anthony Thibault
fecef584c9
Merge pull request #16226 from danteruiz/fix-snap-html-issue
...
BUGZ-1522: Snap app on tablet is blocked when saving/canceling out of its Settings page
2019-09-20 12:39:01 -07:00
dante ruiz
fe2a4c3600
fix fix-snap-html-issue
2019-09-19 18:20:08 -07:00
Zach Fox
97ef2c030e
Merge pull request #16223 from zfox23/simplifiedGoToIteration
...
Whoops! New placeholder text color
2019-09-19 16:40:48 -04:00
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
