2436 commits

Author	SHA1	Message	Date
Andrew Meadows	139ebca258	less bad behavior when dragging across horizon	2015-05-18 23:09:08 -07:00
Andrew Meadows	d486899aad	remove unused experimental grab placement	2015-05-18 22:54:00 -07:00
Andrew Meadows	fbd1b7e8b0	grabHockey.js can also rotate objects again	2015-05-18 22:49:23 -07:00
Andrew Meadows	b60907570a	safe to use grabHockey.js to grab misc objects	2015-05-18 22:32:20 -07:00
Andrew Meadows	bb1fe8f439	cleanup and stability for grabHockey.js script	2015-05-18 16:57:25 -07:00
Seth Alves	58b6205433	pull in Andrew's adjustment of paddle confinement	2015-05-18 14:10:58 -07:00
Seth Alves	34b381d48c	have airHockey.js provide the floor of the table, rather than the collision hull	2015-05-18 13:47:10 -07:00
Seth Alves	ab13eb2d16	put lowered friction back on table. incorportate Andrew's fix for the paddle crashing through the new table corners	2015-05-18 13:30:28 -07:00
Seth Alves	e2a39b4597	airhockey -- drop from slightly lower so paddle doesn't flip over. update grab script with new table name	2015-05-18 12:18:27 -07:00
Seth Alves	6d9db21d88	Merge branch 'master' of github.com:highfidelity/hifi into airhockey-hull	2015-05-18 12:09:10 -07:00
Seth Alves	5ea506f2c1	use a collision hull for table. make deletion code safer	2015-05-18 11:47:06 -07:00
Stephen Birarda	b5fb8b0d12	Merge pull request #4908 from howard-stearns/edit-script-type ... Fix (long-standing?) typo in edit.js file reference.	2015-05-18 13:37:45 -04:00
Howard Stearns	adfe21b743	Fix (long-standing?) typo in edit.js file reference.	2015-05-18 10:28:47 -07:00
Andrew Meadows	257a730029	keep hokey paddle in playing field	2015-05-18 09:42:55 -07:00
Philip Rosedale	831148e280	Merge pull request #4888 from sethalves/finglonger ... more pointer.js fixes	2015-05-15 17:18:32 -07:00
Philip Rosedale	1c3873358d	Merge pull request #4896 from huffman/update-web-icon ... Update web icon	2015-05-15 17:18:11 -07:00
Philip Rosedale	534869a7ad	Merge pull request #4889 from ericrius1/dice ... changed dice to use collisionSoundURL prop	2015-05-15 17:17:45 -07:00
Ryan Huffman	a0369d243a	Update web icon	2015-05-15 15:58:02 -07:00
Eric Levin	9bfca7f54d	'moved icons up so they don't interfere with dice icons and changed spanw icon from dice to puck icon' ... '	2015-05-15 15:43:23 -07:00
Eric Levin	6e1c5d704c	'modified airHockey script to be able to spawn and delete using buttons, added light flashing on score, and puck now respawns on player's side who just got scored on	2015-05-15 15:24:10 -07:00
Seth Alves	60bd345e57	shorter timeout	2015-05-15 14:20:29 -07:00
Seth Alves	0d3add8596	left mouse button only	2015-05-15 14:16:06 -07:00
Seth Alves	aeb5cead65	more fixes to pointer.js	2015-05-15 14:02:25 -07:00
Eric Levin	9c6be26290	changed dice to use collisionSoundURL prop	2015-05-15 13:55:48 -07:00
Seth Alves	042713d1ec	Merge branch 'master' of github.com:highfidelity/hifi into finglonger	2015-05-15 13:55:28 -07:00
Seth Alves	f535bd2a76	more fixes to pointer.js	2015-05-15 13:54:24 -07:00
Seth Alves	de8d06acf6	Merge pull request #4887 from PhilipRosedale/hockeygame ... remove line pointers from grab and hockey grab	2015-05-15 13:43:55 -07:00
Philip Rosedale	cb0112e14e	remove line pointers from grab and hockey grab	2015-05-15 13:21:58 -07:00
Seth Alves	bb3d1a6a58	rays never pick a line entity. some fixes to pointer.js	2015-05-15 13:10:16 -07:00
Seth Alves	1161f33b45	laser-poiner script for mouse	2015-05-14 20:25:29 -07:00
Seth Alves	3471c0a44f	Merge pull request #4878 from PhilipRosedale/hockeygame ... new paddle models, low friction on field	2015-05-14 18:23:27 -07:00
Philip Rosedale	7be463388b	new paddle models, low friction on field	2015-05-14 18:22:30 -07:00
Eric Levin	7a12a4d58e	added support for both right and left hydras for hydra scripts, and made picking accurate	2015-05-14 17:00:40 -07:00
Philip Rosedale	363f55c0f1	Merge pull request #4872 from ericrius1/hydraHockey ... added hydraHockeyGrab.js, which constrains moving object to xz plane …	2015-05-14 15:05:44 -07:00
Andrew Meadows	53e241fb07	merge upstream/master into andrew/thermonuclear	2015-05-14 12:37:41 -07:00
Andrew Meadows	d28c400cea	add restitution and friction Entity properties	2015-05-14 12:36:59 -07:00
Eric Levin	ebb590e58a	added new hydragrab script which works similarly to mouse grab script, and added header to hydraGrabHockey script	2015-05-14 11:46:52 -07:00
Eric Levin	3393b60aba	added hydraHockeyGrab.js, which constrains moving object to xz plane and disables rotation	2015-05-14 11:39:04 -07:00
Philip Rosedale	1e01aeb9ed	first version, air hockey game	2015-05-13 23:11:24 -07:00
Brad Hefta-Gaub	b799b89dbc	Merge pull request #4861 from thoys/20540 ... CR for Job #20540 - Additions to Planky	2015-05-13 20:40:58 -07:00
Brad Hefta-Gaub	5da0a8d7a3	Merge pull request #4860 from howard-stearns/entity-sound ... Entity sound.	2015-05-13 20:07:44 -07:00
Philip Rosedale	4811697de3	Merge pull request #4866 from sethalves/fix-grab.js-entity-picking ... have grab.js do *accurate* picking!	2015-05-13 19:52:09 -07:00
Seth Alves	73fa1af24a	have grab.js do *accurate* picking!	2015-05-13 19:38:19 -07:00
Howard Stearns	b79a58c0c8	Whitespace.	2015-05-13 18:07:51 -07:00
Brad Hefta-Gaub	072a982fe3	Merge pull request #4851 from huffman/fix-edit-properties-width ... Remove nowrap from entity tool property labels	2015-05-13 17:45:57 -07:00
Howard Stearns	8324da2f7f	Whitespace formatting/indentation.	2015-05-13 15:48:22 -07:00
Howard Stearns	1a87ca04da	Entity sound.	2015-05-13 13:18:02 -07:00
Brad Davis	9b6c20d93c	Merge remote-tracking branch 'upstream/master' into web-entity	2015-05-13 09:49:53 -07:00
Ryan Huffman	b4416f3bc2	Remove nowrap from entity tool property labels	2015-05-13 08:36:11 -07:00
Brad Davis	a8d343bbf1	Working on web entities	2015-05-13 00:27:57 -07:00