57590 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David Rowe	86f33727eb	Add prototype Create palette	2017-07-27 16:53:15 +12:00
David Rowe	e8c5e1c2d5	Make the button move down when pressed	2017-07-27 16:05:32 +12:00
David Rowe	3b111b85ef	Move UI to hand	2017-07-27 15:56:42 +12:00
David Rowe	573a49853a	Tidying	2017-07-27 15:09:22 +12:00
David Rowe	136ea78873	Use overlays instead of entities	2017-07-27 13:47:35 +12:00
David Rowe	8e4a2ff154	Merge branch 'master' into vr-edit-a	2017-07-26 22:47:36 +12:00
David Rowe	6203a1ad68	Wire up button to toggle scale-with-hands / scale-with-handles	2017-07-26 22:41:38 +12:00
David Rowe	d4b872d9e1	Detect button press	2017-07-26 22:30:52 +12:00
David Rowe	3566609173	Highlight button as it is hovered	2017-07-26 21:34:13 +12:00
David Rowe	52759be618	Don't transition laser length when start intersecting UI	2017-07-26 20:40:12 +12:00
David Rowe	8dceb3cc6c	Show laser dot on UI even if trigger isn't squeezed	2017-07-26 17:26:43 +12:00
David Rowe	194a82974b	Make laser dot a minimum size commensurate with near laser beam width	2017-07-26 15:53:34 +12:00
David Rowe	0f2176127e	Fix locations of dominant hand settings and update setup	2017-07-26 15:41:16 +12:00
David Rowe	bf69402219	Laser intersect but don't highlight non-editable entities	2017-07-26 15:31:54 +12:00
Seth Alves	2f004abd81	Merge pull request #11050 from birarda/bug/error-decrypting ... Reduce erroneous messages about username signature decryption	2017-07-25 16:10:02 -07:00
Stephen Birarda	dd3755596c	fix typo in comment in DomainGatekeeper header	2017-07-25 15:43:34 -07:00
Stephen Birarda	e9845784d5	don't return error decrypting for optimistic public keys	2017-07-25 15:28:05 -07:00
Brad Davis	8d37e54a4e	Merge pull request #11051 from highfidelity/qt59 ... Changes for Qt 5.9 warnings and build issues	2017-07-25 15:05:28 -07:00
Brad Davis	030b54542c	Merge pull request #11049 from jherico/qt59_temp ... Move hosting for quazip back to hifi S3	2017-07-25 13:43:57 -07:00
Brad Davis	b1aa6e1962	Move hosting for quazip back to hifi S3	2017-07-25 13:43:10 -07:00
Zach Fox	30a571cc48	Merge pull request #11041 from amvmoody/wl_21472 ... WL 21472: restore snails ability to eat sprouts	2017-07-25 13:07:58 -07:00
Stephen Birarda	2d0c5ff37a	remove preloading of allowed user keys since it happens on connect	2017-07-25 11:41:34 -07:00
Andrew Meadows	2446fcde8e	Merge pull request #11039 from amvmoody/21477 ... WL 21477 Gravity Script	2017-07-25 08:59:22 -07:00
Andrew Meadows	9d1fba3a3b	Merge pull request #10821 from ctrlaltdavid/21418 ... Don't execute body of controllers' plugin update methods if not enabled	2017-07-25 08:51:17 -07:00
Ryan Huffman	9421e6ebb6	Merge pull request #11029 from cain-kilgore/dominant-hands ... WL 21453 - Add a "Dominant Hand" setting	2017-07-25 08:01:31 -07:00
Cain Kilgore	f9204a7034	Now it should appear..	2017-07-25 09:03:47 +01:00
Mike Moody	34594b914d	Added and removed different normalizations.	2017-07-24 23:55:44 -07:00
Mike Moody	dc53017dd4	Created script to let Snails eat brussel sprouts.	2017-07-24 23:17:13 -07:00
Andrew Meadows	a21da8613c	Merge pull request #11028 from sethalves/script-getmeshes-for-models ... Script getmeshes for models	2017-07-24 23:01:53 -07:00
Andrew Meadows	942a231a70	Merge pull request #11035 from highfidelity/bug/6740 ... Fixed bug: Disconnected domain (no access token present) is unnecessarily hitting /api/v1/user/friends	2017-07-24 22:43:37 -07:00
Cain Kilgore	2f857a6d1a	Forgot a file	2017-07-25 06:05:06 +01:00
Seth Alves	a3f4aeb182	code review	2017-07-24 19:41:30 -07:00
Seth Alves	c4d909927a	make atp-client work again	2017-07-24 19:23:39 -07:00
Seth Alves	d1037a49ae	Merge branch 'master' of github.com:highfidelity/hifi into script-getmeshes-for-models	2017-07-24 19:23:30 -07:00
Mike Moody	1bf2855e9b	Created script for spherical gravity.	2017-07-24 18:47:24 -07:00
Mike Moody	62efb32671	Created script for spherical gravity.	2017-07-24 18:39:09 -07:00
Mike Moody	e900dae708	Created script for spherical gravity.	2017-07-24 18:34:58 -07:00
Cain Kilgore	280a7a7e42	Fixing Styling, added Preference to Tablet, Moved Location to Avatar Tuning	2017-07-25 01:48:55 +01:00
utkarshgautamnyu	5771ee27e1	Update DomainGatekeeper.cpp	2017-07-24 17:33:01 -07:00
David Rowe	450badf023	Merge branch 'master' into vr-edit-a	2017-07-25 12:21:49 +12:00
Cain Kilgore	84609f27e3	Final Change - They're now Radio Boxes.	2017-07-24 23:53:03 +01:00
Chris Collins	8b978beb31	Merge pull request #11022 from 1P-Cusack/21463 ... WL21463 - entitySelectionTool: use multiarg findRayIntersection inste…	2017-07-24 15:13:21 -07:00
utkarshgautamnyu	884bdb3b7e	Update DomainGatekeeper.cpp	2017-07-24 14:57:22 -07:00
utkarshgautamnyu	7c62ed6dac	made sendRequest depend on hasValidAccessToken being true	2017-07-24 14:46:32 -07:00
Cain Kilgore	9c152ddc6f	Ticking left will keep it on left, not right	2017-07-24 22:30:43 +01:00
Seth Alves	23cb7d8bee	Merge pull request #11030 from MiladNazeri/editJs-edit ... Fix Parent Joint in edit js WL # 21471 :	2017-07-24 14:11:48 -07:00
Andrew Meadows	a44b33ab11	Merge pull request #11023 from jherico/audio_deadlock ... Fix for audio deadlock & audio device selection	2017-07-24 14:03:29 -07:00
Cain Kilgore	9ff7891c88	Fixed reference error, Gustavo should build now.	2017-07-24 19:56:02 +01:00
Chris Collins	c90442137c	Merge pull request #11032 from Atlante45/stable ... Stable => Master	2017-07-24 11:42:59 -07:00
Atlante45	d21ca3f1fc	Merge branch 'stable' of https://github.com/highfidelity/hifi into stable	2017-07-24 11:41:02 -07:00