29852 commits

Author	SHA1	Message	Date
Anthony J. Thibault	a2e37b7275	talking/reactions while seated, work in progress check in	2019-08-01 13:05:15 -07:00
Anthony J. Thibault	ee4bb233b9	Bug fix for head nod not going back to idle.	2019-07-30 12:56:43 -07:00
Anthony J. Thibault	4f5d0d1c0f	Updated a negative reaction animation.	2019-07-29 16:49:16 -07:00
Anthony J. Thibault	6f3bb749e2	Added new applaud, point and raisehand reactions.	2019-07-29 16:17:50 -07:00
Anthony J. Thibault	e205d90df6	Hooked up random positive & negative emote animations.	2019-07-29 15:01:10 -07:00
Anthony J. Thibault	6e6440232c	Updated avatar-animation.json from animedit tool	2019-07-29 10:49:34 -07:00
Anthony J. Thibault	2f949a4d4d	Disable head ik while reacting ... Also, split getReactions() API into two calls * getTriggerReactions() - lists all reactions that can be triggered with MyAvatar.triggerReaction(). * getBeginReactions() - lists all reactions that can be used with MyAvatar.beginReaction() and MyAvatar.endReaction().	2019-07-26 15:26:43 -07:00
Anthony Thibault	5375e53ecb	Merge pull request #15974 from luiscuenca/avatarSitAPI ... DEV-269: First Class Sitting API	2019-07-26 13:36:00 -07:00
MiladNazeri	e6e771df7b	Merge pull request #15977 from MiladNazeri/permissionsUIFix ... [DEV-190] + [DEV-191] :: Permissions UI	2019-07-26 11:25:18 -07:00
luiscuenca	c1b818cd9b	Set timeout before enabling drive keys	2019-07-25 17:40:09 -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
MiladNazeri	b0723599d8	Update interface/resources/qml/controlsUit/PermissionPopup.qml ... Co-Authored-By: Zach Fox <fox@highfidelity.com>	2019-07-25 15:47:48 -07:00
MiladNazeri	b419be97be	Update interface/resources/qml/controlsUit/PermissionPopup.qml ... Co-Authored-By: Zach Fox <fox@highfidelity.com>	2019-07-25 15:47:24 -07:00
MiladNazeri	cf23b7a303	Update interface/resources/qml/controlsUit/PermissionPopup.qml ... Co-Authored-By: Zach Fox <fox@highfidelity.com>	2019-07-25 15:47:17 -07:00
MiladNazeri	20b709b382	Update interface/resources/qml/controlsUit/PermissionPopup.qml ... Co-Authored-By: Zach Fox <fox@highfidelity.com>	2019-07-25 15:46:10 -07:00
milad	5083e449b0	cr round 2	2019-07-25 15:42:25 -07:00
milad	2f4566b63c	merged master and fixed height	2019-07-25 15:42:03 -07:00
milad	4c0d8b6fda	improved layout to match the figment more	2019-07-25 15:42:02 -07:00
milad	993e5db2da	changed rectangle to have anchor.fill	2019-07-25 15:42:02 -07:00
milad	2498bf2fd8	Cr changes r1	2019-07-25 15:42:02 -07:00
milad	9f0fc8bd06	removed logs and prototype code	2019-07-25 15:42:02 -07:00
milad	189809dc2c	Fixed undefined error when displaying from the dictionary	2019-07-25 15:42:02 -07:00
milad	2b4dd327ec	removed log statements	2019-07-25 15:42:01 -07:00
milad	cd5df63f51	working version for all qml web files	2019-07-25 15:41:53 -07:00
milad	fb7a66b110	working version with just flickable	2019-07-25 15:38:23 -07:00
milad	43268c0f65	Working QML window	2019-07-25 15:38:23 -07:00
milad	dec176b921	checking to see if I did something blocking the build	2019-07-25 15:38:22 -07:00
Ryan Huffman	9872c1c2f7	Add missing emit inside of	2019-07-25 13:55:44 -07:00
Ryan Huffman	de233e456e	Merge pull request #15976 from huffman/feat/serverless-tutorial ... DEV-266: Add serverless tutorial	2019-07-25 13:39:03 -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
Zach Fox	12a9837a4b	Merge pull request #15984 from zfox23/removeSomeEventBridgeCode ... BUGZ-969: Remove some audio-related code that hasn't worked in a while	2019-07-25 12:41:43 -07:00
Zach Fox	6e33f3f23a	BUGZ-969: Remove some audio-related code that hasn't worked in a while	2019-07-25 11:49:28 -07:00
Ryan Huffman	2ec87f4e61	Add serverless tutorial	2019-07-24 16:38:03 -07:00
amer cerkic	db945851ac	fixed merge conflict	2019-07-24 16:03:23 -07:00
amer cerkic	e6dd52d331	Merge branch 'master' into bugz-1029a	2019-07-24 15:53: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
luiscuenca	8900c4f2cd	stand up to right location-orientation	2019-07-24 13:29:01 -07:00
luiscuenca	6e4d1bde8e	Fix code and warnings	2019-07-24 13:16:53 -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
Zach Fox	e1c198903d	Merge pull request #15973 from zfox23/fixGatedLog ... BUGZ-972: Fix errant log involving 'gated' property	2019-07-24 11:19:02 -07:00
luiscuenca	015d1951fc	Add sitting clip node	2019-07-24 10:44:33 -07:00
Zach Fox	03b5f9f7f8	BUGZ-972: Fix errant log involving 'gated' property	2019-07-24 10:18:03 -07:00
Zach Fox	b918979fab	DEV-301: Adjust size of VR-mode header icon	2019-07-24 10:02:26 -07:00
amer cerkic	ddc678bbc0	added interactivewindow proxy. moved event bridge binding to the proxy instead	2019-07-23 16:57:53 -07:00