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 |
|
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 |
|
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
|
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 |
|
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
|
dd64ecbdf2
|
Use the new property
|
2019-12-07 08:29:21 +13: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 |
|
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 |
|
milad
|
4b06e429d2
|
Merge branch 'screenshareElectronApp' of github.com:MiladNazeri/hifi into screenshareElectronApp
|
2019-11-06 17:43:38 -08:00 |
|
