605 commits

Author	SHA1	Message	Date
Brad Hefta-Gaub	9874c63b25	Merge pull request #8398 from zzmp/refactor/system-html ... refactor system html to split js/css	2016-08-10 09:17:52 -07:00
Brad Hefta-Gaub	412052c285	Merge pull request #8380 from highfidelity/fade ... Add fade in loading effect	2016-08-09 16:50:05 -07:00
SamGondelman	2360e90d39	simplify valid check for rotation	2016-08-09 15:48:31 -07:00
Zach Pomerantz	d5b822ddbe	remove missing camera selectors	2016-08-09 15:23:36 -07:00
Zach Pomerantz	6965fb0520	refactor system html to split js/css	2016-08-09 15:23:31 -07:00
SamGondelman	956078bc91	teleport works with xbox controller	2016-08-09 15:17:36 -07:00
SamGondelman	9b27f8bc0f	Merge remote-tracking branch 'upstream/master' into loadingFade	2016-08-09 14:55:14 -07:00
Brad Hefta-Gaub	75edb74db4	Merge pull request #8386 from imgntn/edit_1_property_order ... Edit.js - change spatial property order and cleanup	2016-08-09 12:42:20 -07:00
SamGondelman	328d3128fa	merge from master	2016-08-08 13:30:39 -07:00
Brad Hefta-Gaub	b903c974bc	Merge pull request #8371 from imgntn/teleport_cancel ... Cancel mode for teleporting	2016-08-08 13:04:27 -07:00
James B. Pollack	58ccc9581a	cleanup	2016-08-08 12:20:48 -07:00
James B. Pollack	bde46adee8	update description	2016-08-08 11:31:43 -07:00
James B. Pollack	f8c1d8f123	change property order and cleanup	2016-08-08 11:01:03 -07:00
SamGondelman	0ec1da4a0d	Merge remote-tracking branch 'upstream/master' into loadingFade	2016-08-08 10:55:20 -07:00
SamGondelman	b23d3cd35a	fixed messed up transparency on edit selection of shapes	2016-08-05 18:35:16 -07:00
Seth Alves	090a0a6e9a	only use hand-sphere vs equipped-item bounding box when deciding to auto-unequip	2016-08-05 18:01:48 -07:00
Seth Alves	e59c010642	speling	2016-08-05 15:39:20 -07:00
Seth Alves	dc22b579f7	adjust code that auto-unequips items when they are pulled too far from the equipping hand	2016-08-05 15:28:37 -07:00
James B. Pollack	80da690680	incease distance a bit	2016-08-05 00:04:30 -07:00
James B. Pollack	7d37f86337	different swapping method	2016-08-04 23:45:43 -07:00
James B. Pollack	80b6ca2b86	single call to istooclose	2016-08-04 16:47:10 -07:00
James B. Pollack	fb8263a882	cleanup	2016-08-04 16:35:50 -07:00
James B. Pollack	63aa0f8c3f	remove weird n	2016-08-04 16:18:13 -07:00
James B. Pollack	f93ed56124	cleaner code	2016-08-04 16:17:21 -07:00
James B. Pollack	c0cfee371e	cancel mode for teleporting	2016-08-04 16:08:51 -07:00
Chris Collins	be87f294d8	Merge pull request #8351 from thoys/fix-handcontrollergrab-grab-message ... fix remote triggering handControllerGrab	2016-08-04 11:55:48 -07:00
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
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
Ryan Huffman	adbd9ff854	Add constants for progress bar offset	2016-08-02 16:34:57 -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
Thijs Wenker	3a2b0ffa08	Fixes the handControllerGrab Hifi-Hand-Grab message. Was broken since the hotspot changes to handControllerGrab.js.	2016-08-03 00:47:28 +02: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	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	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