53750 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Andrew Meadows	5bdecfbfa0	send keep-alive packets but don't resend identity	2017-04-13 16:00:11 -07:00
Zach Fox	520ceebf5b	Small HMD tweaks	2017-04-13 15:52:59 -07:00
Zach Fox	d9dc8ebc41	More improvements	2017-04-13 15:48:51 -07:00
Seth Alves	afa8fc161b	allow hinge constraint between two entities	2017-04-13 15:37:28 -07:00
Andrew Meadows	14b60165ef	don't keep stale avatars alive	2017-04-13 14:55:08 -07:00
Andrew Meadows	63ea16f24b	avatar-mixer to send identity packets as 'reliable'	2017-04-13 13:37:18 -07:00
Andrew Meadows	e364b8d33e	avatar-mixer resends to avoid stale avatar	2017-04-13 13:35:59 -07:00
Seth Alves	7695d2ac05	put the protocol version back to what's in master, for now	2017-04-13 11:29:40 -07:00
Sam Cake	3b385772c3	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-04-13 09:51:27 -07:00
Sam Cake	78bfc006f1	Prototyping the ResourceBuffer with the DrawBounds Job, yeah	2017-04-13 00:51:02 -07:00
samcake	d41f34ce8d	Adding support for the resource buffer	2017-04-12 19:07:27 -07:00
Rob Kayson	2257af42be	removed extra actions, creating all entities in create script.	2017-04-12 17:07:59 -07:00
Seth Alves	1ab3a1eb60	bump entity-protocol version	2017-04-12 16:36:04 -07:00
Seth Alves	0dab94fada	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-0	2017-04-12 16:34:46 -07:00
Seth Alves	9b12956909	formatting	2017-04-12 16:34:34 -07:00
Zach Fox	f23f9ec698	Merge pull request #10207 from zfox23/gifShareImprovements ... Snapshot sharing improvements	2017-04-12 16:33:44 -07:00
Zach Fox	631033dcb5	Merge pull request #10209 from zfox23/fixUserInfoViewerButton ... Make userInfoViewer button always clickable for myCard	2017-04-12 16:33:05 -07:00
Seth Alves	0eb9507a10	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-0	2017-04-12 16:25:50 -07:00
Brad Davis	b2aa3271f7	Adding support for variable allocated textures to the GL 4.1 backend	2017-04-12 15:09:20 -07:00
Zach Fox	71caf85a27	Quick fix!	2017-04-12 14:57:44 -07:00
Zach Fox	3f91fb8e55	Remove unnecessary comment	2017-04-12 14:45:57 -07:00
Zach Fox	c724c2e50b	New loading icon	2017-04-12 14:45:57 -07:00
Zach Fox	87b2d5bf8a	New loading icon	2017-04-12 14:45:57 -07:00
Zach Fox	75f1168b19	Clearer function names	2017-04-12 14:45:57 -07:00
Zach Fox	7b92989b1d	Fix it	2017-04-12 14:45:57 -07:00
Zach Fox	2579ac1baa	It's working!	2017-04-12 14:45:57 -07:00
Zach Fox	e296383b1b	Checkpoint!	2017-04-12 14:45:56 -07:00
Andrew Meadows	e64e2614e3	Merge pull request #10147 from alhighfidelity/Kinect-Hand-Filter ... Kinect hand filter	2017-04-12 14:27:05 -07:00
volansystech	7bc3435cfa	Initial Commit.. ... If distanceToObject from avatar is more than 15, we are accelarting entity travel by 2x. This will help user to grab the entity in lesser time.	2017-04-13 02:51:30 +05:30
Andrew Meadows	e751080f64	update model transform even when out of view	2017-04-12 12:50:54 -07:00
Andrew Meadows	6cb88c31f3	AvatarMixer sends min updates for out-of-view avatars	2017-04-12 12:50:44 -07:00
Zach Fox	2d1d207c9b	lol	2017-04-12 12:50:12 -07:00
Thijs Wenker	b2f463180d	fix teleport cool-in, added missing TARGETTING state and some ESLINT style fixes	2017-04-12 12:44:30 -07:00
Chris Collins	c545558b8a	Merge pull request #10199 from AndrewMeadows/avatar-should-vanish ... Avatar should vanish when teleporting far away	2017-04-12 12:28:46 -07:00
Chris Collins	36797d08fe	Merge pull request #10200 from thoys/fix/TeleportCoolIn ... Fix teleport coolIn	2017-04-12 11:57:08 -07:00
Zach Fox	ef2cea0d63	Merge pull request #10203 from zfox23/fix/avatarMouthsMoving ... Make avatar's mouths move again	2017-04-12 11:36:03 -07:00
Zach Fox	39587d5308	lol	2017-04-12 10:54:28 -07:00
David Kelly	a12407ddda	Merge pull request #10202 from davidkelly/dk/3934 ... Connection sort change	2017-04-12 10:42:04 -07:00
David Kelly	058a5b14a4	damn linter didn't run - vimrc work ahead...	2017-04-12 10:22:40 -07:00
Seth Alves	026dde2e68	allow kinematic near-grab to be turned on or off for a given entity	2017-04-12 10:14:16 -07:00
David Kelly	9376ac646f	offline people sort change	2017-04-12 08:41:36 -07:00
Seth Alves	507f658a5f	update comment	2017-04-12 07:37:41 -07:00
Seth Alves	9f252f04e7	cleanups	2017-04-12 07:25:23 -07:00
Seth Alves	53cb192af1	fixed names of pivot and axis	2017-04-12 07:22:27 -07:00
Seth Alves	cc77fce95f	hinge is sort-of working	2017-04-12 07:12:05 -07:00
Seth Alves	2b0315645c	actions work again	2017-04-11 21:11:03 -07:00
Seth Alves	74c0a70cb0	rename base action classes to dynamics, start on constraints	2017-04-11 20:39:13 -07:00
Thijs Wenker	695c55bc3d	fix teleport cool-in, added missing TARGETTING state and some ESLINT style fixes	2017-04-12 03:44:24 +02:00
samcake	4af4ff2882	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient	2017-04-11 17:24:32 -07:00
Andrew Meadows	b8a3c856be	update model transform even when out of view	2017-04-11 15:03:11 -07:00