6396 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 Thibault	5375e53ecb	Merge pull request #15974 from luiscuenca/avatarSitAPI ... DEV-269: First Class Sitting API	2019-07-26 13:36:00 -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	de233e456e	Merge pull request #15976 from huffman/feat/serverless-tutorial ... DEV-266: Add serverless tutorial	2019-07-25 13:39:03 -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
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
luiscuenca	e7e864121f	Merge branch 'master' into avatarSitAPI	2019-07-23 14:22:42 -07:00
luiscuenca	9cec979552	Add sit API to MyAvatar	2019-07-23 14:20:54 -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
Anthony J. Thibault	687588cde7	Hooked up first-pass reaction animations.	2019-07-23 09:47:37 -07:00
Andrew Meadows	95187f97c8	use bold monospace font for debug stats	2019-07-22 12:38:24 -07:00
Shannon Romano	4f7b865cfe	Merge pull request #15945 from huffman/fix/create-window-not-reopening ... BUGZ-998: Fix create window being destroyed when closed	2019-07-19 11:07:02 -07:00
Ryan Huffman	03b8de1ee7	Fix create window being destroyed when closed	2019-07-18 08:43:39 -07:00
milad	a3b8ded56a	changed sessionDisplayName logic	2019-07-17 14:17:58 -07:00
Zach Fox	a4f4961dfd	Merge pull request #15941 from zfox23/graphicsSettingsMargin ... Fix BUGZ-814 in VR mode: Add a top margin to tablet graphics settings	2019-07-16 15:26:43 -07:00
Zach Fox	1cd136f178	Fix BUGZ-814 in VR mode: Add a top margin to tablet graphics settings	2019-07-16 15:15:08 -07:00
dooglifeSF	413a089402	add teleport.fbx back to avatar/animations ... compiled and tested in local sandbox but need to test with Jamil in HMD to see that teleport plays correctly for remote viewer	2019-07-15 13:24:21 -07:00
Zach Fox	5828f46c6b	Incorrect ID fixed - thanks Milad	2019-07-12 12:27:55 -07:00
Zach Fox	e0392642f7	Don't enable supersampling from graphics settings	2019-07-12 11:18:34 -07:00
Zach Fox	56a55efbb3	Fix a quick renderer bug	2019-07-11 16:12:40 -07:00
Zach Fox	4c7d0fc6f4	Updated layout	2019-07-11 14:46:05 -07:00
Zach Fox	ce2b7e5baa	Finish all of the logic and most of the layout	2019-07-11 12:05:13 -07:00
Zach Fox	2471a3eb72	Merge branch 'master' of github.com:highfidelity/hifi into newGraphicsSettings	2019-07-11 09:02:42 -07:00
Zach Fox	4caa00d6cc	Start BUGZ-814: Start working on a new Graphics dialog for Metaverse version of Interface	2019-07-10 16:42:48 -07:00
Howard Stearns	7eaa29c147	Merge pull request #15904 from howard-stearns/new-account-wallets-in-simplified-ui ... new-account wallets in simplified UI	2019-07-10 15:09:59 -07:00