54293 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Zach Fox	aa46534b60	Whoops.	2017-05-02 17:10:57 -07:00
Zach Fox	964e79ce14	It's working!	2017-05-02 16:58:33 -07:00
Zach Fox	68fa8e06ef	Super amped about this. Only need to add disabled state?	2017-05-02 16:38:16 -07:00
Zach Fox	5d38cd543d	Yet another checkpoint	2017-05-02 16:06:13 -07:00
Zach Fox	7817c72ea1	Another checkpoint	2017-05-02 15:58:43 -07:00
Zach Fox	0beceae59b	Checkpoint	2017-05-02 15:19:20 -07:00
Zach Fox	1067d1e0f6	Don't let user blast in certain cases	2017-05-02 14:43:16 -07:00
Zach Fox	d8095c5ea5	New setup instructions; new 'blank snapshot' text	2017-05-02 14:20:27 -07:00
Zach Fox	d1dff7606c	Lint cleanup; Immediate share button visibility;	2017-05-02 14:10:24 -07:00
Zach Fox	5302110e7b	Merge pull request #10346 from zfox23/newSnapshotReview_Improvements ... Lots of Snapshot app improvements, Round One	2017-05-02 13:00:08 -07:00
Howard Stearns	8e7b294380	Merge pull request #10351 from howard-stearns/handshake-touch ... handshakes on rift	2017-05-02 12:22:55 -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
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
Seth Alves	b82a333a5e	Merge pull request #10196 from ZappoMan/poseFilters ... support for input controller pose filters	2017-05-02 09:46:22 -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
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
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
Dante Ruiz	62870d85d3	Merge branch 'webview-js' of github.com:druiz17/hifi into tabletwebview-fix-links	2017-05-01 21:58:09 +01: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
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
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
Howard Stearns	0146d7550e	Merge pull request #10333 from howard-stearns/handshake-cleanup-2 ... Handshake cleanup	2017-05-01 11:15:54 -07:00
Clément Brisset	5c46d1e3ff	Merge pull request #10316 from sethalves/fix-stray-edit-laser ... fix -- show hand lasers when edit is enabled, but not if there are not hand-controllers	2017-05-01 10:48:59 -07:00
Dante Ruiz	763feccbe1	removed tabs	2017-05-01 18:07:42 +01:00
Dante Ruiz	9f33af479d	saving work	2017-05-01 18:04:22 +01:00
anshuman64	5731242e7f	Merge pull request #10321 from ZappoMan/fixFrozenBots ... fix frozen bots	2017-05-01 09:33:33 -07:00
Anthony J. Thibault	0c09823f67	clang warning fixes, unused variables...	2017-05-01 09:10:31 -07:00
druiz17	f60deb0cfc	fixed the twitter link	2017-04-30 22:55:44 -07:00
Howard Stearns	f980d6f435	Merge branch 'master' of https://github.com/highfidelity/hifi into handshake-cleanup-2	2017-04-30 15:51:12 -07:00
Howard Stearns	e740fb67f4	convert foreign handString to jointIndex once, not often	2017-04-30 15:50:30 -07:00
Howard Stearns	a057400a92	Merge pull request #10323 from davidkelly/dk/gripThresholdGetsBigger ... increase minimum grip pressure to initiate handshake	2017-04-30 15:49:35 -07:00