15417 commits

Author	SHA1	Message	Date
howard-stearns	9ff1a695f0	Merge branch 'master' of https://github.com/highfidelity/hifi into reset-hud-on-driving	2016-05-26 13:52:23 -07:00
howard-stearns	991da9e248	fix cut-paste error in settings.	2016-05-26 09:51:55 -07:00
Brad Hefta-Gaub	78b6a6c661	Merge branch 'master' of https://github.com/highfidelity/hifi into protocolVersionCheck ... Conflicts: libraries/networking/src/udt/PacketHeaders.cpp	2016-05-25 17:18:27 -07:00
Brad Hefta-Gaub	f2acc82899	Merge pull request #7971 from birarda/session-id-with-place-request ... optionally include the metaverse session ID as HTTP header when sending usage data	2016-05-25 17:14:27 -07:00
Brad Hefta-Gaub	06cb625d09	Merge pull request #7959 from hyperlogic/tony/improved-avatar-mixer-precision ... Improved Avatar Mixer Rotation Precision	2016-05-25 17:14:12 -07:00
howard-stearns	dc7d6d470d	Don't reset head when we come back.	2016-05-25 12:21:50 -07:00
Stephen Birarda	66bdbf910d	optionally include the metaverse session ID as an http header	2016-05-25 11:55:04 -07:00
howard-stearns	2accccef9e	Merge branch 'reset-hud-on-driving' of https://github.com/howard-stearns/hifi into reset-hud-on-driving	2016-05-25 11:32:01 -07:00
howard-stearns	8198a1b4d1	Add preference to control behavior.	2016-05-25 11:30:45 -07:00
howard-stearns	5d806cba7f	Merge branch 'master' of https://github.com/highfidelity/hifi into reset-hud-on-driving	2016-05-25 10:47:31 -07:00
Brad Hefta-Gaub	fb9f6185db	CR feedback	2016-05-24 17:19:53 -07:00
Brad Hefta-Gaub	183f38e4f0	pop up warning if domain over capacity	2016-05-24 16:07:57 -07:00
Brad Hefta-Gaub	2eef07e414	cleanup and dead code removal	2016-05-24 15:38:08 -07:00
Brad Hefta-Gaub	12a1857280	check point with protocol refusal working	2016-05-24 15:20:11 -07:00
Brad Hefta-Gaub	1cf8236860	Merge branch 'master' of https://github.com/highfidelity/hifi into protocolVersionCheck	2016-05-24 13:31:36 -07:00
Brad Hefta-Gaub	1d9981e624	first cut at support for verifying all protocol version compatibility	2016-05-24 13:31:19 -07:00
Brad Hefta-Gaub	f16a3ce6bb	Merge pull request #7962 from zzmp/fix/throttle ... fix throttling when Interface is not in focus	2016-05-24 08:25:38 -07:00
Zach Pomerantz	7dabce9cff	Check throttle before idling/painting	2016-05-23 19:04:35 -07:00
Anthony J. Thibault	edfce0d5ba	MyAvatar: reset fix, for both oculus and vive	2016-05-23 16:34:19 -07:00
Anthony J. Thibault	a1c32f8c44	Merge branch 'master' into tony/improved-avatar-mixer-precision	2016-05-23 10:24:52 -07:00
Seth Alves	40e862cf9e	quiet gcc 5 warnings	2016-05-21 16:53:01 -07:00
Brad Hefta-Gaub	ac49feda22	Merge branch 'master' of https://github.com/highfidelity/hifi into removeDisableEntityNACKS ... Conflicts: libraries/entities/src/EntityEditPacketSender.h	2016-05-21 09:23:45 -07:00
Seth Alves	f91a2403be	merge from upstream	2016-05-20 17:07:34 -07:00
Brad Hefta-Gaub	18613908df	Merge pull request #7800 from sethalves/no-fly-zones ... No fly zones	2016-05-20 16:59:55 -07:00
howard-stearns	fa78eea434	Merge branch 'master' of https://github.com/highfidelity/hifi into reset-hud-on-driving	2016-05-20 16:50:54 -07:00
howard-stearns	9a428947e4	Simplify code.	2016-05-20 16:50:17 -07:00
howard-stearns	6568c0563d	Delay on entry/exit.	2016-05-20 16:43:55 -07:00
Seth Alves	d95d3ff3ac	clean up debugging prints	2016-05-20 14:56:47 -07:00
Brad Davis	07562f72af	Doing a pass over the input plugins and controller code	2016-05-20 14:50:23 -07:00
Seth Alves	ff36b39067	Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3	2016-05-20 14:38:53 -07:00
howard-stearns	dcc8764fa7	Merge branch 'master' of https://github.com/highfidelity/hifi into reset-hud-on-driving	2016-05-20 13:41:41 -07:00
Brad Hefta-Gaub	770fab956f	remove dead code	2016-05-20 12:23:06 -07:00
howard-stearns	1801e270af	Merge branch 'master' of https://github.com/highfidelity/hifi into reset-hud-on-driving	2016-05-20 09:26:25 -07:00
Zach Pomerantz	2026226fe2	Handle vsync without halving fps	2016-05-20 09:04:39 -07:00
Howard Stearns	3088a84035	Just bringing the code up to date and forcing a build to see how Jenkins/osx is doing. ... Merge branch 'master' of https://github.com/highfidelity/hifi into reset-hud-on-driving	2016-05-20 08:04:38 -07:00
Seth Alves	1de9598243	Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3	2016-05-19 16:37:40 -07:00
Anthony J. Thibault	7f131e2c4f	Reset avatar as well as displayPlugin when "driving"	2016-05-19 15:00:08 -07:00
Zach Pomerantz	9a4b30a50b	Fix AvatarInputs phantom movement	2016-05-19 13:19:15 -07:00
Brad Hefta-Gaub	cef4a49c35	Merge pull request #7867 from huffman/fix/query-octree-crash ... Fix crash in JurisdictionMap	2016-05-19 11:53:54 -07:00
Seth Alves	74520f5c92	Merge branch 'master' of github.com:highfidelity/hifi into no-fly-zones	2016-05-19 09:49:44 -07:00
Seth Alves	419c744bd4	Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3	2016-05-19 09:49:18 -07:00
Anthony J. Thibault	0294066668	Removed pupilData and translationRadix from AvatarData packet.	2016-05-18 16:41:50 -07:00
Ryan Huffman	01944f5100	Remove unused DependencyManager include	2016-05-18 15:38:54 -07:00
Ryan Huffman	ce6ae40432	Replace foreach use with for()	2016-05-18 15:38:54 -07:00
Ryan Huffman	dd093e3fcd	Make AccountManager a DependencyManager singleton	2016-05-18 15:38:54 -07:00
Ryan Huffman	cf49c8e2bf	Add getUserAgent function that includes plugin information	2016-05-18 15:35:29 -07:00
Brad Hefta-Gaub	335d9abddd	Merge pull request #7874 from AndrewMeadows/vertical-thrust ... allow MyAvatar.addThrust() to raise avatar from standing on ground	2016-05-18 11:41:37 -07:00
Anthony J. Thibault	b48134e30c	WIP commit testing for joint mapping transmission	2016-05-18 11:40:45 -07:00
Brad Hefta-Gaub	4df4829280	Merge pull request #7902 from jherico/gpu_breakup ... moving GL backend out of GPU	2016-05-18 11:35:35 -07:00
Brad Hefta-Gaub	9a3b6bf081	Merge pull request #7858 from Atlante45/remove-deprecated-entity-props ... removed dead code for overlays/entities glow level	2016-05-18 09:14:26 -07:00