e6505baf9d
Update help dialogs for Vircadia branding.
2020-05-17 15:37:58 -05: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
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
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
9af7c39513
Updated broken urls
2020-01-15 23:08:27 +00: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
3944d6e47c
added banner svg
2020-01-08 16:24:49 +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
Brad Hefta-Gaub
bb68f92d3e
Merge pull request #16562 from ctrlaltdavid/DEV-2442
...
DEV-2442: Fix main gamepad (XBox controller) controls
2019-12-13 13:36:20 -08: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
6060dad638
Resurrect gamepad Y teleport button
2019-12-08 12:38:48 +13:00
David Rowe
dd64ecbdf2
Use the new property
2019-12-07 08:29:21 +13:00
Anthony Thibault
edfad97b64
Merge pull request #16517 from hyperlogic/feature/facecap-osc-plugin
...
Input plugin for streaming blendshapes from an iPhone
2019-11-23 11:49:51 -08:00
DouglasWilcox
b8d7f50eaf
Put away animation into resource and update script to use local resource path.
2019-11-21 14:50:05 -08:00
Anthony J. Thibault
9d6ce44131
Head is now computed in proper sensor space
...
Eye tracking now works.
2019-11-20 15:30:16 -08:00
Brad Hefta-Gaub
3b9c997317
Merge pull request #16505 from luiscuenca/zoomAndOrbitCamUsingTouchPad
...
Touchpad improvements: pinch to zoom camera, two finger swipe to look around, bug fixes
2019-11-19 13:30:45 -08: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
Brad Hefta-Gaub
0f428f0afb
Merge pull request #16498 from DouglasWilcox/improve_seated_rotation
...
Improve seated rotation
2019-11-19 10:22:08 -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
dante ruiz
cd6f9a774d
implement gesture pinch to camera zoom
2019-11-18 11:33:31 -07:00
DouglasWilcox
ddbb8d70ed
Speed up acceleration and blends slightly per Joshua, add kicks to turn anim.
2019-11-15 17:04:51 -08:00
DouglasWilcox
d9065affad
comment explaining seatedrot deceleration section, and transition-> turn works
2019-11-14 17:18:43 -08:00
DouglasWilcox
fb289704e2
iterate the turns, and make turning accessible from fidgets
2019-11-14 16:07:51 -08:00
Zach Fox
e21ee20ff8
Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp
2019-11-14 15:18:07 -08:00
DouglasWilcox
37010648be
Abandon exponential acceleration and use constant acceleration. Hook up turn->sit transitions.
2019-11-14 13:12:01 -08:00
milad
abf592f533
Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp
2019-11-13 10:14:14 -08:00
DouglasWilcox
a3de25618a
Handle HMD in input vars and remove/fix json transitions in/out of HMD strafe states.
...
(cherry picked from commit f9f28fc286
2019-11-13 09:52:56 -08:00
Anthony J. Thibault
b92badbe76
Updated avatar-animation-optimized-ik.json from latest avatar-animation.json
2019-11-13 08:23:27 -08:00
Anthony J. Thibault
b4c4d81bd1
Merge branch 'master' into bug-fix/android-t-pose
2019-11-13 08:21:19 -08:00
Anthony J. Thibault
365b132c30
Bugfix for t-pose avatar when moving
...
The android specific optimized IK animation graph was out of date, it was referencing
animations that have been deleted, hence the t-pose. This PR updates and renames the
android/optimized ik animation graph to the latest.
2019-11-12 15:33:41 -08:00
DouglasWilcox
f9f28fc286
Handle HMD in input vars and remove/fix json transitions in/out of HMD strafe states.
2019-11-12 14:15:19 -08:00
milad
ae35ec0975
Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp
2019-11-11 16:42:55 -08:00
dooglifeSF
055d5cdf9b
Simplify boolean statements, revise several settle anims
2019-11-08 13:46:38 -08:00
dooglifeSF
02045a9fdf
add random versions of full sized settle
2019-11-08 11:57:06 -08:00
dooglifeSF
8e11d91c03
Merge branch 'master' into rand_settles_and_by_momentum
2019-11-07 15:09:10 -08:00
dooglifeSF
73202b9caf
Different settle transition depending on momentum
2019-11-07 09:52:26 -08:00
milad
dd1795e9b6
Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp
2019-11-07 09:33:47 -08:00
Shannon Romano
4484ef095c
Merge pull request #16464 from DouglasWilcox/seated_fidgets_less_fidgety
...
Reduce fidgety motions in seated fidgets
2019-11-07 09:09:05 -08: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
dooglifeSF
15b935b491
remove jitter and bounce from several seated idles and fidgets, also reduce look-around cone
2019-11-06 13:08:42 -08:00
Zach Fox
ca8a61f085
DEV-2701: Remove the home icon from the profile app
2019-11-06 11:11:57 -08:00
Shannon Romano
668061e154
Merge pull request #16445 from hyperlogic/bug-fix/remove-last-legacy-blendshapes
...
Remove LipsUpperOpen and LipsLowerOpen, the last of the legacy blendshapes
2019-11-06 10:35:53 -08:00
Zach Fox
683c3f1300
An experiment with the top bar. Will you notice?
2019-11-05 09:33:11 -08:00
Anthony J. Thibault
101ec9d753
Remove LipsUpperOpen and LipsLowerOpen, the last of the legacy faceshift blendshapes
...
These blendshapes are not present in ARKit and are not used by any of our procedural
face animations (talking, blinking etc). This change should have been part of #16400 but
was accidently left out.
2019-11-04 09:49:24 -08:00
Anthony J. Thibault
4b34311a0a
Hooked up seated version of aim offset animation
2019-10-31 16:23:29 -07:00
Anthony Thibault
f99bb3ec77
Merge pull request #16400 from hyperlogic/feature/arkit-blendshapes
...
Extended avatar blendshape support for ARKit compatiblity
2019-10-31 12:33:50 -07: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
