Dale Glass
|
b681f99d21
|
Rename the crash reporting settings to force new default value
Doing this ensures the new default applies to all clients, without
having to reset the configuration.
|
2020-06-11 20:00:47 +02: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 |
|
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 |
|
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 |
|
Kasen IO
|
7489505f99
|
Updated whitelist info and name to include QML.
|
2019-12-26 22:27:58 -05:00 |
|
Kasen IO
|
2e36c40912
|
added QML + C++ system for whitelists
|
2019-12-07 21:37:23 -05:00 |
|
David Rowe
|
aabf27955b
|
Fix camera view cycling getting stuck in non-existent fullscreen mirror
|
2019-12-08 12:38:48 +13: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
|
1e100a672e
|
merge with master and try to fix opacity mode stuff
|
2019-10-23 22:21:45 -07:00 |
|
luiscuenca
|
63c2b41929
|
Restate legacy first person camera mode
|
2019-10-17 13:26:42 -07:00 |
|
Zach Fox
|
240f904b85
|
DEV-2386: Remove 'Run Client Script Test'
|
2019-10-10 11:11:27 -07: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 |
|
Anthony J. Thibault
|
d410cb4fda
|
Added "shutdown" crash annotation and crash menu option
|
2019-08-24 11:12:28 -07: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 |
|
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
|
a7842fe3ea
|
Merge branch 'master' into proceduralMesh
|
2019-05-21 09:51:33 -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 |
|
luiscuenca
|
20cac4cd4d
|
Rotation fix and refactor
|
2019-04-22 11:38:27 -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 |
|
Thijs Wenker
|
3943fe2861
|
avatar packager initial
|
2018-12-10 21:29:03 +01:00 |
|
Seth Alves
|
541d0ab4d6
|
work around menu-item name hash collision for Home
|
2018-12-03 17:33:04 -08:00 |
|
Dante Ruiz
|
29028386c8
|
Keyboard menu option in general settings
|
2018-11-27 11:56:07 -08:00 |
|
humbletim
|
21030fbe5b
|
Merge remote-tracking branch 'upstream/master' into fb18302-deprecated-package-model
|
2018-11-14 23:40:04 -05:00 |
|
Seth Alves
|
969776e476
|
Merge pull request #14312 from ctrlaltdavid/M18577
Add option to start up at home location
|
2018-11-13 09:29:37 -08:00 |
|
Dante Ruiz
|
501746b156
|
3D Keyboard
|
2018-11-08 09:58:53 -08:00 |
|
David Rowe
|
ae2715af31
|
Add option to start up at home location
|
2018-11-01 08:57:12 +13:00 |
|
humbletim
|
f7cfc61494
|
Package Model... -> Package Avatar...
|
2018-10-22 15:02:33 -04:00 |
|
Anthony Thibault
|
640ed6a32a
|
Added "Developer > Avatar > Show Tracked Objects" menu
|
2018-10-15 12:42:07 -07:00 |
|
Anthony Thibault
|
acc7f1f168
|
Moved AnimStats into its own qml panels.
Added state machine tracking as well.
|
2018-09-06 16:18:58 -07:00 |
|
SamGondelman
|
0c8a4cc81e
|
merge with master
|
2018-08-28 17:31:51 -07:00 |
|
SamGondelman
|
70f4d0c634
|
Merge remote-tracking branch 'upstream/master' into perf
|
2018-08-24 14:04:37 -07:00 |
|
SamGondelman
|
c474f38860
|
force coarse picking, sort avatars
|
2018-08-22 18:07:16 -07:00 |
|
John Conklin II
|
32562511e8
|
Merge pull request #13782 from ElderOrb/FB17184
Add Support for Managing Avatar Entities to the Avatar App
|
2018-08-22 10:20:04 -07:00 |
|
Alexander Ivash
|
5ba68cbfac
|
remove attachments menu item / dialogs / related components
|
2018-08-11 00:50:32 +03:00 |
|
unknown
|
45b9871fdb
|
when adding asset to world set grabbable
|
2018-08-10 12:10:49 -07:00 |
|
sabrina-shanman
|
4c39d08358
|
Remove "Draw Collision Shapes" option from developer physics menu
|
2018-06-11 11:03:57 -07:00 |
|
Anthony J. Thibault
|
c3d1daf855
|
Merge branch 'master' into nativeCGCode
|
2018-06-04 09:32:38 -07:00 |
|
Dante Ruiz
|
3b59af3ed7
|
Merge branch 'master' of github.com:highfidelity/hifi into menu-updates
|
2018-05-18 16:42:31 -07:00 |
|
Dante Ruiz
|
ea771c2325
|
make final changes
|
2018-05-18 09:21:41 -07:00 |
|
Clement
|
da08d747dc
|
Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master
|
2018-05-17 12:10:08 -07:00 |
|
vladest
|
eb25601856
|
Return back LOD tools
|
2018-05-17 20:41:50 +02:00 |
|