Commit graph

8406 commits

Author SHA1 Message Date
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