Commit graph

8510 commits

Author SHA1 Message Date
David Rowe
9bb913983d Stub out basics for displaying the domain login dialog 2020-07-25 15:31:17 +12: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
629b3c084c Update user agent to use "Vircadia" + update getUserAgent function to use the same. 2020-07-10 00:08:46 -04:00
Kasen IO
4b1e82fc0b Move user agent to networking constants. 2020-07-08 14:18:24 -04:00
Kasen IO
afc23954c5 Import entities now works on domains that you do not have rights on. 2020-07-03 16:37:02 -04:00
kasenvr
bfe08f23c7
Merge pull request #497 from kasenvr/feature/paste-entities-host-type
Add ability to paste entities to any host type
2020-07-02 17:29:13 -04:00
kasenvr
b7b902b755
Merge pull request #459 from ctrlaltdavid/feature/tutorial-menu-item
Add Help > Tutorial menu item
2020-07-02 17:10:38 -04:00
Kasen IO
859c78d8aa Further updates. 2020-07-01 16:05:15 -04:00
Kasen IO
5f0caf7de8 Update pasteEntities to const per suggestion. 2020-07-01 01:29:47 -04:00
Kasen IO
d9e0605b4d Improve code per HiFiExperiments' suggestions. 2020-06-30 15:46:26 -04:00
Kasen IO
12446bdb45 Add ability to paste entities to any host type. Default "domain" 2020-06-30 15:18:51 -04:00
David Rowe
f11091cab4 Add Help > Tutorial menu item that goest to serverless tutorial 2020-06-16 12:25:28 +12:00
Robert Adams
3878ad6df6 Move metaverse server URL info into NetworkingConstants.h (for C++
code) and into shared.js (for JS code).
Modify references to the metaverse server from constants to
    references to the new central definitions.
