51797 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Philip Rosedale	4925b3c47c	Merge pull request #9756 from ctrlaltdavid/21122 ... Point index finger and raise thumb if not touching controller	2017-02-25 14:59:48 -08:00
sam	7a4ec35b99	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-02-25 13:01:09 -08:00
sam	a53d5e8fbd	adjusted the PLumber shape keys to coever non material shapes in main pass	2017-02-25 13:00:37 -08:00
Seth Alves	e3dbc53643	Merge branch 'master' of github.com:highfidelity/hifi into voxel-paint-opti	2017-02-25 11:35:40 -08:00
Seth Alves	0e4b0332dd	avoid a rare crash	2017-02-25 11:35:27 -08:00
Seth Alves	76c873ce81	don't compute polyvox shapes if they are collisionless	2017-02-25 11:34:48 -08:00
Seth Alves	0c84ddc503	fix indentation	2017-02-25 11:33:10 -08:00
Seth Alves	6a7e04f052	Merge pull request #9733 from hyperlogic/bug-fix/script-engine-double-destroy ... Make Debug defaultScripts.js option less error prone.	2017-02-25 08:57:23 -08:00
Seth Alves	36bcaa8d0f	delete tablet overlays when switching domains	2017-02-25 08:43:06 -08:00
kunalgosar	a4e0d970bf	Fix security section of domain server	2017-02-24 19:03:30 -08:00
David Kelly	baa7f81d79	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/palVolumeSorting	2017-02-24 18:38:57 -08:00
samcake	9ffdc03dc9	setting the shaeKeys for the overly properly because most of them are CustomPipleline	2017-02-24 18:25:24 -08:00
kunalgosar	d6c1f1c99a	Fixed Wed Entity not leaving Focus	2017-02-24 18:18:48 -08:00
David Rowe	0cc499b08b	Point index fingers and raise thumbs if not touching controls	2017-02-25 14:20:23 +13:00
samcake	1b501487fd	simple shader checks	2017-02-24 16:03:28 -08:00
Ryan Huffman	e47b1be9cf	Update shortbow spawning to use precise picking to find the ground	2017-02-24 14:48:22 -08:00
Ryan Huffman	85099513cd	Reduce enemy lifetime to 30s	2017-02-24 14:48:01 -08:00
David Rowe	a205d2a00c	Use animation for pointing index finger instead of setting joint angles	2017-02-25 11:36:06 +13:00
Seth Alves	1287beb3a2	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay	2017-02-24 13:58:03 -08:00
Chris Collins	8e91fc3dde	Merge pull request #9748 from ZappoMan/avatarBandwidthBudgetImprovements ... fix avatars slightly out of view in large audience from freezing	2017-02-24 13:57:56 -08:00
Seth Alves	34755dd75d	notify children of an overlay when the parent overlay moves	2017-02-24 13:57:49 -08:00
Seth Alves	b2a35f45db	when tablet is an overlay, use the model-fbx from the distribution (local disk copy) rather than the one on s3	2017-02-24 13:04:43 -08:00
Seth Alves	6e9854cad0	don't crash if geometry fails to load	2017-02-24 13:01:01 -08:00
Seth Alves	eedc5c1647	don't allow tablet to get stuck to a hand when passing it back and forth between hands	2017-02-24 12:10:52 -08:00
David Kelly	d6f0d8c960	styling changes, first pass	2017-02-24 11:45:03 -08:00
Seth Alves	71ab6a1a84	fix a couple of problems related to grabbing tablet while edit.js is active ... Conflicts: scripts/system/controllers/handControllerGrab.js	2017-02-24 11:38:42 -08:00
Seth Alves	70060eb464	in 2d mode, clicks on tablet don't get used for other things ... Conflicts: scripts/system/libraries/entitySelectionTool.js	2017-02-24 11:37:04 -08:00
Seth Alves	73774a6590	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay	2017-02-24 11:34:59 -08:00
David Rowe	a98824f483	Code review	2017-02-25 08:13:15 +13:00
Howard Stearns	a9b8045697	Merge pull request #9720 from howard-stearns/filter-pal-by-view-distance ... Filter pal by view distance	2017-02-24 11:10:13 -08:00
David Kelly	d399f648d5	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/palVolumeSorting	2017-02-24 10:32:43 -08:00
David Kelly	2458f95c42	more of a peak loudness with decay, now	2017-02-24 10:31:55 -08:00
sam	5257194c48	SImplify the overlay PLumber	2017-02-24 01:11:59 -08:00
sam	e1aad8bd63	Deep dive into the shape key and filters and the PLumber construction	2017-02-24 00:35:10 -08:00
sam	67031850aa	Deep dive into the shape key and filters and the PLumber construction	2017-02-24 00:05:54 -08:00
Menithal	10151c3f5b	Added Multi-userdata field updater	2017-02-24 08:04:03 +02:00
David Rowe	d9a716bf3d	If someone else is grabbing entity you want to grab show their grab beam	2017-02-24 18:42:52 +13:00
sam	8e122b3357	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-02-23 21:24:47 -08:00
Menithal	bdf241bafd	Merge branch 'master' into grab-clone	2017-02-24 05:43:25 +02:00
David Kelly	4a4c914ca8	First cut at new styling	2017-02-23 18:53:22 -08:00
Brad Hefta-Gaub	60fd4afc4d	don't count NoData avatars as having been broadcast, fix avatars slightly out of view from freezing	2017-02-23 18:52:10 -08:00
samcake	6d59144a4f	Trying to fix the emissive for overlay in front ?	2017-02-23 17:42:02 -08:00
Andrew Meadows	faa272c67c	don't blend animations for otherAvatars	2017-02-23 17:36:45 -08:00
Andrew Meadows	4bbbcb61be	expand avatar update time budget	2017-02-23 17:36:45 -08:00
Andrew Meadows	14e7392a89	minor cleanup	2017-02-23 17:36:45 -08:00
Andrew Meadows	0657ca1e5e	remove unnecessary context brackets	2017-02-23 17:36:45 -08:00
Andrew Meadows	92a32b4651	remove unused variable	2017-02-23 17:36:45 -08:00
Andrew Meadows	e54812430e	avoid unnecessary copy of priority_queue	2017-02-23 17:36:45 -08:00
Andrew Meadows	ee5971c39e	no need to calc length of normalized vector	2017-02-23 17:36:45 -08:00
Chris Collins	e723385df2	Merge pull request #9726 from ZappoMan/avatarBandwidthBudgetImprovements ... Avatar bandwidth budget improvements	2017-02-23 17:12:18 -08:00