45433 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
James B. Pollack	e012d3cebb	Merge branch 'tweak_lazers' of github.com:imgntn/hifi into tweak_lazers	2016-08-03 15:00:05 -07:00
James B. Pollack	7a41ed25db	Merge remote-tracking branch 'upstream/master' into tweak_lazers	2016-08-03 14:59:51 -07:00
Seth Alves	9962d47173	Merge pull request #8326 from birarda/kick ... kick	2016-08-03 09:21:09 -07:00
Brad Hefta-Gaub	754eae98c2	Merge pull request #8353 from birarda/fake-atp-url ... fix for disabled physics with unloadable entity	2016-08-03 09:10:41 -07:00
Brad Hefta-Gaub	70cb3d3393	Merge pull request #8354 from AlexanderOtavka/remove-web-debug ... Remove url change debug info for WebView	2016-08-03 09:10:10 -07:00
Seth Alves	cc7322a0de	Merge pull request #8334 from ctrlaltdavid/21015 ... refresh file dialog when directory content changes	2016-08-03 08:11:40 -07:00
James B. Pollack	5ad5899140	revert pointer changes	2016-08-02 21:26:48 -07:00
James B. Pollack	fed39d9056	cleanup dead code	2016-08-02 21:26:04 -07:00
Chris Collins	b2a354ddb9	Merge pull request #8331 from huffman/feat/progress-updates ... progress.js updates	2016-08-02 21:10:54 -07:00
James B. Pollack	9d56c697e7	no delay!	2016-08-02 19:02:20 -07:00
James B. Pollack	364eb992fb	no teleport while moving	2016-08-02 18:53:36 -07:00
James B. Pollack	88ebeaa4cb	start no movement mode. using actual keys since avatar speed doesnt work with gtting stuck	2016-08-02 18:46:47 -07:00
Brad Hefta-Gaub	193f0bbb99	Merge pull request #8345 from ctrlaltdavid/web-window-signals ... add OverlayWebWindow resized, moved, and closed signals	2016-08-02 18:41:49 -07:00
Brad Hefta-Gaub	0d1034914d	Merge pull request #8352 from AlexanderOtavka/fix-confirm ... Fix confirm dialog	2016-08-02 18:41:08 -07:00
Zander Otavka	3c30743d0d	Remove url change debug info for WebView	2016-08-02 16:48:39 -07:00
Ryan Huffman	adbd9ff854	Add constants for progress bar offset	2016-08-02 16:34:57 -07:00
Stephen Birarda	5d3e125a06	make failed geomtetry request not hold physics	2016-08-02 16:32:41 -07:00
Ryan Huffman	1f2e34d59b	Remove 3d overlay from progress.js	2016-08-02 16:29:40 -07:00
Ryan Huffman	79a243b171	Clean up progress.js	2016-08-02 16:19:38 -07:00
Zander Otavka	38ba54e481	Fix confirm dialog	2016-08-02 16:04:54 -07:00
James B. Pollack	8541d4bd41	small change to protect	2016-08-02 15:41:28 -07:00
James B. Pollack	d00c1f62fc	fixes	2016-08-02 15:40:19 -07:00
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