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
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
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
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
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
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
Anthony J. Thibault
befbdcef48
Upgraded OSC plugin with changes from ARKit blendshape work.
2019-11-19 13:13:56 -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
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
amerhifi
ddfbb55e19
fixed old ui filtering of audio devices
2019-10-29 15:36:43 -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
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
341abb8185
Merge branch 'master' of github.com:highfidelity/hifi into friction
2019-10-14 12:36:35 -07:00
