Shannon Romano
|
9d3d5b7701
|
Merge pull request #15992 from hyperlogic/feature/reaction-fixes
Refined reaction and sitting animations
|
2019-08-06 09:15:44 -07:00 |
|
Brad Davis
|
ee3b91f465
|
Fix vcpkg pre-requisites build for devs using VS2019
|
2019-08-05 20:02:58 -07:00 |
|
milad
|
5e12f4c42a
|
Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd
|
2019-08-05 19:01:20 -07:00 |
|
Sam Gateau
|
eb616452ec
|
An afternounwatchign code
|
2019-08-05 17:54:46 -07:00 |
|
David Rowe
|
2939610eae
|
Fix link to TextEffect type
|
2019-08-06 11:00:24 +12:00 |
|
David Rowe
|
1abf0eb207
|
Merge branch 'master' into DOC-124
# Conflicts:
# libraries/entities/src/EntityItemProperties.cpp
|
2019-08-06 10:59:50 +12:00 |
|
David Rowe
|
8ea4ee6d48
|
Doc review
|
2019-08-06 10:42:17 +12:00 |
|
Andy Howell
|
7aaecd9cdc
|
Merge pull request #16030 from danteruiz/fix-updater
fix updater typo
|
2019-08-05 15:42:00 -07:00 |
|
David Rowe
|
26a04e56eb
|
Merge branch 'master' into DOC-98
|
2019-08-06 10:33:12 +12:00 |
|
Sam Gateau
|
3a053c32f4
|
Merge branch 'master' of github.com:highfidelity/hifi into toulouse
|
2019-08-05 14:26:18 -07:00 |
|
Ken Cooke
|
6fd3214f48
|
Merge pull request #16029 from kencooke/audio-device-format-robustness
BUGZ-1171: Fix audio output not working (alternate fix)
|
2019-08-05 14:19:46 -07:00 |
|
Zach Fox
|
26e0a5dfd8
|
Merge pull request #16028 from zfox23/shieldIcon_master
RC84: Fix BUGZ-1131: Add Shield icon back to HUD for Metaverse users
|
2019-08-05 13:36:58 -07:00 |
|
sabrina-shanman
|
30482c2db4
|
Give the pointer its own copy of the script parameters in case its pick is deleted
|
2019-08-05 13:36:15 -07:00 |
|
dante ruiz
|
7ab8a6b8d1
|
fixing typo
|
2019-08-05 13:16:08 -07:00 |
|
David Rowe
|
f97417932c
|
Fix typo
|
2019-08-06 08:08:08 +12:00 |
|
David Rowe
|
419044021b
|
Merge branch 'master' into DOC-61
|
2019-08-06 08:03:12 +12:00 |
|
Anthony J. Thibault
|
640c058591
|
Code review feedback
|
2019-08-05 12:52:42 -07:00 |
|
Ken Cooke
|
86adc6099b
|
Attempt audio device format with native sample rate and channels forced to 2/1 before failing
|
2019-08-05 12:14:45 -07:00 |
|
Zach Fox
|
34bc71fba9
|
Fix BUGZ-1131: Add Shield icon back to HUD for Metaverse users
|
2019-08-05 15:12:29 -04:00 |
|
sabrina-shanman
|
715f6a4473
|
Mark BaseNestableTransformNode::toVariantMap with override
|
2019-08-05 12:02:24 -07:00 |
|
Brad Hefta-Gaub
|
e1ef003523
|
Merge pull request #16024 from amerhifi/master
case BUGZ-1168: adding default script location setting for defaultscriptoverride run…
|
2019-08-05 11:34:41 -07:00 |
|
Ken Cooke
|
ccfe6bda63
|
Detect clipping prior to echo cancellation (overload of the uncancelled raw input will cause echo leakage!)
|
2019-08-05 10:34:03 -07:00 |
|
sabrina-shanman
|
0bd00c3554
|
Fix not being able to use both QVector<unsigned int> and QVector<glm::uint32> in scripting
|
2019-08-05 10:31:13 -07:00 |
|
sabrina-shanman
|
27cf080ad6
|
Simplify getting nestable pointer in BaseNestableTransformNode::toVariantMap
|
2019-08-05 09:52:01 -07:00 |
|
Sam Gateau
|
d55f143300
|
Merge branch 'master' of github.com:highfidelity/hifi into toulouse
|
2019-08-05 09:49:14 -07:00 |
|
Anthony J. Thibault
|
704a2d2ac9
|
Merge branch 'master' into feature/reaction-fixes
|
2019-08-05 09:43:32 -07:00 |
|
Anthony J. Thibault
|
649ef6c721
|
Added sitting idle variation and removed rejected emote variations.
|
2019-08-05 09:42:01 -07:00 |
|
Andy Howell
|
a0d52f6f24
|
Merge pull request #15985 from danteruiz/auto-updater
DEV-264: Lilypad Launcher (Mac): Auto-update Launcher
|
2019-08-05 09:36:01 -07:00 |
|
HifiExperiments
|
1b84244210
|
merge with master
|
2019-08-05 09:35:56 -07:00 |
|
sabrina-shanman
|
f188a3589e
|
Fix function signature for BaseNestableTransformNode::toVariantMap
|
2019-08-05 09:35:47 -07:00 |
|
sabrina-shanman
|
64fb046a33
|
Simplify naming for script functions to get list of picks/pointers
|
2019-08-05 09:25:32 -07:00 |
|
milad
|
d1efbc051a
|
working UI
|
2019-08-04 15:11:55 -07:00 |
|
Anthony J. Thibault
|
a8d7f06862
|
warning fixes
|
2019-08-04 11:03:21 -07:00 |
|
David Rowe
|
5576bf7e09
|
Update PlatformInfo JSDoc with recent graphicsAPIs addition
|
2019-08-03 12:19:36 +12:00 |
|
David Rowe
|
e2748a861a
|
Merge branch 'master' into DOC-98
# Conflicts:
# libraries/platform/src/platform/backend/Platform.cpp
|
2019-08-03 11:22:23 +12:00 |
|
sabrina-shanman
|
20fa78e51d
|
Fix some dates and no newline at EOF
|
2019-08-02 16:13:07 -07:00 |
|
sabrina-shanman
|
f7c324c017
|
Improve pick/pointer debugging. Use unsigned int in Graphics api for compatibility
|
2019-08-02 16:10:39 -07:00 |
|
Shannon Romano
|
7322ad78f5
|
Merge pull request #16023 from AndrewMeadows/fix-shcore-win7
BUGZ-1145: check for Win7 before using SHCore.dll API
|
2019-08-02 15:43:30 -07:00 |
|
amerhifi
|
cf3fc5b135
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2019-08-02 14:41:12 -07:00 |
|
MiladNazeri
|
ae7b415152
|
Merge pull request #16008 from HifiExperiments/text
Supporting text effects + fonts on Text Entities
|
2019-08-02 14:25:28 -07:00 |
|
amerhifi
|
a37ef7d80e
|
adding default script location setting for defaultscriptoverride runs. Prevents the second interface run to have no ui
|
2019-08-02 13:00:43 -07:00 |
|
Amer
|
93d5b2a35a
|
Merge pull request #16022 from amerhifi/master
bugz- 982 : adding ability to reload defaultOverride script without saving to set…
|
2019-08-02 12:58:40 -07:00 |
|
Andrew Meadows
|
ebe7581f62
|
check for Win7 before using SHCore.dll API
|
2019-08-02 11:39:54 -07:00 |
|
dante ruiz
|
b9106b9ade
|
making requested changes
|
2019-08-02 11:26:41 -07:00 |
|
amerhifi
|
0ee9de7ed8
|
lambda space
|
2019-08-02 11:24:21 -07:00 |
|
amerhifi
|
d05f1ac87f
|
adding ability to reload defaultOverrdie script without saving to settings:
|
2019-08-02 11:23:33 -07:00 |
|
MiladNazeri
|
76e9f8896c
|
Merge pull request #16021 from kencooke/audio-volume-control-persist
BUGZ-352: Persist the audio volume settings across sessions
|
2019-08-02 10:34:44 -07:00 |
|
Anthony J. Thibault
|
31762a0c80
|
Bug fixes in seated reactions
|
2019-08-02 10:17:59 -07:00 |
|
Bradley Austin Davis
|
543f07b6ae
|
Merge pull request #16018 from jherico/fix/dev-279
DEV-279: Add rendering API information to the platform JSON object
|
2019-08-02 10:16:06 -07:00 |
|
Anthony J. Thibault
|
c8e4536bba
|
Hooked up variations of seated while talking and stubs for reactions while seated.
|
2019-08-02 10:11:38 -07:00 |
|