7699 commits

Author	SHA1	Message	Date
Ryan Huffman	a4919320b3	Merge pull request #15277 from dback2/editHandleContinualTranslateFix ... Case 20896: Fix continual edit handle translation when moving	2019-04-05 15:40:57 -07:00
r3tk0n	874fb6b6d7	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco	2019-04-03 12:42:33 -07:00
Sam Gondelman	1cc2cd3194	Merge pull request #15237 from SamGondelman/particleShapes ... Case 21859: Particle Entity emitter shapes, including model	2019-04-03 11:03:33 -07:00
unknown	8dbdee4262	better fix for trailing key events	2019-04-03 09:08:29 -07:00
David Back	93fc8e2e18	fix continual translation when moving	2019-04-02 15:11:32 -07:00
Ryan Huffman	ea2e62c1ca	Merge pull request #15293 from huffman/fix/damping-on-new-dynamic-entities ... Case 20826: Add damping to new dynamic entities in Create	2019-04-02 14:28:35 -07:00
Sam Gondelman	414a39bd8a	Merge branch 'master' into particleShapes	2019-04-01 22:20:13 -07:00
r3tk0n	4fb7bbabe1	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco	2019-04-01 14:52:21 -07:00
Wayne Chen	abe5748e60	Merge branch 'master' into newAudioMuteStates	2019-04-01 12:24:46 -07:00
Shannon Romano	c5e7c63d38	Merge pull request #15289 from roxanneskelly/Case20499 ... Case 20499 - Scripts that use AppUI don't call `that.onClosed()` if the script is restarted while the app is open	2019-03-29 17:05:21 -07:00
Shannon Romano	a83b90cdc6	Merge pull request #15044 from sethalves/lock-wearables ... case 21149: add a button to Avatar panel to lock or unlock wearables; allow others to grab unlocked wearables	2019-03-29 10:41:21 -07:00
Wayne Chen	3c65b92ff5	moving text position higher	2019-03-29 10:41:16 -07:00
Wayne Chen	248f9ba375	adding mute overlay back into HMD and have warn when muted disable in desktop	2019-03-29 10:32:13 -07:00
Ryan Huffman	bcb38b6626	Add damping to new dynamic entities in Create	2019-03-29 09:01:42 -07:00
Roxanne Skelly	44b92c542b	Case 20499 - Scripts that use AppUI don't call that.onClosed() if the ... script is restarted while the app is open	2019-03-28 16:05:24 -07:00
Roxanne Skelly	73cf51182e	Merge pull request #15262 from roxanneskelly/Case20832 ... Case20832- Inventory app Login and Cancel buttons do not respond if user logs out while Inventory is open.	2019-03-28 12:01:24 -07:00
Wayne Chen	f3708ba27b	Merge branch 'master' into newAudioMuteStates	2019-03-27 15:49:39 -07:00
Seth Alves	e085a00256	cause 'save' button to unghost if an attachment is adjusted via grab while the adjust-wearables page is open	2019-03-27 10:12:58 -07:00
Seth Alves	d25d290394	refer to ungrabbable wearables as 'frozen' rather than locked, because locked is such an overloaded term	2019-03-27 10:12:58 -07:00
Seth Alves	e6c279ee5b	unlock, rather than lock entities when adjust-attachments window is open, because the windows says you can adjust with hand-controllers	2019-03-27 10:12:58 -07:00
Seth Alves	fa36f12145	lock wearables when adjust-wearables page is opened	2019-03-27 10:12:57 -07:00
Seth Alves	4fe94a4b32	when new wearables are added or removed, rerun getWearablesLocked() and update UI	2019-03-27 10:12:57 -07:00
Seth Alves	29af3b1612	add a button to Avatar panel to lock or unlock wearables. ... allow grabbing / adjusting others' wearables if they are unlocked.	2019-03-27 10:12:57 -07:00
Seth Alves	84385e6061	work around fb-21767 with a timer	2019-03-26 09:40:22 -07:00
Seth Alves	4303dd589f	make sure equip attachment-points pulled from settings are reasonable before using them	2019-03-26 09:40:22 -07:00
Seth Alves	195472bd43	make equipping of clonables more reliable	2019-03-26 09:40:22 -07:00
Wayne Chen	c54e8f5569	showing ptt text always + hmd mode switch fix	2019-03-25 17:32:03 -07:00
Roxanne Skelly	90b9de8623	Merge branch 'master' of https://github.com/highfidelity/hifi into Case20832	2019-03-25 14:48:26 -07:00
Roxanne Skelly	1608b24be1	ase 20832 - Inventory app login and cancel buttons don't work on logout	2019-03-25 14:48:17 -07:00
r3tk0n	3ac42e69e3	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco	2019-03-25 11:27:31 -07:00
Wayne Chen	390ce9bb26	wip for getting AvatarInputsBar to switch accordingly	2019-03-22 15:34:06 -07:00
Wayne Chen	7b5deb692c	fixing x value change	2019-03-22 14:54:18 -07:00
Wayne Chen	1f71a291a5	displaying offset values	2019-03-22 14:54:18 -07:00
Wayne Chen	554a144b0e	adding tool to change avatar inputs properties	2019-03-22 14:54:17 -07:00
Wayne Chen	584fa1f17b	more wip	2019-03-22 14:54:17 -07:00
Wayne Chen	6cf8b06c6d	more wip on adding qml to adjusting ui position	2019-03-22 14:54:16 -07:00
Wayne Chen	cb715c3e55	fixing typos	2019-03-22 14:54:16 -07:00
Wayne Chen	b6ebdb5315	alpha to max value of detecting transparency	2019-03-22 14:54:16 -07:00
Wayne Chen	4cbe8cd4d1	Adding alpha to entities to enable transparency	2019-03-22 14:54:15 -07:00
Wayne Chen	ee1a14505a	adding constants, removing entity creation in cpp	2019-03-22 14:54:15 -07:00
Wayne Chen	44ed9e607b	cancelling out roll and pitch	2019-03-22 14:54:15 -07:00
Wayne Chen	87de95c63b	adding test script for creating avatar input bar	2019-03-22 14:54:14 -07:00
Wayne Chen	d0116abc52	separating out bubble icon qml - adding support for transparency	2019-03-22 14:54:13 -07:00
Wayne Chen	d834c5aca1	adding test script for creating avatar input bar	2019-03-22 14:16:29 -07:00
Wayne Chen	77b7cc2457	separating out bubble icon qml - adding support for transparency	2019-03-22 14:16:29 -07:00
Wayne Chen	d382893e75	staging avatar inputs for ignore radius	2019-03-22 14:16:28 -07:00
Roxanne Skelly	efffb8b819	Merge pull request #15239 from roxanneskelly/Case20617 ... Case 20617 - People app filter bar breaks when deleting connections	2019-03-22 11:31:46 -07:00
r3tk0n	86ffa44771	Swap flying binding to other hand.	2019-03-21 17:05:20 -07:00
Thijs Wenker	9a14cfc7df	make sure that onWebEventReceived has the correct context in VR	2019-03-21 23:46:33 +01:00
r3tk0n	108e8b9994	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco	2019-03-21 15:17:56 -07:00