Commit graph

1674 commits

Author SHA1 Message Date
Kasen IO
b74ccef418 Address CR from Thoys and David. 2020-06-06 18:35:02 -04:00
187a2749c3 Rebrand the About dialog to Vircadia.
Also removes trailing whitespace from Menu.cpp.
2020-05-17 14:26:45 -05: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
fbaf0ea56b Remove debugging cache clearer. 2020-01-22 15:08:26 -05:00
Kasen IO
bd066adbf6 Whitelist toggle not working c++ side. 2020-01-20 16:03:48 -05:00
074e9f711a Update Help menu links for Project Athena.
Changes links in the help menu to point to Project Athena sites. Removed menu option for Online Forums, cuz I don't think we have one yet.
2020-01-10 16:20:00 -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
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
Kasen IO
2e36c40912 added QML + C++ system for whitelists 2019-12-07 21:37:23 -05:00
Sam Gateau
048626ba9a
Merge pull request #15278 from kitely/clear-more-disk-caches
case 21983: Clear more disk caches
2019-11-18 11:11:26 -08:00
Sam Gateau
a4696992e8 Renaming the env variable to enable Material Proecural Shaders 2019-11-04 11:15:37 -08:00
HifiExperiments
bae2ba7bae merge with master 2019-11-02 01:08:56 -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
luiscuenca
63c2b41929
Restate legacy first person camera mode 2019-10-17 13:26:42 -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
Zach Fox
240f904b85 DEV-2386: Remove 'Run Client Script Test' 2019-10-10 11:11:27 -07:00
Zach Fox
960440e802 DEV-2352: Modify Release Notes URL 2019-10-08 14:28:01 -04: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
luiscuenca
7bc8e6b237
Solved some sitting and sound issues while looking at 2019-09-18 17:00:10 -07:00
luiscuenca
1054e8fcde
Selfie camera and updated camera menus 2019-09-17 17:15:16 -07:00
Seth Alves
b64ff70d6c add show-lookat-targets DebugDraw. remove old/unused eyetracker code. 2019-09-17 09:43:19 -07:00
milad
f9c5d00efa remove source from variable name 2019-09-11 12:10:47 -07:00
milad
5ec8b0d589 added environment variable check for crash menu 2019-09-11 11:39:19 -07:00
HifiExperiments
97b9179144 merge with master 2019-09-05 00:46:56 -07:00
Anthony J. Thibault
d410cb4fda Added "shutdown" crash annotation and crash menu option 2019-08-24 11:12:28 -07:00
Oren Hurvitz
d7ef7a052d The "Clear Disk Caches" command also deletes the HTTP cache used by QtWebEngine
Note that this only clears the HTTP cache (used for files), but not the directory used for
persistent data such as Cookies, Local Databases, etc. There's no Qt API to do that.
Fortunately, this directory should be small.
2019-07-26 15:28:44 +03:00
Oren Hurvitz
dbd9299e85 The "Clear Disk Caches" command also clears the KTX cache (on the next restart) 2019-07-26 10:30:43 +03:00
Zach Fox
4caa00d6cc Start BUGZ-814: Start working on a new Graphics dialog for Metaverse version of Interface 2019-07-10 16:42:48 -07:00
SamGondelman
9c1b139d5f merge with master 2019-06-25 23:46:39 -07:00
Sam Gateau
22cd631a04 Merge And Modifying the Graphics settings and the dev menu 2019-06-20 17:48:36 -07:00
Sam Gondelman
3d05a954bc
Merge branch 'master' into proceduralMesh 2019-05-23 09:35:14 -07:00
Sam Gateau
98e426ac9f
Merge pull request #15590 from SamGondelman/settings
BUGZ-284: Add shadows, AA, and AO to RenderScriptingInterface
2019-05-21 15:08:02 -07:00
Sam Gondelman
a7842fe3ea
Merge branch 'master' into proceduralMesh 2019-05-21 09:51:33 -07:00
SamGondelman
2e666836c7 add more options to render scripting interface 2019-05-20 13:42:53 -07:00
sabrina-shanman
fa7621896a Add debug icon which shows on render items with transitions 2019-05-20 11:58:01 -07:00
SamGondelman
6d3e23a7fe merge with master 2019-05-16 20:03:10 -07:00
SamGondelman
14c38c0fb0 ಠ⌣ಠ 2019-05-16 10:27:59 -07:00
Anthony Thibault
4761a69a4d
Merge pull request #15438 from luiscuenca/skeletonTrait
Skeleton Trait Implementation
2019-04-26 10:14:47 -07:00
Sam Gateau
dc7abe1aff
Merge pull request #15450 from amerhifi/feature/macScreenScale
Case 22350: Setting mac default for resolution render scale
2019-04-25 19:33:54 -07:00
amerhifi
cc3c75c8d1 adding mac default for screen scale 2019-04-24 10:24:48 -07:00
Shannon Romano
a6ff19c4ee
Merge pull request #15377 from sethalves/remove-unwanted-view-menuitems
case 22175: remove view/Independent-Mode and view/Entity-Mode menu items
2019-04-24 09:13:59 -07:00
luiscuenca
20cac4cd4d
Rotation fix and refactor 2019-04-22 11:38:27 -07:00
SamGondelman
7fa81ffef3 fix warnings 2019-04-18 12:48:46 -07:00
Seth Alves
feda884c71 remove view/Independent-Mode and view/Entity-Mode menu items and related code. Leave the modes available for scripts. 2019-04-12 09:21:48 -07:00
David Back
1e4a6a7cd8 fix delete key doing ctrl + delete in hmd 2019-03-28 16:46:26 -07:00
Wayne Chen
db22fa9eec show up audio screen using Settings > Audio 2019-03-18 09:23:17 -07:00
Thijs Wenker
5d40e1e480 - CR/style fixes
- Moved the old Avatar Packager tool to Developer -> Avatar -> ..
2019-01-04 23:39:04 +01:00