Shannon Romano
|
9e0e6f9d5e
|
Merge pull request #16003 from ctrlaltdavid/DOC-84
DOC-84: Update JSDoc with glTF
|
2019-08-06 13:22:04 -07:00 |
|
Shannon Romano
|
8c981140b0
|
Merge pull request #16005 from ctrlaltdavid/DOC-61
DOC-61: Render API JSDoc
|
2019-08-06 13:18:17 -07:00 |
|
Zach Fox
|
8b85bbfe67
|
Merge pull request #16034 from zfox23/masterGPU
BUGZ-1103: Use 'Master GPU' information in About screen
|
2019-08-06 12:31:54 -07:00 |
|
jennaingersoll
|
f487d094fe
|
Merge pull request #15959 from ctrlaltdavid/DOC-124
DOC-124: Tidy JSDoc from some recent API changes
|
2019-08-06 11:57:28 -07:00 |
|
Zach Fox
|
2a4c0a3ecd
|
BUGZ-1103: Use 'Master GPU' information in About screen
|
2019-08-06 14:13:31 -04:00 |
|
Shannon Romano
|
f02b76fed0
|
Merge pull request #16011 from ctrlaltdavid/DOC-60
Case 22106: DebugDraw JSDoc
|
2019-08-06 10:47:43 -07:00 |
|
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 |
|
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 |
|
Andy Howell
|
7aaecd9cdc
|
Merge pull request #16030 from danteruiz/fix-updater
fix updater typo
|
2019-08-05 15:42:00 -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 |
|
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 |
|
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 |
|
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 |
|
Anthony J. Thibault
|
a8d7f06862
|
warning fixes
|
2019-08-04 11:03:21 -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 |
|
Shannon Romano
|
166d29bd3b
|
Merge pull request #16019 from sethalves/bugz-1158
BUGZ-1158: fix uninitialized variables
|
2019-08-02 09:38:48 -07:00 |
|
Anthony J. Thibault
|
aad6958b68
|
Don't evaluate overPoses if alpha is 0.0.
|
2019-08-02 09:36:20 -07:00 |
|
Sabrina Shanman
|
ad298cb132
|
Merge pull request #16012 from AndrewMeadows/bugz1069
BUGZ-1069: fix crash in oven for lack of MaterialCache instance in DependencyManager
|
2019-08-02 09:24:08 -07:00 |
|
Brad Davis
|
020fd20169
|
Fixing caplitalizatoin
|
2019-08-02 09:01:08 -07:00 |
|
Ken Cooke
|
0b97f2bbc0
|
Track the desired audio-mixer gains when not connected
|
2019-08-02 07:14:43 -07:00 |
|
Ken Cooke
|
437d0ea928
|
Save and restore the audio gain settings
|
2019-08-02 06:46:34 -07:00 |
|
David Rowe
|
789f9c7d67
|
Merge branch 'master' into DOC-124
# Conflicts:
# interface/src/scripting/Audio.h
|
2019-08-02 20:34:09 +12:00 |
|
HifiExperiments
|
029a494beb
|
try to fix android shader build error
|
2019-08-01 21:29:01 -07:00 |
|
Brad Davis
|
8878731826
|
Fixing unused vars
|
2019-08-01 17:44:42 -07:00 |
|
Shannon Romano
|
2f6d79fb45
|
Merge pull request #15920 from annabrewer/combine-tone-map-resample
BUGZ-965: Standardize and shorten deferred/forward and desktop/android pipelines
|
2019-08-01 17:39:38 -07:00 |
|
Brad Davis
|
c85b0572e5
|
fixing function name
|
2019-08-01 17:17:47 -07:00 |
|
Brad Davis
|
06ad461c32
|
PR feedback
|
2019-08-01 16:57:54 -07:00 |
|
Seth Alves
|
f1dee1e7f8
|
fix uninitialized variables
|
2019-08-01 14:50:21 -07:00 |
|
Brad Davis
|
bfe42215aa
|
DEV-279: Add rendering API information to the platform JSON object
|
2019-08-01 14:29:03 -07:00 |
|