Commit graph

29946 commits

Author SHA1 Message Date
Shannon Romano
1011880698
Merge pull request #16049 from sabrina-shanman/ourLODEInvestigation
(BUGZ-1112) Make 20:20 vision equal seeing 1m cube from 400 meters away
2019-08-09 17:28:46 -07:00
sabrina-shanman
16593ec3c9 Remove invalid deprecated comment 2019-08-09 16:32:31 -07:00
sabrina-shanman
07ea79689e Fix build warnings 2019-08-09 13:34:55 -07:00
sabrina-shanman
49f1ecb1bf Fix new bugs in TabletLODTools.qml 2019-08-09 11:41:11 -07:00
Anthony Thibault
c2fbfd70c4
Merge pull request #16045 from hyperlogic/feature/reaction-intro-loop-outro
Higher quality standing and seated reactions
2019-08-09 11:16:49 -07:00
Brad Hefta-Gaub
555a875405
Merge pull request #16047 from jherico/fix/bugz-1097
BUGZ-1097: Fix invalid rendering of splash frame on AMD based macs
2019-08-09 09:51:38 -07:00
Shannon Romano
1993ff6277
Merge pull request #15922 from SimonWalton-HiFi/min_threadpool_2
BUGZ-993: Bump minimum threadpool size to 2
2019-08-09 09:20:55 -07:00
Anthony J. Thibault
733d7455f4 new seated talking anim 2019-08-09 08:52:38 -07:00
Brad Davis
c28d850514 BUGZ-1097: Fix invalid rendering of splash frame on AMD based macs 2019-08-09 08:13:20 -07:00
Anthony J. Thibault
b4869508a0 updated clap 2019-08-08 14:47:31 -07:00
sabrina-shanman
8347d9d23e Update LODManager setter in TabletLODTools.qml 2019-08-08 13:59:50 -07:00
sabrina-shanman
99a774c89c Do not display high viewing distance as 20:0 vision 2019-08-08 13:03:40 -07:00
sabrina-shanman
1571c2be27 Fix LOD math 2019-08-08 13:03:20 -07:00
Anthony J. Thibault
ef81ccafed Hooked up seated clap 2019-08-08 13:02:19 -07:00
Anthony J. Thibault
5d405cac3b Merge branch 'master' into feature/reaction-intro-loop-outro 2019-08-08 09:56:45 -07:00
Anthony J. Thibault
317c2f5219 sitting raise hand 2019-08-08 09:37:03 -07:00
sabrina-shanman
9c16fcfdef Make the LOD half angle the definitive LOD variable 2019-08-07 17:23:04 -07:00
Anthony J. Thibault
e5e012a83e agree, point and disagree sitting emotes 2019-08-07 14:15:29 -07:00
Sabrina Shanman
0728df8a8f
Merge pull request #16025 from sabrina-shanman/picks_debug
(BUGZ-1059) Improve debug API for picks/pointers
2019-08-07 12:01:26 -07:00
sabrina-shanman
66dbb08b01 Be explicit about pickType/pointerType being returned when getting script parameters 2019-08-07 10:44:43 -07:00
sabrina-shanman
4cb925e973 Fix jsdoc for getPointerScriptParameters 2019-08-07 10:04:44 -07:00
sabrina-shanman
8cde93973d Disambiguate pick and pointer types in the returned properties 2019-08-07 09:56:23 -07:00
Anthony J. Thibault
147753309f Updated clap02 with new version that is not as slow. 2019-08-06 17:57:27 -07:00
Anthony J. Thibault
3f6b488f27 Added intro-loop-outro phases for raiseHand, applaud and point 2019-08-06 17:39:30 -07:00
sabrina-shanman
0d5260bccc More LOD renaming with focus on angles 2019-08-06 16:35:41 -07:00
sabrina-shanman
6db6890bac Deprecate LODManager script properties: boundaryLevelAdjust and octreeSizeScale 2019-08-06 15:54:28 -07:00
sabrina-shanman
bc3acfa3c0 Clean up and re-name to reflect what uses octreeSizeScale and what uses
visibilityDistance
2019-08-06 15:46:10 -07:00
Simon Walton
baa586939c Merge branch 'master' into min_threadpool_2 2019-08-06 14:25:37 -07:00
Shannon Romano
93d5d9bd3f
Merge pull request #15988 from ctrlaltdavid/DOC-98
DOC-98, DOC-114: PlatformInfo API changes JSDoc
2019-08-06 13:22:36 -07:00
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
9d3d5b7701
Merge pull request #15992 from hyperlogic/feature/reaction-fixes
Refined reaction and sitting animations
2019-08-06 09:15:44 -07:00
Sam Gateau
eb616452ec An afternounwatchign code 2019-08-05 17:54:46 -07:00
David Rowe
1abf0eb207 Merge branch 'master' into DOC-124
# Conflicts:
#	libraries/entities/src/EntityItemProperties.cpp
2019-08-06 10:59:50 +12: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
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
Zach Fox
34bc71fba9 Fix BUGZ-1131: Add Shield icon back to HUD for Metaverse users 2019-08-05 15:12:29 -04: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
sabrina-shanman
64fb046a33 Simplify naming for script functions to get list of picks/pointers 2019-08-05 09:25:32 -07: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
MiladNazeri
ae7b415152
Merge pull request #16008 from HifiExperiments/text
Supporting text effects + fonts on Text Entities
2019-08-02 14:25:28 -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