4843 commits

Author	SHA1	Message	Date
James B. Pollack	f0a12e0251	switch	2015-12-28 14:50:35 -08:00
James B. Pollack	d4fd59edc0	send blacklist messages	2015-12-28 13:49:00 -08:00
Eric Levin	890b39f04b	Merge pull request #6740 from imgntn/blacklist_grab ... Add Raypick Blacklisting to handControllerGrab.js	2015-12-28 13:39:23 -08:00
James B. Pollack	7d7d0d4c07	mege	2015-12-28 13:21:00 -08:00
James B. Pollack	8eeae5ddf0	Merge pull request #6736 from ericrius1/handGrabCalcs ... Hand grab calcs	2015-12-28 10:49:55 -08:00
James B. Pollack	e237f957a6	Merge branch 'master' into blacklist_grab	2015-12-28 10:24:27 -08:00
James B. Pollack	c4d7b7b9bb	Update utils.js	2015-12-28 10:21:23 -08:00
James B. Pollack	a133dfa8dd	Merge pull request #6738 from ericrius1/rayBlacklist ... Ray-pick blacklisting	2015-12-28 10:19:52 -08:00
James B. Pollack	0e30393c81	make sure theres something on the blacklist	2015-12-27 12:47:56 -08:00
James B. Pollack	546e908633	protect blacklisting to my id	2015-12-27 12:46:40 -08:00
James B. Pollack	28c53822b1	add raypick blacklisting to hand grab script	2015-12-27 12:37:33 -08:00
Brad Davis	8e2a79ba4c	Merge pull request #6735 from ZappoMan/headPoseReticle ... add a test script for HMD.getHUDLookAtPositionXX()	2015-12-27 13:19:18 -05:00
ericrius1	542d8a4b6c	Fixed spelling mistakes	2015-12-24 12:06:29 -08:00
ericrius1	2e95ca7947	fixed syntax error	2015-12-24 12:05:11 -08:00
ericrius1	340c066b5c	reverted whiteboard changes	2015-12-24 12:04:36 -08:00
ericrius1	8e7dfc07c0	Added logic to blacklist entities from raypicking	2015-12-24 11:59:47 -08:00
ericrius1	390dce4613	Adding blacklist	2015-12-24 11:48:40 -08:00
ericrius1	e8a6fd1f05	adding ray filters example/test	2015-12-24 11:00:24 -08:00
ericrius1	24796c1a1e	updated ravestick spawner relative position	2015-12-24 10:14:36 -08:00
ericrius1	cd983db419	fixed merge conflicts	2015-12-23 15:13:45 -08:00
ericrius1	b4988b0998	Taking individual avatar hand size into consideration for grabbing objects	2015-12-23 15:09:10 -08:00
Brad Hefta-Gaub	f8a515de64	add a test script for HMD.getHUDLookAtPositionXX()	2015-12-23 14:46:18 -08:00
James B. Pollack	65d5e3f60a	add labels and transparent panel, but panel blocks pick so disable	2015-12-23 14:11:42 -08:00
AlessandroSigna	2c72e7964d	Fix assignment	2015-12-23 13:54:06 -08:00
Zach Pomerantz	ea9f2e57ce	Simplify renderDebug GUI	2015-12-23 13:09:45 -08:00
Thijs Wenker	505f4ce7e4	Merge branch 'master' of https://github.com/worklist/hifi into 20736 ... Conflicts: examples/controllers/handControllerGrab.js	2015-12-23 02:37:38 +01:00
James B. Pollack	4115138b5b	fix merge problems	2015-12-22 17:22:55 -08:00
James B. Pollack	aa0d1f0c29	temp	2015-12-22 17:15:23 -08:00
James B. Pollack	64eb22bf22	merging	2015-12-22 16:34:01 -08:00
James B. Pollack	c39f26ad72	new features	2015-12-22 16:31:49 -08:00
James B. Pollack	edd11a670a	minor adjustments to particles	2015-12-22 14:38:53 -08:00
James B. Pollack	60f2314469	remove debugging print	2015-12-22 14:38:05 -08:00
Brad Davis	a6d9dbc5c4	Merge pull request #6728 from ZappoMan/rightClickMenu ... More Hand Reticle movement improvements	2015-12-22 14:00:42 -08:00
Brad Hefta-Gaub	9a3d72c7b6	tweak sleep cycle slightly	2015-12-22 13:55:01 -08:00
Brad Hefta-Gaub	119f3e9895	make both hands and mouse work	2015-12-22 13:35:16 -08:00
James B. Pollack	52e6b84968	Update lightBall.js ... zeroes	2015-12-22 12:09:16 -08:00
James B. Pollack	7bc7bddc3a	set defaults	2015-12-22 12:00:45 -08:00
Brad Hefta-Gaub	cc00aa01fb	Merge branch 'master' of https://github.com/highfidelity/hifi into rightClickMenu	2015-12-22 11:54:34 -08:00
James B. Pollack	80e8fcf502	Merge branch 'master' into particle_grab	2015-12-22 11:49:51 -08:00
ericrius1	bb28369dee	Merge branch 'polylineOptimizations' of https://github.com/ericrius1/hifi into polylineOptimizations	2015-12-22 11:49:31 -08:00
James B. Pollack	56d654987c	changing branches	2015-12-22 11:48:56 -08:00
Eric Levin	e8803ad9ae	Lightsaber looks way better now	2015-12-22 11:35:04 -08:00
Eric Levin	653e3ecdcc	fixed offset issue with lightsaber	2015-12-22 11:02:36 -08:00
ericrius1	fdb909ca31	merged	2015-12-22 09:40:42 -08:00
Thijs Wenker	6c34059061	(note to self, ctrl-s every 5 seconds in code editor)	2015-12-22 14:24:14 +01:00
Thijs Wenker	c62ff3e5be	Merge branch 'master' of https://github.com/worklist/hifi into 20736	2015-12-22 14:14:04 +01:00
Thijs Wenker	b97f7ace66	path fix	2015-12-22 14:09:25 +01:00
Thijs Wenker	aefff1a59b	script to trigger recording with an assignment-client using messages-mixer	2015-12-22 14:08:12 +01:00
Thijs Wenker	60e1c74fe9	winter games target Practice scripts	2015-12-22 13:58:18 +01:00
ericrius1	1031489ada	changed dates	2015-12-21 19:08:34 -08:00