2561 commits

Author	SHA1	Message	Date
Howard Stearns	27f40ea881	Signal Audio.disconnected, and use new hello/goodbye sounds in resources.	2015-06-11 20:33:30 -07:00
Brad Hefta-Gaub	24fda9a733	Merge pull request #5085 from SamGondelman/master ... Exposing Input Key Binding To JavaScript	2015-06-11 14:41:34 -07:00
Andrew Meadows	a3c5ea1b58	Merge pull request #5088 from sethalves/actions ... spring action with rotation and position target, rework grab script to use it	2015-06-11 13:23:57 -07:00
Seth Alves	8ed9a3ca02	add handedness setting to avatar-hold action. update stick.js to allow use of hydra	2015-06-11 11:04:19 -07:00
Brad Hefta-Gaub	a1ee339765	Merge pull request #5103 from samcake/punk ... TEAM TEACHING : Repair the Overlay 3D rendering and introduce the concept of layer in the scene	2015-06-11 10:17:38 -07:00
Andrew Meadows	f77f3f1e1e	fix bug where grab.js moves mouse to screen corner ... when CTRL is pressed	2015-06-11 08:43:19 -07:00
Sam Gateau	7685fe2229	Clean up on the item interface and introduction of the Layered concept, fixing the highliting box of the edit tool	2015-06-11 06:40:21 -07:00
Philip Rosedale	b32994b359	Merge pull request #5083 from ctrlaltdavid/20551 ... CR for Job #20551 - Create a directory button that opens up the Directory. Similar to the marketplace	2015-06-10 22:32:25 -07:00
Seth Alves	8bd80c511e	make stick follow mouse motion	2015-06-10 21:08:00 -07:00
Seth Alves	4216308b9b	Merge branch 'master' of github.com:highfidelity/hifi into actions	2015-06-10 19:05:25 -07:00
Seth Alves	45c7cd4929	respond to code review, add a simple hold-a-stick script	2015-06-10 18:48:51 -07:00
Niraj Venkat	9ed8daa97c	Removing unnecessary functions	2015-06-10 15:33:07 -07:00
Seth Alves	1c0c7f0fe3	Merge branch 'master' of github.com:highfidelity/hifi into actions	2015-06-10 15:30:28 -07:00
Niraj Venkat	182a3e918c	Hyperlink properties now propagate locally and over network	2015-06-10 13:12:18 -07:00
Niraj Venkat	c45d409383	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-06-10 09:51:17 -07:00
Niraj Venkat	4617b7331c	Working on creating functions to serialize and deserialize properties	2015-06-10 09:50:47 -07:00
Niraj Venkat	d90e43c5aa	Adding text boxes for hyperlink href and description	2015-06-09 16:15:47 -07:00
Stephen Birarda	091ed5b514	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-06-09 15:51:45 -07:00
Seth Alves	6cce845984	rotate based on initial mouse-position and initial entity rotation rather than doing small deltas as the mouse moves	2015-06-09 14:26:44 -07:00
Seth Alves	23dab530f9	fix some glitchy behavior during rotation	2015-06-09 14:11:01 -07:00
David Rowe	a4885ff38c	Close directory window after domain change	2015-06-09 12:33:30 -07:00
Seth Alves	ccb2f17b33	grab.js rotation sort-of works now	2015-06-09 11:21:13 -07:00
Seth Alves	42f94307d5	Merge branch 'master' of github.com:highfidelity/hifi into actions	2015-06-09 09:51:29 -07:00
Sam Gondelman	b1b2d1f85c	;) (added semicolons to js example)	2015-06-09 09:45:19 -07:00
David Rowe	cb6aef16e6	Merge branch 'master' into 20551	2015-06-09 09:36:44 -07:00
David Rowe	9e3ce344fb	Display directory button just above edit toobar	2015-06-09 07:26:18 -07:00
Brad Hefta-Gaub	3fb5e47dcc	Merge pull request #5064 from ericrius1/paint ... bumped max line points to 80	2015-06-08 21:20:58 -07:00
Seth Alves	2fb64aad91	fix variable name	2015-06-08 20:31:35 -07:00
Seth Alves	14a45e8349	convert grab.js to use spring action. rotation doesn't work right, yet	2015-06-08 18:25:58 -07:00
Seth Alves	f491a7a786	Merge pull request #5084 from AndrewMeadows/inertia ... rewrite grab.js to follow mouse	2015-06-08 17:35:03 -07:00
Brad Davis	90c18d0c48	Merge pull request #5080 from ZappoMan/team-teaching ... Merge TEAM-TEACHING into MASTER	2015-06-08 17:34:42 -07:00
Andrew Meadows	b682a07714	merge upstream/master into andrew/inertia ... Conflicts: examples/grab.js	2015-06-08 17:28:14 -07:00
Andrew Meadows	ef1e3aae00	faster move and max solid angle for distant grabs	2015-06-08 16:59:33 -07:00
Andrew Meadows	ffeac220f9	fix typo in variable name	2015-06-08 16:40:50 -07:00
Andrew Meadows	e70cd9edd9	remove unused variable	2015-06-08 15:11:42 -07:00
Andrew Meadows	4647f84638	rewrite grab.js to follow mouse	2015-06-08 14:58:42 -07:00
Eric Levin	6d59518149	added meditative ocean landscape and common utilities file	2015-06-08 14:02:38 -07:00
ZappoMan	24c8e7d0e6	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching	2015-06-08 13:50:50 -07:00
ZappoMan	5d6112d9c5	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching	2015-06-08 12:29:32 -07:00
Stephen Birarda	4e755e304b	fix spacing in new JS file	2015-06-08 11:31:24 -07:00
Stephen Birarda	666830c04d	add a sound once first AM packet received	2015-06-08 11:30:12 -07:00
David Rowe	f51feca37d	Add directory button	2015-06-08 11:29:35 -07:00
Sam Gateau	de61f4ea0b	Gettting th ehighlight on transparent to work	2015-06-08 02:52:13 -07:00
Sam Gateau	8d3a3221b0	shuffling the rendering steps to get to render transparent and light it correctly	2015-06-06 09:50:56 -07:00
Seth Alves	037a70b03a	undo unneeded/breaky change in grab.js	2015-06-05 13:47:07 -07:00
ZappoMan	7dc0e8a66c	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching	2015-06-05 12:21:29 -07:00
Eric Levin	21aa3b62bc	bumped max line points to 80	2015-06-05 12:04:32 -07:00
Seth Alves	b425cc6491	merge from upstream	2015-06-05 11:56:33 -07:00
Philip Rosedale	1f11625db4	Merge pull request #5060 from ericrius1/paint ... moved ball marker closer to hand so painting feels more visceral	2015-06-05 11:26:22 -07:00
Seth Alves	4e10c28b41	merge from upstream	2015-06-05 10:31:13 -07:00