4405 commits

Author	SHA1	Message	Date
James B. Pollack	873496e64b	cleanup	2015-12-07 13:53:40 -08:00
James B. Pollack	18e544cc53	Merge branch 'master' into ratsteer	2015-12-07 13:18:19 -08:00
Ryan Huffman	9d47ac000e	Merge pull request #6479 from thoys/editjs-left-click ... No more right-click-move editing in edit.js	2015-12-07 08:29:01 -08:00
Thijs Wenker	22bdc1ae84	Make it possible to use the focus-right-click-drag-camera in the edit.js script again. Still keep right-clicking ignore Toolbar and entity selection events.	2015-12-07 13:49:49 +01:00
James B. Pollack	378b71d701	dont spin by default	2015-12-05 17:51:55 -08:00
James B. Pollack	7859241ad3	spin the earth for fun	2015-12-05 17:43:13 -08:00
James B. Pollack	906540272e	disable collisions for now because of shapetype	2015-12-05 17:39:43 -08:00
James B. Pollack	30b32765b9	make earth grabbable to show parenting	2015-12-05 17:32:02 -08:00
James B. Pollack	ade32cbf61	remove collisions and add parenting	2015-12-05 17:30:38 -08:00
James B. Pollack	a899fe0e1b	fix typo	2015-12-05 17:26:11 -08:00
James B. Pollack	945b5bd00f	cleanup	2015-12-05 17:11:27 -08:00
James B. Pollack	d518def974	poll by default	2015-12-05 17:01:54 -08:00
James B. Pollack	7fc3d0f34e	header	2015-12-05 16:58:50 -08:00
James B. Pollack	4a5b9bd523	start position	2015-12-05 16:57:09 -08:00
James B. Pollack	4999b34327	cleanup interval	2015-12-05 16:54:55 -08:00
James B. Pollack	f33f4cbcae	cleanup	2015-12-05 16:22:17 -08:00
James B. Pollack	1f2d726211	awesome stuff	2015-12-05 16:16:58 -08:00
James B. Pollack	3b6cd4c2d1	initial live earthqukes commit	2015-12-05 14:11:59 -08:00
James B. Pollack	bfe12cf8db	stability improvments	2015-12-04 15:49:04 -08:00
James B. Pollack	b8e731fd22	adjustments	2015-12-04 15:25:55 -08:00
James B. Pollack	f867ebf1d1	every sixth rat	2015-12-04 15:18:35 -08:00
James B. Pollack	b1ec1eb113	make injectors more stable	2015-12-04 15:17:13 -08:00
Philip Rosedale	06c8235b19	Merge pull request #6544 from sethalves/distance-grab-adjustment ... distance-hold adjustment	2015-12-04 14:34:10 -08:00
James B. Pollack	51b0c48866	splicing and dicing	2015-12-04 14:05:31 -08:00
James B. Pollack	3211bec7ce	increase distance for rat to be in the nest and deleted	2015-12-04 13:57:59 -08:00
James B. Pollack	7ed0e3d8ae	change clear rat order	2015-12-04 13:56:38 -08:00
James B. Pollack	a9aecb5c49	add rat sounds	2015-12-04 13:54:59 -08:00
Seth Alves	4246672813	enable head-moving of distance grabbing	2015-12-04 10:38:24 -08:00
Brad Hefta-Gaub	d9a1563396	Merge pull request #6152 from sethalves/parents ... Parents	2015-12-04 10:26:57 -08:00
James B. Pollack	493a8f6f82	Merge branch 'master' into ratsteer	2015-12-04 10:26:47 -08:00
Seth Alves	17b5ade9c0	allow moving distantly grabbed objects with head	2015-12-03 16:45:46 -08:00
Seth Alves	a600df5ea6	try a different method of exagerating hand motion onto distanly held object	2015-12-03 16:04:39 -08:00
Clément Brisset	d6a2a2550b	Merge pull request #6526 from imgntn/butterfly ... Update model for butterflies.js	2015-12-03 15:25:55 -08:00
James B. Pollack	fbca1c9754	another toy	2015-12-03 11:12:28 -08:00
James B. Pollack	cf5c8c08e2	update toys to be inverted while held	2015-12-03 11:10:22 -08:00
Seth Alves	6eae98fb28	merge from upstream	2015-12-02 14:38:26 -08:00
James B. Pollack	a9438490fe	update butterfly model	2015-12-02 12:53:19 -08:00
Brad Hefta-Gaub	33b859df33	Merge pull request #6416 from kencooke/audio-reverb ... New reverb	2015-12-02 11:22:12 -08:00
Brad Hefta-Gaub	ba0ce5f3b3	Merge pull request #6480 from samcake/controllers ... Playback: Trying to get the Agent to Master connection more reliable	2015-12-02 11:08:15 -08:00
Ken Cooke	fbd7549430	Better reverb script defaults	2015-12-02 11:05:06 -08:00
samcake	0ae7060316	the correct includes	2015-12-02 10:23:31 -08:00
Brad Hefta-Gaub	112cdaf028	Merge pull request #6512 from AndrewMeadows/remove-debug-cruft ... remove debug option for disabling physics updates	2015-12-02 10:00:29 -08:00
samcake	586ed51436	rename AgentPoolCOntroller.js	2015-12-02 09:56:16 -08:00
Brad Hefta-Gaub	b6398a7930	fix PlayRecordingOnAC.js to use new API	2015-12-02 09:51:52 -08:00
samcake	c7b9d7d26e	Merge branch 'master' of https://github.com/highfidelity/hifi into controllers	2015-12-02 09:49:03 -08:00
Seth Alves	0595ef0938	merge from upstream	2015-12-02 09:30:19 -08:00
James B. Pollack	e67f372bcf	make pistol shoot differently and not alter controller mappings	2015-12-01 18:24:13 -08:00
samcake	86af28dbab	Fighting for one hour with the ready message being misunderstood by master	2015-12-01 18:18:18 -08:00
James B. Pollack	1eca1540c6	Merge pull request #6519 from ericrius1/toyboxSounds ... added collision sounds to flashlight, spraycan, and bow	2015-12-01 17:08:19 -08:00
Eric Levin	34234da2d1	fixed spacing	2015-12-01 17:05:51 -08:00