77633 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
danteruiz	d9b522d10c	remove error file	2019-03-27 16:43:03 -07:00
danteruiz	40d424a01d	avatar fading	2019-03-27 16:42:34 -07:00
Ryan Huffman	9abd0943ff	Add new web and other properties to Create	2019-03-27 16:29:04 -07:00
Wayne Chen	f3708ba27b	Merge branch 'master' into newAudioMuteStates	2019-03-27 15:49:39 -07:00
SamGondelman	6cc95fe8ac	CR	2019-03-27 15:46:25 -07:00
Clement	88a19f26e2	Use process function for overrides	2019-03-27 15:44:32 -07:00
Clement	3221e1dbd5	Simplify packing/unpacking for easier extension	2019-03-27 15:44:32 -07:00
Clement	d7d5938c20	Pack all simple traits	2019-03-27 15:44:32 -07:00
Clement	483b7a67b9	Fix simple traits vector bad init	2019-03-27 15:44:32 -07:00
SamGondelman	310d01feff	wip	2019-03-27 15:44:01 -07:00
Howard Stearns	3da66dacc9	Merge branch 'master' of github.com:highfidelity/hifi into ddv-all	2019-03-27 15:08:03 -07:00
Howard Stearns	489fadda6e	and now it's a list that cleans up after itself	2019-03-27 14:58:58 -07:00
Shannon Romano	8ff47659d3	Merge pull request #15273 from SamGondelman/transparency ... Case 21949: Fix transparent shape flickering	2019-03-27 14:21:04 -07:00
Ken Cooke	abb0a166b1	Merge pull request #15260 from kencooke/audio-mixer-volume-control ... Case 21902: System-wide independent volume controls	2019-03-27 13:19:30 -07:00
Howard Stearns	f6ee77a6ae	an entity list of one	2019-03-27 12:23:02 -07:00
Simon Walton	e62270fccf	Fixes for inline jsdoc	2019-03-27 12:00:30 -07:00
SamGondelman	36921276c6	fix transparent shape flickering	2019-03-27 11:52:37 -07:00
Howard Stearns	71111936a2	prep for entity lists	2019-03-27 11:42:16 -07:00
Angus Antley	fcb45802bd	removed debug print	2019-03-27 11:19:28 -07:00
Ken Cooke	dae69ea4cd	Ensure server echo always has unity gain	2019-03-27 10:58:52 -07:00
Sam Gondelman	2005293b3f	Merge pull request #15269 from sethalves/audio-loopback-button-is-local ... case 21932: the test-audio button causes a local audio-loopback rather than a server one	2019-03-27 10:54:57 -07:00
Simon Walton	6b21fc1af7	Merge remote-tracking branch 'upstream/master' into avatar-hero-zone-improvements ... Fix jsdoc conflict, also minor clean-up.	2019-03-27 10:54:49 -07:00
Sam Gondelman	0a28090aa4	Merge pull request #15213 from MiladNazeri/Fix/avatarDominantHandChanged ... Updated engine code to not emit if dominant hand isn't actually changed	2019-03-27 10:53:00 -07:00
Sam Gondelman	ffbf678695	Merge pull request #15217 from jherico/fix/framereader_files ... Case 21793: Fix loading relative files	2019-03-27 10:52:35 -07:00
Sam Gondelman	0f99280c15	Merge pull request #15265 from hyperlogic/bug-fix/blendshape-precision ... Improve blendshape precision for small models	2019-03-27 10:51:22 -07:00
Sam Gondelman	3c42cb34ed	Merge pull request #15251 from SamGondelman/animation82 ... Case 21888: Revert changes that impacted animation performance	2019-03-27 10:50:43 -07:00
Olivier Prat	eb0e1d5f93	Fix for Mac and Ubuntu	2019-03-27 18:34:59 +01:00
Andrew Meadows	fb7daa185d	improved physics for grabbed AvatarEntities	2019-03-27 10:12:59 -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	5695c15809	avoid a deadlock when code invoked by onAddingEntity or onDeletingEntity runs more code that locks the entity tree	2019-03-27 10:12:57 -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
Olivier Prat	610d8347ff	Removed FindOpenEXR.cmake alltogether	2019-03-27 18:00:49 +01:00
Sam Gondelman	5f76c96340	Merge pull request #15196 from sethalves/fix-equip-drops ... case 21740: make equipping of clonables more reliable	2019-03-27 09:55:12 -07:00
Shannon Romano	d464415e0b	Merge pull request #15255 from AndrewMeadows/fix-owningAvataID ... Case 21897: fix bug where AvatarEntities vanish after going to serverless and back	2019-03-27 09:11:36 -07:00
Olivier Prat	809b1694ff	Added cmake find library suffixes	2019-03-27 14:41:48 +01:00
Olivier Prat	89fbe131c2	Yet another try at fixing compilation	2019-03-27 13:56:11 +01:00
Olivier Prat	2a0033aa1f	Another try at building on Ubuntu & Mac	2019-03-27 12:08:06 +01:00
Olivier Prat	7791401b0e	Trying to fix Ubuntu & Mac builds.	2019-03-27 11:17:22 +01:00
Olivier Prat	12e8056e1f	Android compilation fix	2019-03-27 08:15:07 +01:00
howard-stearns	bf1982564c	pass id around instead of relying on latest ivar value in a singleton	2019-03-26 19:26:38 -07:00
Simon Walton	b8f79d3364	Guard against Node linked-data being null	2019-03-26 17:41:22 -07:00
SamGondelman	3d2b71bc7b	remove all existing material parsing	2019-03-26 17:16:13 -07:00
Howard Stearns	57da21cec2	more about challenges use entity id as id, not cert id	2019-03-26 17:12:28 -07:00
Seth Alves	5f8139a44c	audio-loopback test ignores mute	2019-03-26 16:56:10 -07:00
Seth Alves	16f842b2ac	missed one	2019-03-26 16:07:18 -07:00
Seth Alves	7d21222232	the test-audio button causes a local audio-loopback rather than a server one	2019-03-26 16:03:56 -07:00