499 commits

Author	SHA1	Message	Date
James B. Pollack	7768e65e8b	update name	2016-08-18 09:22:43 -07:00
James B. Pollack	9e14191217	recondition	2016-08-18 08:57:37 -07:00
James B. Pollack	cfbc589829	debug prints	2016-08-18 08:43:26 -07:00
James B. Pollack	8ede4ddb66	longform	2016-08-17 17:33:24 -07:00
James B. Pollack	e69c89a93e	y	2016-08-17 17:00:17 -07:00
James B. Pollack	fdfcc235b6	as functions	2016-08-17 16:24:59 -07:00
James B. Pollack	514d6ec139	get lsy lsx rsy values	2016-08-17 16:22:44 -07:00
James B. Pollack	fc65d246ee	update whens	2016-08-17 16:13:23 -07:00
James B. Pollack	a4a41faf24	demo and only do for vive	2016-08-17 16:12:07 -07:00
James B. Pollack	82a8887275	add whens	2016-08-17 15:50:19 -07:00
James B. Pollack	a7ba4ce1f9	jumping	2016-08-17 15:11:07 -07:00
James B. Pollack	8bc6ca2fa1	demo changes	2016-08-17 15:08:43 -07:00
Brad Hefta-Gaub	f66b36ff07	Merge pull request #8441 from imgntn/marketplace_spawn_location ... Better create locations for Entities	2016-08-17 09:09:00 -07:00
James B. Pollack	0810ad0e7b	use square of sides	2016-08-16 18:13:42 -07:00
James B. Pollack	e9c2a1d509	cleanup prints	2016-08-16 18:03:34 -07:00
James B. Pollack	06787029b7	small	2016-08-16 17:58:35 -07:00
Seth Alves	7bc1235c54	local velocity and angular velocity in scripts is now handled the way local position and rotation are	2016-08-16 16:47:13 -07:00
Seth Alves	c85e8d0580	don't show equip sphere until hand is in position to equip. widen unequip/drop cone	2016-08-16 11:18:12 -07:00
James B. Pollack	1632f4cb3d	better create locations	2016-08-16 10:52:05 -07:00
Brad Davis	5b09748c00	Merge pull request #8431 from imgntn/assetbutton ... Open Asset Browser with Button from Edit.js Toolbar	2016-08-13 12:04:21 -07:00
Brad Hefta-Gaub	8a28f7cdac	Merge pull request #8432 from Atlante45/fix/ignore ... Fix ignore icon stuck in hover state	2016-08-12 19:28:47 -07:00
Atlante45	b6c26b2f87	Fix ignore icon stuck in hover state	2016-08-12 18:13:26 -07:00
James B. Pollack	cd10b2b62e	open asset browser with a button	2016-08-12 15:49:36 -07:00
Atlante45	121890235c	New steam invite icon	2016-08-12 15:24:28 -07:00
James B. Pollack	1366dabc3a	yay	2016-08-12 14:24:29 -07:00
Atlante45	e4dd4c1a41	Merge branch 'master' of https://github.com/highfidelity/hifi into steam	2016-08-12 10:38:05 -07:00
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
Atlante45	42c9a695ff	Invite friends in HMD	2016-08-08 15:39:25 -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