2020-06-13 07:04:58 -07:00
Kasen IO
fda40d56d4 Merge branch 'master' into feature/further-rebranding 2020-06-06 18:43:03 -04:00
Kasen IO
b74ccef418 Address CR from Thoys and David. 2020-06-06 18:35:02 -04:00
kasenvr
8157be5b5a
Merge pull request #405 from kasenvr/v0.86.0-k2.1
Merge K2.1 into Master
2020-05-30 18:49:38 -04:00
Kasen IO
4f55bfe512 Update window title. 2020-05-27 18:09:01 -04:00
kasenvr
22e9aec0dd
Merge pull request #296 from kasenvr/fix/qml-whitelist-default
Add community-apps repo to default QML whitelist.
2020-05-19 16:49:29 -04:00
kasenvr
7996698c8f
Merge branch 'master' into fix/other-renamings 2020-05-18 15:10:32 -04:00
ce4aa67506 Change Window Titles to Vircadia
Also strips trailing whitespaces from interface's Applicaction.cpp.
2020-05-17 14:30:36 -05:00
kasenvr
8b410c662e
Removed unused variable. 2020-05-16 16:35:16 -04:00
Heather Anderson
aad54a0580 renaming more of the annotations to be in a form Sentry is more likely to understand 2020-05-06 22:15:04 -07:00
Kasen IO
e85c50e712 Update URL. 2020-04-19 23:44:11 -04:00
Kasen IO
84e5a27b32 Add community-apps repo to default QML whitelist. 2020-04-15 21:14:32 -04: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
115c40bd54 Lots of renamings, more to come. 2020-04-07 04:56:02 -04:00
David Rowe
e6c54faaf2 Merge branch 'kasen/core' into fix/http-serverless 2020-02-07 11:32:38 +13:00
David Rowe
7c87f89712 Add FIXME for Clipboard.importEntities() 2020-02-07 11:12:54 +13:00
David Rowe
4f0cc2ebd5 Remove dead code 2020-02-06 11:28:51 +13:00
David Rowe
ad427e31a7 Make --url take existing Interface to FILE, HTTP, and HTTPS serverless 2020-02-06 11:11:41 +13:00
Kasen IO
08ec9ef3b7 Various URL updates + window title update. 2020-02-05 15:25:51 -05:00
David Rowe
46173439ed Enable serverless domains via HTTP and HTTPS 2020-02-01 12:46:28 +13:00
David Rowe
7ed117dfcb Replace links to docs.highfidelity.com 2020-01-24 10:18:55 +13:00
f5fcb90cac
Revert "Removed obsolete default scripts + more branding changes." 2020-01-16 18:51:49 -06:00
e5dd23b922
Merge pull request #33 from kasenvr/feature/metaverse-url-switching
Ability to change Metaverse API from setting
2020-01-14 18:40:04 -06:00
Kasen IO
336b5e275b Removed obsolete default scripts + more branding changes. 2020-01-12 23:13:01 -05:00
kasenvr
1d14bed3ce
Merge pull request #16 from FluffyJenkins/feature/qmlWhitelistMeow
QML Whitelisting
2019-12-30 19:51:51 -05:00
kasenvr
9dc7f54bfd
Merge pull request #38 from kasenvr/feature/quality-of-life-k2
Feature/quality of life k2
2019-12-29 18:28:58 -05:00
Nex-Pro
4856dd07fc
Update interface window title
Change window title from "High Fidelity" to "Project Athena"
2019-12-25 00:20:36 +00:00
Kasen IO
c34cd996df change Metaverse API from setting 2019-12-20 11:39:05 +01:00
David Rowe
e13b237e96 Add missing Controller.Hardware.Application camera properties' JSDoc 2019-12-19 11:23:36 +13:00
Fluffy Jenkins
0f3e8d2101 Made requested changes 2019-12-18 20:08:20 +00:00
Kasen IO
d4c3504c8d Updated about dialog (old logo still there), application name, and readme.md 2019-12-14 23:12:54 -05:00
Fluffy Jenkins
82dc6d197a New feature 2019-12-14 03:02:13 +00: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
Brad Hefta-Gaub
f8a9789f86
Merge pull request #16499 from HifiExperiments/proceduralMesh
Procedural vertex shaders
2019-12-13 13:00:01 -08:00
HifiExperiments
0bd5e15b47 fix non-procedural material entity crash
Signed-off-by: Kasen IO <kasenvr@gmail.com>
2019-12-13 02:17:52 -05:00
HifiExperiments
6e961b9f2f procedural vertex shaders
Signed-off-by: Kasen IO <kasenvr@gmail.com>
2019-12-12 22:49:48 -05:00
HifiExperiments
2eb0ec18fc fix non-procedural material entity crash 2019-12-11 00:42:59 -08:00
Seth Alves
f97c3217a5 allow Linux interface to connect to domain when DISABLE_QML is true 2019-12-10 09:52:12 -08:00
Kasen IO
68443f878b Update Application.cpp
updated application name.
2019-12-09 18:06:33 -05:00
David Rowe
96e21343bf Selfie view menu option isn't present in HMD mode 2019-12-08 12:38:48 +13:00
David Rowe
aabf27955b Fix camera view cycling getting stuck in non-existent fullscreen mirror 2019-12-08 12:38:48 +13:00
Kasen IO
6976939ff4 Merge branch 'kasen/core' into v0860-kasen-release+freshstart 2019-12-04 13:42:20 -05:00
Kasen IO
245224f0e9 Updated readme.md again + updated application title again. 2019-12-04 13:39:22 -05:00
Kasen IO
2cf453432e Updated readme.md + updated application title. 2019-12-04 11:50:01 -05:00
Kasen IO
165eb16f93 Merge branch 'kasen/core' into v0860-kasen-release+freshstart 2019-12-01 20:04:32 -05:00
Kasen IO
872a0b4496 Updated application version to 86. 2019-12-01 20:04:00 -05:00
Kasen IO
0b46c53df1 Merge branch 'kasen/core' into v0860-kasen-release+freshstart 2019-12-01 19:59:59 -05:00
dante ruiz
cd6f9a774d
implement gesture pinch to camera zoom 2019-11-18 11:33:31 -07:00
HifiExperiments
b73a608094 procedural vertex shaders 2019-11-15 00:22:40 -08:00
Zach Fox
5229b0c0f3 Various cleanup and CR 2019-11-14 15:45:52 -08:00
Zach Fox
b4135e2655 We are so close... 2019-11-13 17:35:57 -08:00
Kalila R
a7b2c3a32c Updated application name and version. 2019-11-11 20:22:19 -05:00
milad
c6f7c058bc merging master 2019-11-05 17:30:09 -08:00
HifiExperiments
bae2ba7bae merge with master 2019-11-02 01:08:56 -07:00
MiladNazeri
676e7bd5b8
Merge branch 'master' into screenshareElectronApp 2019-10-31 13:11:56 -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
Zach Fox
47b3fdbfe3 Stop screenshare process on interface shutdown 2019-10-31 10:01:00 -07:00
milad
ea373ac14c First steps towards a screenshare app 2019-10-30 16:44:42 -07:00
HifiExperiments
deb5aacfad fix materialcachescriptinginterface 2019-10-25 18:16:08 -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
HifiExperiments
1e100a672e merge with master and try to fix opacity mode stuff 2019-10-23 22:21:45 -07:00
Anthony J. Thibault
d43d12dfa7 Merge branch 'master' into feature/arkit-blendshapes 2019-10-23 21:45:10 -07:00
Anthony Thibault
edb181bd16
Merge pull request #16317 from luiscuenca/setAvatarLookAtAPI
DEV-2285: Improve eyes look at
2019-10-23 20:42:27 -07:00
David Rowe
378c47d16c Replace world detail quality float with enum 2019-10-22 19:18:11 +13:00
luiscuenca
a4fcb2c39e
Add eyesLookAtTarget set/get API methods 2019-10-21 14:31:15 -07:00
luiscuenca
33ea63c708
Fix warnings and update controls 2019-10-17 15:06:12 -07:00
luiscuenca
63c2b41929
Restate legacy first person camera mode 2019-10-17 13:26:42 -07:00
Shannon Romano
95f00e2caa
Merge pull request #16362 from huffman/fix/mac-early-exit
DEV-830: Remove call to processEvents on Mac in ~Application
2019-10-16 22:22:58 -07:00
Ryan Huffman
e83ac8c0dd Remove call to processEvents on Mac in ~Application 2019-10-16 16:14:27 -07:00
Anthony J. Thibault
da0911e01b Delete legacy blendshape code
Move FaceshiftConstants to BlendshapeConstants.
Delete FaceTracker and DdeFaceTracker classes.
Delete old facetracker menu and preferences
2019-10-16 10:36:37 -07:00
luiscuenca
93a1adc736
Fix camera position in first person 2019-10-15 18:25:33 -07:00
Ken Cooke
ec67b67966 On waking from sleep/hibernate, restart the audio devices 2019-10-10 14:10:47 -07:00
Brad Davis
960cab9994 Qt 5.13 warnings & fixes 2019-10-08 15:40:13 -07:00
luiscuenca
059bcc10cc
merge master 2019-10-02 13:24:32 -07:00
Maia Hansen
220123ff3b
Merge pull request #16254 from kencooke/macos-appnap-disabler
BUGZ-1117: On Mac OS, disable App Nap to prevent audio glitches
2019-10-01 10:53:03 -07:00
luiscuenca
0fac1e134f
Allow avatar look at when in first person camera 2019-09-30 16:43:02 -07:00
Shannon Romano
e8f1eecc5b
Merge pull request #16258 from samcake/yellow
DEV-1815: Investigating rendering issues with opacity map and adding tools to debug resource caches
2019-09-30 16:36:24 -07:00
Brad Davis
403499bf32 Cleaning up android build warnings 2019-09-27 09:19:52 -07:00
Ken Cooke
ae62b96f67 On Mac OS, disable App Nap to prevent audio glitches while running in the background 2019-09-26 08:52:35 -07:00
Sam Gateau
ba11c3e702 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-25 17:54:21 -07:00
Clement
96b58756b1 Add flag for account settings feature 2019-09-24 16:50:10 -07:00
Sam Gateau
483a716839 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-23 10:19:45 -07:00
Sam Gateau
3c2809b9ed Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2019-09-21 08:52:13 -07:00
Clement
1ca30b688d Put flush timer on right thread without parenting 2019-09-20 15:39:35 -07:00
Shannon Romano
bd488f0196
Merge pull request #16144 from luiscuenca/addLookAtThirdCamera
DEV-391: Keyboard Input Controls Camera Not Avatar Orientation
2019-09-20 13:03:03 -07:00
luiscuenca
365aa1bf03
Add jdoc to camera modes and fix variable namings 2019-09-19 17:30:01 -07:00
luiscuenca
279e25ca70
Merge master 2019-09-19 13:21:49 -07:00
luiscuenca
6d98537a20
Clean up code and refactor avatar-animation.json 2019-09-19 10:45:20 -07:00
Sam Gateau
819c942056 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-19 09:01:19 -07:00
Clement
527b27b32d Make sure the flush timer is not spawned too early 2019-09-18 17:05:05 -07:00
luiscuenca
7bc8e6b237
Solved some sitting and sound issues while looking at 2019-09-18 17:00:10 -07:00
Shannon Romano
e7001c3f1b
Merge pull request #16157 from sethalves/vive-pro-groundwork
DEV-605: Vive pro groundwork
2019-09-18 16:36:12 -07:00
Sam Gateau
381fc5146f Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-17 18:08:09 -07:00
Sam Gateau
c0660329a3 Exposing the REsource Caches through a bit of ui, adding MaterialCache to the family 2019-09-17 18:06:08 -07:00
luiscuenca
1054e8fcde
Selfie camera and updated camera menus 2019-09-17 17:15:16 -07:00
Seth Alves
a288c0a52d remove old/unused eyetracker code. 2019-09-17 09:43:21 -07:00
Sam Gateau
60045f4783 Replacing key combination to trigger a frame capture 2019-09-16 17:48:30 -07:00
luiscuenca
7c7c3cd223
merge master 2019-09-11 14:07:19 -07:00
luiscuenca
2f33e37eb6
Angles instead dot product and fix API 2019-09-10 18:10:02 -07:00
luiscuenca
78eee5961c
Fix key mapping for new camera 2019-09-05 18:05:46 -07:00
luiscuenca
ff8f2c5c16
Add new LookAt camera 2019-09-05 17:04:39 -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
HifiExperiments
97b9179144 merge with master 2019-09-05 00:46:56 -07:00
Bradley Austin Davis
8e3b337a6e
Merge pull request #16120 from jherico/fix/bugz-1365
BUGZ-1365: prevent server scripts from accessing local files in HTML controls
2019-08-30 13:10:09 -07:00
Brad Davis
6aa967f29f fixing test code 2019-08-29 14:11:22 -07:00
Brad Davis
428a58710d BUGZ-1365: Ensure that by default web views can't access local content 2019-08-29 13:44:49 -07:00
Shannon Romano
3695a5e633
Merge pull request #16105 from amerhifi/bugz-186
CASE DEV-186: HQ Launcher/Interface Icons and wording need to be standardized
2019-08-28 15:58:10 -07:00
amerhifi
335dea43df changing app name to high fidelity and changing icons to the new logo 2019-08-27 20:08:21 +02:00
Shannon Romano
3134332513
Merge pull request #16098 from hyperlogic/feature/backtrace-shutdown-flag
Added "shutdown" crash annotation and crash menu option
2019-08-27 10:57:07 -07:00
Anthony J. Thibault
e98cdab294 Moved CrashHelper.h include to the appropriate place. 2019-08-26 17:05:08 -07:00
Bradley Austin Davis
07ee9e901f
Merge pull request #16099 from jherico/fix/wake_crash
BUGZ-1264: Support platform independent sleep/wake notifications
2019-08-26 16:20:50 -07:00
Brad Davis
e1bf3f2540 PR feedback 2019-08-26 11:51:33 -07:00
Zach Fox
497edf6068 Add a comment 2019-08-26 09:03:10 -07:00
Brad Davis
dfd78a2662 Support platform independent sleep/wake notifications 2019-08-24 13:16:48 -07:00
Anthony J. Thibault
d410cb4fda Added "shutdown" crash annotation and crash menu option 2019-08-24 11:12:28 -07:00
Zach Fox
dfcf70b9b5 Tons of Emote/Emoji changes 2019-08-23 14:14:53 -07:00
Andrew Meadows
32400a6baf improved isStuck detection and MyAvatar::safeLanding() trigger 2019-08-20 17:33:29 -07:00
Ryan Huffman
8097ecef11 Fix cmd-leftclick not working correctly on Mac OS
On Mac OS, Cmd+LeftClick is treated as a RightClick (more specifically, it seems to
be Cmd+RightClick without the modifier being dropped). Starting in Qt 5.12, only
on Mac, the MouseButtonRelease event for these mouse presses are sent to the top
level QWidgetWindow, but are not propagated further. The change here gets around
this problem by capturing these pseudo-RightClicks, and re-emitting them as
"pure" RightClicks.
2019-08-19 15:53:20 -07:00
Simon Walton
85da916a3b
Merge pull request #16061 from SimonWalton-HiFi/entities-scriptengine-takedown
BUGZ-984: Wait for client entity-scripts to unload when shutting down
2019-08-16 10:12:38 -07:00
Simon Walton
9aacd136b8 Add blocking to script unload for client entity-scripts 2019-08-14 13:51:40 -07:00
Zach Fox
a225a009cd BUGZ-1233: Remove keyboard shortcut to LoD tools 2019-08-12 11:27:34 -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
sabrina-shanman
0d5260bccc More LOD renaming with focus on angles 2019-08-06 16:35:41 -07: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
Simon Walton
baa586939c Merge branch 'master' into min_threadpool_2 2019-08-06 14:25:37 -07:00
Kalila R
28b27a1e48 Merge branch 'v0.83.0-rc' into kasen/core 2019-08-03 15:27:23 -04:00
Brad Davis
06ad461c32 PR feedback 2019-08-01 16:57:54 -07:00
Brad Davis
bfe42215aa DEV-279: Add rendering API information to the platform JSON object 2019-08-01 14:29:03 -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
Howard Stearns
6ef0821801 steam gets the oculus store commerce treatment 2019-07-26 12:44:48 -07:00
humbletim
058c81aa1a Merge branch 'hifi-master' into kpi-v1-modkit-rc 2019-07-26 01:36:52 -04:00
humbletim
d334a2e5e2 QML-only write access for 'private/' Settings keys 2019-07-26 01:32:01 -04: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
Simon Walton
53cf915e8d Guard for AudioInjectorManager existance; clear an audio interface pointer 2019-07-24 14:51:41 -07:00
Andrew Meadows
b0f297e696 wait for SafeLanding to start before starting octreeQuery 2019-07-17 11:22:01 -07:00
Andrew Meadows
05d896f3de fix SafeLanding failure mode when first sequence number not 0 2019-07-17 11:22:01 -07:00
Shannon Romano
3f7e5a48bb
Merge pull request #15533 from sethalves/squeeze-vision-while-moving
Case 21663: comfort mode
2019-07-15 14:54:31 -07:00
Shannon Romano
7ea8675e83
Merge pull request #15919 from howard-stearns/mac-sleep-monitor
Mac sleep monitor
2019-07-15 08:39:19 -07:00