24201 commits

Author	SHA1	Message	Date
Howard Stearns	6ef0821801	steam gets the oculus store commerce treatment	2019-07-26 12:44:48 -07:00
Ryan Huffman	ef0977248d	Merge pull request #15986 from huffman/fix/create-not-working-patch ... Fix non-functional Create	2019-07-25 16:17:43 -07:00
Ryan Huffman	9872c1c2f7	Add missing emit inside of	2019-07-25 13:55:44 -07:00
Howard Stearns	520ba59899	Merge pull request #15980 from SimonWalton-HiFi/audio-injector-shutdown ... BUGZ-985: Guard against AudioInjectorManager takedown in scripted audio injector destructor	2019-07-25 12:50:07 -07:00
amer cerkic	db945851ac	fixed merge conflict	2019-07-24 16:03:23 -07:00
amer cerkic	3315271493	reverting commit:	2019-07-24 15:43:31 -07:00
Anthony Thibault	abeba03a7e	Merge pull request #15975 from huffman/fix/interactive-window-qmlto-script-crash ... BUGZ-1028: Fix qmlToScript getting called on script thread and causing crash	2019-07-24 15:39:25 -07:00
Simon Walton	53cf915e8d	Guard for AudioInjectorManager existance; clear an audio interface pointer	2019-07-24 14:51:41 -07:00
amer cerkic	bea31237b7	addressing comments	2019-07-24 14:30:43 -07:00
Ryan Huffman	c4b63ed5e4	Fix qmlToScript getting called on script thread and causing crash	2019-07-24 13:44:20 -07:00
amer cerkic	f94b082946	addressing comment	2019-07-24 11:47:10 -07:00
amer cerkic	ac17493a40	removing comments	2019-07-24 11:37:38 -07:00
amer cerkic	8c022b025d	implementing Dante's change to connect the slots	2019-07-24 11:19:32 -07:00
amer cerkic	ddc678bbc0	added interactivewindow proxy. moved event bridge binding to the proxy instead	2019-07-23 16:57:53 -07:00
Shannon Romano	266230a53c	Merge pull request #15963 from hyperlogic/feature/avatar-reaction-api ... Initial version of Avatar Reaction API	2019-07-23 13:13:31 -07:00
jennaingersoll	1e84b3f4a2	Merge pull request #15951 from ctrlaltdavid/DOC-122 ... DOC-122: LocationBookmarks JSDoc	2019-07-23 12:00:03 -07:00
Shannon Romano	4f922e350e	Merge pull request #15913 from ctrlaltdavid/DOC-102 ... DOC-102: Overlays JSDoc Update	2019-07-22 16:24:53 -07:00
Shannon Romano	1594e25c4e	Merge pull request #15950 from ctrlaltdavid/DOC-121 ... DOC-121: AvatarBookmarks JSDoc	2019-07-22 15:43:57 -07:00
David Rowe	1e8a205275	Fix typo	2019-07-23 10:30:10 +12:00
Shannon Romano	6d0ba98bfc	Merge pull request #15953 from ctrlaltdavid/DOC-123 ... DOC-123: AvatarInputs JSDoc	2019-07-22 15:21:50 -07:00
Shannon Romano	d719952022	Merge pull request #15946 from AndrewMeadows/avoid-nan-scriptedMotor ... BUGZ-870: MyAvatar's scripted motor needs to filter against NaN input	2019-07-22 15:06:35 -07:00
David Rowe	a36bcbb2ed	Doc review	2019-07-23 07:36:11 +12:00
David Rowe	ddffb8ab9a	Doc review	2019-07-23 07:25:34 +12:00
jennaingersoll	abe1ce288c	Merge pull request #15926 from ctrlaltdavid/DOC-115 ... DOC-115: Comfort mode JSDoc	2019-07-22 10:46:11 -07:00
David Rowe	6d7b6f3e0a	AvatarInputs JSDoc	2019-07-20 10:19:22 +12:00
David Rowe	3a3bfd1463	Doc review	2019-07-20 09:39:34 +12:00
David Rowe	0a32386f45	Merge branch 'master' into DOC-102	2019-07-20 09:13:52 +12:00
Zach Fox	d62dde1ab8	Merge pull request #15952 from zfox23/setShowBubbleToolsCorrection ... Fix BUGZ-1062: Set the correct Settings value for bubble tools	2019-07-19 11:51:59 -07:00
Zach Fox	510c922912	Fix BUGZ-1062: Set the correct Settings value for bubble tools	2019-07-19 11:34:14 -07:00
David Rowe	9165a04641	Typo and improvement	2019-07-19 11:41:12 +12:00
David Rowe	c2b67f28d0	LocationBookmarks JSDoc	2019-07-19 11:35:06 +12:00
David Rowe	cf9e563458	Miscellaneous JSDoc fixes noticed in passing	2019-07-19 08:37:10 +12:00
David Rowe	a04da70f16	AvatarBookmarks JSDoc	2019-07-19 08:36:45 +12:00
Andrew Meadows	dcf3df68f2	avoid NaN input for MyAvatar's scripted motor	2019-07-18 10:58:41 -07:00
Andrew Meadows	7b7414dead	revert optimization that would skip read from packet	2019-07-17 17:04:12 -07:00
Anthony Thibault	ecae92724e	Added reaction api	2019-07-17 14:28:39 -07:00
Andrew Meadows	63b3d666f9	simplify rollover logic for SafeLanding sequence size calculation	2019-07-17 13:57:08 -07:00
Andrew Meadows	b0f297e696	wait for SafeLanding to start before starting octreeQuery	2019-07-17 11:22:01 -07:00
Andrew Meadows	05d896f3de	fix SafeLanding failure mode when first sequence number not 0	2019-07-17 11:22:01 -07:00
Shannon Romano	d49fabf370	Merge pull request #15932 from SimonWalton-HiFi/remove-orb-on-kill ... BUGZ-781: Remove loading-orb upon killing of avatar	2019-07-16 15:31:37 -07:00
dante ruiz	e896a53113	fix interactive crash	2019-07-15 17:18:38 -07:00
Shannon Romano	3f7e5a48bb	Merge pull request #15533 from sethalves/squeeze-vision-while-moving ... Case 21663: comfort mode	2019-07-15 14:54:31 -07:00
Simon Walton	e259aa55c2	Remove loading-orb upon killing avatar, in case destructor isn't called	2019-07-15 14:14:24 -07:00
Shannon Romano	a64bc7f638	Merge pull request #15761 from danteruiz/fix-interactive-window-crash ... BUGZ-400: Crash in Application::notify	2019-07-15 11:35:15 -07:00
Shannon Romano	7ea8675e83	Merge pull request #15919 from howard-stearns/mac-sleep-monitor ... Mac sleep monitor	2019-07-15 08:39:19 -07:00
Shannon Romano	09729fb430	Merge pull request #15918 from zfox23/newGraphicsSettings ... New Settings -> Graphics... dialog for Classic UI users	2019-07-15 08:38:01 -07:00
Shannon Romano	1bc72a86da	Merge pull request #15911 from amerhifi/bugz-968 ... case Bugz-968 adding a null check to the display plugin. Possible that display plug…	2019-07-15 08:35:29 -07:00
Shannon Romano	8ce64d95ab	Merge pull request #15880 from AndrewMeadows/fix-safe-landing-redux ... BUGZ-863: wait for objects to be added to physics before completing SafeLanding	2019-07-15 08:34:17 -07:00
David Rowe	8a82ea55c7	HMD API vision squeeze properties JSDoc	2019-07-13 10:39:40 +12:00
dante ruiz	d78661a47f	redo requested work	2019-07-12 13:34:08 -07:00