45520 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
James B. Pollack	f6984aaff8	clear timeout one more place	2016-08-02 14:42:21 -07:00
Stephen Birarda	a1220b87f1	set key ID for verified user in right place	2016-08-02 14:35:51 -07:00
Stephen Birarda	6196f5e86f	switch back to SVGs, remove triggered for controller pose	2016-08-02 14:35:51 -07:00
Stephen Birarda	fa9199c419	use float for clicked value in mod.js	2016-08-02 14:35:51 -07:00
Stephen Birarda	f02f619597	use boolean from RTClick and LTClick	2016-08-02 14:35:51 -07:00
Stephen Birarda	760223a550	check for existing public key with lowercase username	2016-08-02 14:35:51 -07:00
Stephen Birarda	6e50e11002	replace ignore in default scripts with mod	2016-08-02 14:35:51 -07:00
Stephen Birarda	6d38301a3a	rename ignore script to mod.js	2016-08-02 14:35:51 -07:00
Stephen Birarda	6051fcd8f9	use click instead of trigger, change targets to PNG	2016-08-02 14:35:51 -07:00
Stephen Birarda	7d9937e412	handle overlay change if permissions change	2016-08-02 14:35:51 -07:00
Stephen Birarda	a15aef34df	modify ignore script to handle kicking	2016-08-02 14:35:51 -07:00
Stephen Birarda	5eb890e4f5	add a simple IP address sanitizer for DS settings save	2016-08-02 14:35:51 -07:00
Stephen Birarda	4cdc98287b	add canKick to USI, revert constants to production	2016-08-02 14:35:51 -07:00
Stephen Birarda	39e6ac0974	cleanup API for HifiConfigVariantMap after migration	2016-08-02 14:35:11 -07:00
Stephen Birarda	62af203d08	migrate the deprecated merged master/user config	2016-08-02 14:35:11 -07:00
Stephen Birarda	285478f1b2	don't repack the same permissions after kick	2016-08-02 14:35:11 -07:00
Stephen Birarda	5b04ab6d53	add node kick request handling to DS	2016-08-02 14:35:11 -07:00
Stephen Birarda	7e6dbf2d1a	add a kick request packet and send from NL	2016-08-02 14:35:11 -07:00
Stephen Birarda	94b97e8119	expose kick perms from LNL and Node	2016-08-02 14:35:11 -07:00
Stephen Birarda	eaf52ae111	default kick perms for localhost	2016-08-02 14:35:11 -07:00
Stephen Birarda	f04996a53d	add the kick permission to domain server settings	2016-08-02 14:35:11 -07:00
Stephen Birarda	5d69c9c81e	fix sockaddr choice for local nodes	2016-08-02 14:35:11 -07:00
Stephen Birarda	b1e0e6d708	use replacement for IP address perms, not additive	2016-08-02 14:35:11 -07:00
Stephen Birarda	f7298ef767	add packing of IP perms, small cleanup in packing	2016-08-02 14:35:11 -07:00
Stephen Birarda	cd436355fc	cleanup handling of defaults for standard user perms	2016-08-02 14:35:11 -07:00
Stephen Birarda	f8ea180127	match naming of forbidden IP settings group to groups	2016-08-02 14:35:11 -07:00
Stephen Birarda	a674c843c2	add unpack for IP, DRYup unpackPermissions	2016-08-02 14:35:11 -07:00
Stephen Birarda	edce249d2c	remove subnet from IP address security	2016-08-02 14:35:11 -07:00
Stephen Birarda	6836b09f87	add sections to DS security for IP/Subnet	2016-08-02 14:35:11 -07:00
Stephen Birarda	d15ac5761b	Merge pull request #8197 from sethalves/groups ... Groups	2016-08-02 14:34:53 -07:00
James B. Pollack	41aa485f11	one hand teleprt	2016-08-02 12:52:35 -07:00
James B. Pollack	7fae7e9c77	cleanup	2016-08-02 12:26:37 -07:00
James B. Pollack	108e7a2fc1	Merge remote-tracking branch 'upstream/master' into tweak_lazers	2016-08-02 12:25:27 -07:00
James B. Pollack	a7b8f2c9df	updates	2016-08-02 12:25:24 -07:00
Seth Alves	79121133df	remove unneeded change	2016-08-02 12:00:45 -07:00
Seth Alves	528f417f74	Merge branch 'master' of github.com:highfidelity/hifi into default-when-av-fails	2016-08-02 11:55:17 -07:00
Seth Alves	f91df4997d	re-enable falling-back to default avatar if an avatar's url is bad	2016-08-02 11:55:11 -07:00
Seth Alves	75f9626c2d	if MyAvatar simulation is cut short (due to no skeleton), still update the head position	2016-08-02 11:50:53 -07:00
Seth Alves	56af36ae64	set head position of other avatars even if they can't be drawn	2016-08-02 11:29:43 -07:00
Seth Alves	229b8d3b5e	testing a more explicit fix of the audio failure	2016-08-02 10:46:11 -07:00
Seth Alves	ed4b0b3589	call _skeletonModel.setURL, but leave our copy of _skeletonModelURL alone. This is so that we don't redo this every time we receive an identity packet from the avatar with the bad url.	2016-08-02 09:57:17 -07:00
Seth Alves	b953e6f0ff	when an avatar URL fails, switch to the default	2016-08-01 18:12:30 -07:00
David Rowe	31ac7a2812	Add OverlayWebWindow resized, moved, and closed signals	2016-08-02 12:40:01 +12:00
Ryan Huffman	604c8f4a36	Merge pull request #8337 from humbletim/fix-Assets-getMapping ... fix Assets.getMapping(path, callback) to return a value	2016-08-01 13:32:08 -07:00
Seth Alves	708bd33056	Merge branch 'master' of github.com:highfidelity/hifi into groups	2016-08-01 12:00:13 -07:00
Seth Alves	60d6673950	switch data-web urls to point at production server rather than dev one	2016-08-01 12:00:08 -07:00
David Rowe	18b0ed9e8f	Close file browser dialog immediately after selecting asset to upload	2016-07-30 14:16:08 +12:00
Seth Alves	c72cfb165c	damnit	2016-07-29 18:33:06 -07:00
Anthony Thibault	f71a59276c	Merge pull request #8317 from hyperlogic/bug-fix/web3doverlay-rendering ... Fix alpha cut-outs and incorrect gamma on web overlays and entities	2016-07-29 17:44:46 -07:00
Ryan Huffman	5d50389e29	Make updates to the hmd progress bar	2016-07-29 17:17:59 -07:00