kasenvr
|
4cca7f6f75
|
Merge pull request #281 from HifiExperiments/parenting2
Improve performance of MyAvatar::simulate when you have lots of descendants
|
2020-05-31 14:47:22 -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 |
|
Kasen IO
|
6c6a405020
|
Add periods and remove double copyright in tabletaboutdialog.qml
|
2020-05-25 16:41:16 -04:00 |
|
Kasen IO
|
a4bf1c4d82
|
Update copyright headers.
|
2020-05-25 15:59:43 -04:00 |
|
Kasen IO
|
ce1a1faf79
|
Fix copyright headers + some docs.
|
2020-05-20 15:02:03 -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 |
|
Kasen IO
|
f908d5bb0a
|
Undo logo change.
|
2020-05-17 22:20:02 -04:00 |
|
kasenvr
|
8b410c662e
|
Removed unused variable.
|
2020-05-16 16:35:16 -04:00 |
|
Kasen IO
|
f4bcc82dd6
|
Corrections.
|
2020-05-16 02:27:45 -04:00 |
|
HifiExperiments
|
3bf690571c
|
Merge branch 'master' into zoneOcclusion
|
2020-05-07 13:13:20 -07: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 |
|
MotoFufu9k
|
a710142871
|
Change "FILENAME_PATH_FORMAT" to "vircadia..."
|
2020-05-05 00:39:25 +02:00 |
|
MotoFufu9k
|
0d02f62ad5
|
Change all mentions of "hifi-snap-by-" to "vircadia-snap-by-"
|
2020-05-05 00:37:41 +02:00 |
|
David Rowe
|
5e997d7b60
|
Fix up Vircadia URLs
|
2020-04-27 20:38:23 +12:00 |
|
David Rowe
|
2d070e630b
|
Merge branch 'master' into fix/jsdoc-fixes
# Conflicts:
# interface/resources/qml/hifi/avatarapp/MessageBoxes.qml
# interface/resources/qml/hifi/commerce/checkout/Checkout.qml
# interface/resources/qml/hifi/commerce/purchases/Purchases.qml
# interface/src/Application.cpp
|
2020-04-26 20:38:43 +12:00 |
|
Heather Anderson
|
e29271d8ca
|
rename variables from "is crash enabled" to "is crash monitor enabled" (suggested by Thijs Wenker <me@thoys.nl>)
added a debug message giving the current state of the debug monitor switch (ignoring whether Crashpad support is compiled)
|
2020-04-25 20:32:38 -07:00 |
|
Heather Anderson
|
2d6d205bf2
|
The original patch was more appropriate. We need to figure out what this needs to do, enough dancing.
This reverts commit bc5dd45187.
|
2020-04-21 23:15:08 -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 |
|
Heather Anderson
|
bc5dd45187
|
Update interface/src/ui/PreferencesDialog.cpp
Removed extraneous ! from value retrieval (as if there aren't enough of them in here)
|
2020-04-10 22:51:20 -07:00 |
|
Heather Anderson
|
9187a680cd
|
Apply suggestions from code review
Adding suggested changes from ctrlaltdavid
Co-Authored-By: David Rowe <david@ctrlaltstudio.com>
|
2020-04-10 17:10:41 -07: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 |
|
HifiExperiments
|
9b1635f9cc
|
improve performance of MyAvatar::simulate when you have lots of entity descendants
|
2020-04-07 15:56:32 -07:00 |
|
Kasen IO
|
9dce990e8f
|
Help dialog updated.
|
2020-04-07 18:48:24 -04:00 |
|
Kasen IO
|
e9297eb131
|
Correction.
|
2020-04-07 16:17:09 -04:00 |
|
Kasen IO
|
115c40bd54
|
Lots of renamings, more to come.
|
2020-04-07 04:56:02 -04:00 |
|
HifiExperiments
|
6eacc5c8c2
|
Merge remote-tracking branch 'upstream/kasen/core' into zoneOcclusion
|
2020-04-03 14:37:14 -07:00 |
|
Heather Anderson
|
7cea4fc574
|
separate user activity logging from crash logging, allowing people to say "no" to tracking while still sending crashes
|
2020-04-03 02:38:53 -07:00 |
|
Thijs Wenker
|
6d9f040bfd
|
Merge pull request #158 from daleglass/linux_dynamic_build
Force dynamic build on Linux
|
2020-02-22 20:36:19 +01:00 |
|
|
|
8ab06f5e0e
|
Change to Project Athena in Task Manager
|
2020-02-19 16:37:22 -06: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
|
86d18e3706
|
Merge pull request #160 from ctrlaltdavid/fix/http-serverless
Add support for serverless domains via HTTP/HTTPS
|
2020-02-19 16:24:56 -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 |
|
kasenvr
|
48ae156db7
|
Merge pull request #104 from daleglass/implicit_copy_constructor
Make default copy constructors explicit
|
2020-02-08 14:45:44 -05: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 |
|
Dale Glass
|
39f23b52c3
|
Force dynamic build on Linux, fixes #151
|
2020-02-05 23:30:04 +01: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 |
|
Vegaslon
|
e74fccb49d
|
Allow users to set avatar thumbnails that show in avatar app.
|
2020-02-01 08:54:06 -05:00 |
|
David Rowe
|
46173439ed
|
Enable serverless domains via HTTP and HTTPS
|
2020-02-01 12:46:28 +13: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 |
|
