Shannon Romano
72d3eb9d33
Merge pull request #14797 from kencooke/audio-injector-stereo-distattn-bugfix2
...
case 20805: RC78.1 to master: Fix the distance attenuation of stereo local injectors
2019-01-29 13:12:51 -08:00
Ken Cooke
fa08e42da6
Restore legacy attenuation behavior for system sounds and scripts that do not set position.
...
JS detects when "position" was not set by the script.
C++ explicitly sets .positionSet=false when not set (for system sounds).
Local rendering uses a direct mix (no attenuation/HRTF) when not set.
2019-01-29 11:21:02 -08:00
Jeff Clinton
536a76a791
Merge pull request #14787 from wayne-chen/oculusLoginFeature
...
MS20874: Only initialize plugin if started through Oculus Store
2019-01-29 10:57:03 -08:00
Jeff Clinton
654712cfad
Merge pull request #14757 from gcalero/display_name_and_avatar
...
Choose avatar and set display name
2019-01-29 10:45:11 -08:00
luiscuenca
a6dce5dd84
Merge branch 'master' into multiSphereAvatar04
2019-01-28 17:48:22 -07:00
luiscuenca
fced9e2814
Review fixes
2019-01-28 17:43:51 -07:00
Shannon Romano
607ce00713
Merge pull request #14766 from AndrewMeadows/grab-it
...
case 20701: fixes for grab
2019-01-28 15:57:36 -08:00
Shannon Romano
d8f781deae
Merge pull request #14719 from jherico/feature/quest_frame_serialization
...
case 20883: GPU frame serialization and related tools
2019-01-28 15:47:55 -08:00
Wayne Chen
0f1aebea82
adding init/shutdown for plugin init
2019-01-28 14:35:41 -08:00
luiscuenca
1b75f569b3
fix jsdoc
2019-01-28 15:02:10 -07:00
Gabriel Calero
1d1ae90e8e
Merge remote-tracking branch 'upstream/master' into display_name_and_avatar
2019-01-28 17:39:59 -03:00
luiscuenca
2a1f1a4855
Remove debug logging
2019-01-28 12:55:36 -07:00
luiscuenca
cc73649ef8
Merge branch 'master' into multiSphereAvatar04
2019-01-28 11:57:04 -07:00
luiscuenca
49659f0039
Fix error on exit and jointsToFilter param removed
2019-01-28 11:55:53 -07:00
Jeff Clinton
f9b63b975d
Merge pull request #14781 from danteruiz/script-print-log
...
Case: 20770 allow debug prints in the log by default
2019-01-28 10:49:18 -08:00
Jamil Akram
bcaad3092b
Merge pull request #14695 from amantley/trumpFix
...
Fixed Sinking Trump Avatar Bug: Stops unnecessary vertical re-centering with big-headed avatar
2019-01-28 10:12:55 -08:00
Seth Alves
15aa574afd
Merge pull request #14774 from danteruiz/window-ontop
...
case 20705: Allow log window to stay on top
2019-01-28 10:05:48 -08:00
Shannon Romano
a2b2f3f67c
Merge pull request #14742 from hyperlogic/bug-fix/user-recenter-model-pref
...
Settings > Controls > User Recenter Model now saves properly
2019-01-25 17:34:33 -08:00
Shannon Romano
f084021fdf
Merge pull request #14678 from hyperlogic/feature/hmd-avatar-alignment-type
...
Added HMD Avatar Alignment Type
2019-01-25 17:32:41 -08:00
Jeff Clinton
f78fdffeda
Merge pull request #14727 from wayne-chen/oculusLoginFeature
...
MS20311: Oculus login feature
2019-01-25 16:16:32 -08:00
amantley
91fddf783f
increased the threshold to stop vertical recentering
2019-01-25 16:09:45 -08:00
Dante Ruiz
db58173977
fix mac issue
2019-01-25 15:10:53 -08:00
amantley
cc4d9e2ae2
Merge remote-tracking branch 'upstream/master' into trumpFix
2019-01-25 15:05:00 -08:00
Adam Smith
f651ad2f67
Merge pull request #14711 from SamGondelman/NOverlays10
...
Case 20585: Add missing Web Overlay functionality to Web Entities
2019-01-25 14:00:52 -08:00
Wayne Chen
1c6521486e
fixing compile errors
2019-01-25 13:56:56 -08:00
Dante Ruiz
4ed54f63ea
allow debug prints in the log by default
2019-01-25 13:56:54 -08:00
luiscuenca
f54f9e5bfd
Merge branch 'master' into multiSphereAvatar04
2019-01-25 13:54:01 -07:00
luiscuenca
df4be641eb
More fixes
2019-01-25 13:42:18 -07:00
Wayne Chen
6f49914167
Merge branch 'oculusLoginFeature' of https://github.com/wayne-chen/hifi into oculusLoginFeature
2019-01-25 12:19:20 -08:00
Wayne Chen
635c7533b9
more code review feedback
2019-01-25 12:15:38 -08:00
Wayne Chen
c136f24181
Merge branch 'master' into oculusLoginFeature
2019-01-25 11:44:14 -08:00
Wayne Chen
0928b1bff1
code review feedback
2019-01-25 11:36:58 -08:00
Brad Davis
81a7fa17bf
PR feedback
2019-01-25 11:14:40 -08:00
Shannon Romano
28edb472fc
Merge pull request #14713 from raveenajain/collideWithOtherAvatars_scale
...
20565 Avatar::_collideWithOtherAvatars does not scale
2019-01-25 11:06:36 -08:00
Dante Ruiz
2c22fb82b1
keep log window on top option
2019-01-24 18:16:07 -08:00
Wayne Chen
9da7465698
readding render session, adding newlines for oculus failure
2019-01-24 15:33:50 -08:00
Andrew Meadows
09fe9735fa
plug grab leak, more correct names
2019-01-24 14:57:54 -08:00
Andrew Meadows
ee3fde9df1
unravel spaghetti, prefer std over Qt containers
2019-01-24 14:39:00 -08:00
Adam Smith
dadd49f535
Merge pull request #14667 from SamGondelman/NOverlays9
...
Case 20535: renderLayer, primitiveMode, groupCulled Entity properties
2019-01-24 14:36:27 -08:00
Andrew Meadows
160bef8f23
cleanup and minor optimizations
2019-01-23 23:18:52 -08:00
SamGondelman
9a734b2011
merge with master
2019-01-23 17:48:24 -08:00
luiscuenca
7a0f3ea7ef
Fix error
2019-01-23 18:04:13 -07:00
luiscuenca
a947c894c2
Suggested changes
2019-01-23 17:23:36 -07:00
Anthony Thibault
a7a71e4286
Merge branch 'master' into feature/hmd-avatar-alignment-type
2019-01-23 15:52:20 -08:00
Jeff Clinton
49fa2dc75d
Merge pull request #14715 from ctrlaltdavid/M20052
...
Case 20052: Fix tablet sometimes not working after domain change
2019-01-23 15:29:20 -08:00
Brad Davis
e18e3fc138
Gpu Frame serialization
2019-01-23 13:21:34 -08:00
Jeff Clinton
b9f9766b01
Merge pull request #14747 from SimonWalton-HiFi/wallet-in-hmd
...
Fix security-image display in HMD
2019-01-23 13:18:45 -08:00
Simon Walton
77293150b7
Const declarations to enforce singleton capability
2019-01-22 18:05:47 -08:00
Simon Walton
3a5d550fa5
Treat QmlCommerce as a singleton class
2019-01-22 17:13:36 -08:00
Jeff Clinton
3776472550
Merge pull request #14731 from AndrewMeadows/fix-mexico-hats
...
cases 20709 and 20715: wear and see mexico hats
2019-01-22 12:58:56 -08:00