54468 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
howard-stearns	750f1e5723	Merge branch 'master' of https://github.com/highfidelity/hifi into notification-circumstances	2017-05-02 11:57:21 -07:00
samcake	32d675c82b	Clean up the new code and adress review comments	2017-05-02 11:46:51 -07:00
howard-stearns	9b117165bd	expire our announcements when we leave, and turn off messagesWaiting when ... everything is expired.	2017-05-02 11:44:16 -07:00
Howard Stearns	3a36feacad	On touch, grip is a trigger, not a button, so it can have lots of callbacks with slightly different values that we ignore. In that case, don't update hand/joint.	2017-05-02 11:29:51 -07:00
Zach Fox	c9e0679b70	Subscribe to changes to snapshotsLocation setter for better UX	2017-05-02 10:55:57 -07:00
samcake	df54ad2339	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient	2017-05-02 10:50:39 -07:00
Brad Davis	425405f72d	Merge pull request #10245 from AndrewMeadows/avatar-renderer-002 ... more cleanup in preparation for moving Avatar class to lib	2017-05-02 10:37:22 -07:00
Zach Fox	f453df36cf	Prevent cursor appearance in snaps	2017-05-02 10:11:54 -07:00
Zach Fox	a754c4d6cc	Still image on top	2017-05-02 10:11:54 -07:00
Zach Fox	0ead9e5a24	Visual fixes; Select only 1 image at a time	2017-05-02 10:11:53 -07:00
Zach Fox	d295b5a69d	ShareBarHeight-= 5px; Remove test call	2017-05-02 10:11:53 -07:00
Zach Fox	5b168301bc	Update some typefaces; Add margins to pics	2017-05-02 10:11:53 -07:00
Zach Fox	ac86c13477	Fix sharing; disable HiFi buttons independently	2017-05-02 10:11:53 -07:00
samcake	e561a33b01	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis	2017-05-02 09:52:09 -07:00
Seth Alves	dc569051f9	Merge branch 'master' of github.com:highfidelity/hifi into grab-try-timer-instead-of-update	2017-05-02 09:50:13 -07:00
Seth Alves	b82a333a5e	Merge pull request #10196 from ZappoMan/poseFilters ... support for input controller pose filters	2017-05-02 09:46:22 -07:00
Seth Alves	6b2caf8081	Merge branch 'master' of github.com:highfidelity/hifi into fix-vr-2d-vr-tablet-crash	2017-05-02 09:41:47 -07:00
druiz17	18368cc073	Merge pull request #10343 from druiz17/tabletwebview-fix-links ... fix Tablet webview issues of not loading correct url.	2017-05-02 08:09:22 -07:00
Sam Cake	54ace01cd6	Factorizing the code on both 45 and 41 backend	2017-05-02 00:32:32 -07:00
samcake	8b62fad85e	TRying to test with sysmem and still doesn;t work	2017-05-01 18:19:07 -07:00
David Rowe	cb8f75394d	Don't sort recordings	2017-05-02 12:08:39 +12:00
Seth Alves	71deac49c6	reset tablet to homescreen when going from 2d to vr	2017-05-01 17:06:15 -07:00
David Rowe	dd739d73a0	Don't warn that recording didn't start playing if you stop it	2017-05-02 12:01:55 +12:00
samcake	4514da2a09	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient	2017-05-01 16:49:35 -07:00
Howard Stearns	73c24a5240	Merge pull request #10344 from howard-stearns/announcement-styling ... goto announcement card styling	2017-05-01 16:41:39 -07:00
howard-stearns	ca5318f121	remove debugging code	2017-05-01 15:57:22 -07:00
howard-stearns	545fd1355f	cleanup	2017-05-01 15:45:26 -07:00
howard-stearns	61b738e3cd	announcment styling	2017-05-01 15:35:17 -07:00
Seth Alves	45a50f9a46	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-5	2017-05-01 15:32:29 -07:00
Seth Alves	3ec3005c6d	code review	2017-05-01 15:32:17 -07:00
Dante Ruiz	a08b55d5f5	minimize diff	2017-05-01 23:08:25 +01:00
Dante Ruiz	07582c2624	Merge branch 'master' of github.com:highfidelity/hifi into tabletwebview-fix-links	2017-05-01 23:04:55 +01:00
druiz17	67daa4b0a9	Merge pull request #10335 from druiz17/webview-js ... Implemented of a web app to bring up the tablet webView	2017-05-01 15:03:55 -07:00
Clément Brisset	42294fa8c0	Merge pull request #10306 from Atlante45/feat/progressive-load-ktx ... Load High Mips before Fbx after skybox	2017-05-01 14:56:22 -07:00
Dante Ruiz	b00d7d763a	Merge branch 'master' of github.com:highfidelity/hifi into tabletwebview-fix-links	2017-05-01 22:45:42 +01:00
Dante Ruiz	64b8237bd6	fix twitter and facebook links	2017-05-01 22:45:13 +01:00
Brad Davis	f81d01f179	Prevent possible crash in texture buffering thread	2017-05-01 14:13:59 -07:00
Dante Ruiz	62870d85d3	Merge branch 'webview-js' of github.com:druiz17/hifi into tabletwebview-fix-links	2017-05-01 21:58:09 +01:00
Sam Cake	3abd9f21e8	Debugging without understanding...	2017-05-01 13:50:19 -07:00
Dante Ruiz	bb9eb98625	prevent mouse events from propagating to far	2017-05-01 21:49:57 +01:00
Atlante45	4f368cc867	Load High Mips before Fbx after skybox	2017-05-01 13:35:14 -07:00
Dante Ruiz	c205bf0980	working on cleaner navigation	2017-05-01 21:23:38 +01:00
Ryan Huffman	c839118c6b	Add ResourceManager::resourceExists	2017-05-01 13:22:23 -07:00
Ryan Huffman	074a11306c	Add support for atp and file urls in OBJReader	2017-05-01 13:22:02 -07:00
CFresquet	a3f637dc0e	Merge remote-tracking branch 'upstream/master'	2017-05-01 13:16:31 -07:00
Seth Alves	a75544a9fb	Merge pull request #10319 from hyperlogic/feature/head-standard-action ... Head, Hips and Chest IK can now be controlled from Controller inputs	2017-05-01 13:03:23 -07:00
Seth Alves	2b13d4d257	Merge pull request #10331 from ctrlaltdavid/21306 ... Fix keyboard not raising for Facebook username field	2017-05-01 13:02:19 -07:00
CFresquet	55fdf35c4a	merge of Request module	2017-05-01 13:02:18 -07:00
Brad Davis	40e4e2f307	Merge pull request #10327 from jherico/face_tracker_refactor ... Remove Faceshift	2017-05-01 12:14:55 -07:00
Howard Stearns	9fab66b66a	Merge pull request #10328 from howard-stearns/tablet-discovery-events ... fix announcement suggestions	2017-05-01 11:28:45 -07:00