57183 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Sam Gateau	7c55370f26	Fixing the bug appearing on Nvidia 284.76	2017-07-05 13:49:08 -07:00
Zach Fox	64a443ee0d	Merge pull request #10883 from zfox23/snapshots_TweakShareButton ... Tweak the Snapshot 'Share' button to make its purpose more clear	2017-07-05 13:27:51 -07:00
David Kelly	89c05244bf	remove unnecessary extra update() calls	2017-07-05 13:24:31 -07:00
Zach Fox	6f2e7f5b83	Tweak the Snapshot 'Share' button to make its purpose more clear	2017-07-05 12:39:15 -07:00
Dante Ruiz	07d098b95b	coding standard fix	2017-07-05 19:45:52 +01:00
David Kelly	85813ac908	render issue fixes	2017-07-05 11:29:34 -07:00
Seth Alves	d917878638	fix whitespace	2017-07-05 11:29:09 -07:00
Seth Alves	ab340530b8	don't do a lot of processing during the mouse-move event handler	2017-07-05 11:27:13 -07:00
Dante Ruiz	275f48b65a	another requested change made	2017-07-05 19:22:19 +01:00
Seth Alves	b147c3a843	Merge branch 'master' of github.com:highfidelity/hifi into atp-client	2017-07-05 11:07:51 -07:00
Dante Ruiz	e567cf0196	made requested changes	2017-07-05 19:04:34 +01:00
Brad Davis	1bcfe1eaba	Merge pull request #10880 from samcake/hobbes ... Fixing the bug appearing on Nvidia 384.76	2017-07-05 10:56:03 -07:00
Dante Ruiz	27a9880eff	removed double add of head offset	2017-07-05 18:34:33 +01:00
Dante Ruiz	b86a8b8338	Merge branch 'master' of github.com:highfidelity/hifi into vive-in-desktop	2017-07-05 18:27:33 +01:00
Dante Ruiz	691b59ffff	remove debug statments	2017-07-05 18:26:58 +01:00
Zach Fox	44cb48b17d	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-07-05 09:59:57 -07:00
Sam Gateau	48b4b5f49c	Fixing the bug appearing on Nvidia 284.76	2017-07-05 18:39:09 +02:00
Mohammed Nafees	eb354a4333	Cleanup menu shortcut keys	2017-07-05 14:50:48 +05:30
Seth Alves	a05e9e12c1	remove some debug prints	2017-07-04 17:59:56 -07:00
Seth Alves	bdbfe25a53	remove some debug prints	2017-07-04 17:46:35 -07:00
Seth Alves	1192e86494	add a way to login on command-line	2017-07-04 17:11:53 -07:00
Seth Alves	a6af6015a4	add a way to login on command-line	2017-07-04 17:00:25 -07:00
Seth Alves	e9a8c3f5e8	rename atp-get to atp-client. add ability to list atp file mappings and to upload new files	2017-07-04 15:52:03 -07:00
Seth Alves	fad686571a	Merge pull request #10874 from jherico/overlay_mutex ... Restore mutex in overlay interface	2017-07-03 17:25:42 -07:00
Zach Fox	fcc131187d	Merge pull request #10856 from zfox23/spectatorCamera_positionSpeedup ... Spectator Camera position/orientation update speedup	2017-07-03 16:44:12 -07:00
David Kelly	c205d3eb2a	Merge pull request #10721 from davidkelly/dk/spectatorCameraPreview ... Spectator camera preview	2017-07-03 16:42:27 -07:00
David Kelly	36467983d8	cr stuff	2017-07-03 16:29:26 -07:00
David Kelly	2a3b4b3bfb	minor cleanup, and adjusted includes per austin's suggestion	2017-07-03 15:54:54 -07:00
David Kelly	99bf100ff8	fix for jitter and not rendering in tablet	2017-07-03 15:19:04 -07:00
Chris Collins	1f7d2b283a	Merge pull request #10872 from jherico/fix_laggy_overlays ... Don't use a blocking connection for a high-frequency script function	2017-07-03 14:58:32 -07:00
Brad Davis	97edbb7f37	Restore mutex in overlay interface	2017-07-03 14:49:57 -07:00
David Kelly	373bd0cc8a	aspect ratio preserved upon blitting, minor qml tweak, warnings fixed	2017-07-03 14:23:23 -07:00
David Kelly	5f015ec77f	Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview	2017-07-03 13:57:25 -07:00
David Kelly	045b009b00	Merge branch 'dk/spectatorCameraPreview' of https://github.com/davidkelly/hifi into dk/spectatorCameraPreview	2017-07-03 13:57:05 -07:00
anshuman64	70b9e9b41e	Merge pull request #10849 from druiz17/calibration-ui-update ... Updated calibration UI visuals and added UserActivity events.	2017-07-03 12:42:09 -07:00
Brad Davis	6c86c297cb	Don't use a blocking connection for a high-frequency function like editOvleray	2017-07-03 12:40:52 -07:00
1P-Cusack	38baeabbe5	Add View->Enter First Person Mode in HMD checkbox. ... When checked, changing to an HMD display will switch the user to first person mode. WL 21425.	2017-07-03 15:21:40 -04:00
ZappoMan	d5acc8a6f9	Merge branch 'master' of https://github.com/highfidelity/hifi into godview	2017-07-03 12:21:29 -07:00
Chris Collins	ad996cba3d	Merge pull request #10871 from Atlante45/master ... Stable => Master	2017-07-03 12:19:51 -07:00
Atlante45	3b5b0e9a50	Merge branch 'stable' of https://github.com/highfidelity/hifi	2017-07-03 12:17:45 -07:00
Chris Collins	9264365328	Merge pull request #10867 from highfidelity/rc-46 ... Beta Release 46 - Includes up to Developer Release 6801	2017-07-03 12:16:43 -07:00
Ryan Huffman	b8ce4b9006	Merge pull request #10801 from huffman/fix/oven-native-separators ... Add support for native separators in oven, and vs2015/2017 FBX sdk	2017-07-03 12:07:26 -07:00
Zach Fox	495f702722	Merge pull request #10868 from CainFoool/rocket-hands ... WL 21421 - Script to Fly with Rocket Hands	2017-07-03 12:05:06 -07:00
Cain Kilgore	eddb7a349c	Boilerplate	2017-07-03 20:01:01 +01:00
Cain Kilgore	1c5923914b	Combining three if statements into one!	2017-07-03 19:58:26 +01:00
Cain Kilgore	bfcddcf3b7	Cleaned up the code, created a function to check if the hands are in the right position.	2017-07-03 19:53:29 +01:00
Cain Kilgore	5f600b4ea9	Cleanup again	2017-07-03 19:31:41 +01:00
Cain Kilgore	44624c5fab	space	2017-07-03 19:11:57 +01:00
Cain Kilgore	2c53b5b372	QA Cleanup	2017-07-03 19:09:54 +01:00
Zach Fox	9c96cf811e	Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into spectatorCamera_positionSpeedup	2017-07-03 10:33:55 -07:00