19680 commits

Author	SHA1	Message	Date
David Kelly	8ceb6a20f0	friend/unfriend working	2017-03-31 15:05:21 -07:00
Zach Fox	6a4c2c5e12	Fix issues; checkpoint on new ComboDialog	2017-03-31 14:56:42 -07:00
howard-stearns	5c8b2ba1c3	restore lost code	2017-03-31 13:28:14 -07:00
Zach Fox	05c34fb3ee	Move some things around so ComboBox works (and layout improves)	2017-03-30 15:19:19 -07:00
Zach Fox	c24b8b47a9	Minor layout changes	2017-03-30 14:08:29 -07:00
Howard Stearns	0edbf1fbd9	Merge pull request #10044 from howard-stearns/pal-backend-integration ... Pal backend integration	2017-03-30 12:55:11 -07:00
Howard Stearns	3056bb16a2	typo, and delete request on abort/fail	2017-03-30 12:40:54 -07:00
David Kelly	e66c075f8e	Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-30 10:14:29 -07:00
Howard Stearns	af25e0e21f	Don't consider changes to location details as update-worthy if we're not discoverable.	2017-03-29 17:55:57 -07:00
Zach Fox	4887081e2c	New PAL colors; slight layout changes	2017-03-29 16:30:24 -07:00
Howard Stearns	3a7edebb94	Adjust reporting of availability to metaverse.	2017-03-29 16:12:50 -07:00
Zach Fox	a6ff3fcdb7	Tablet PAL bugfix; Connections help text v1	2017-03-29 15:47:19 -07:00
Anthony J. Thibault	332dfa098f	Fix for disappearing toolbar after reload all scripts	2017-03-29 14:10:26 -07:00
Howard Stearns	b8f557ca54	Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into pal-backend-integration	2017-03-29 13:30:15 -07:00
Howard Stearns	c795d2ca3b	Four-way discoverability. (Needs testing.)	2017-03-28 18:31:08 -07:00
Zach Fox	b776f25b3b	Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-28 18:09:17 -07:00
Zach Fox	81264c998b	Revert "Merge from upstream/master" ... This reverts commit b5ba4a109d.	2017-03-28 17:39:45 -07:00
Zach Fox	b5ba4a109d	Merge from upstream/master	2017-03-28 17:37:34 -07:00
Seth Alves	8dcbf33e16	Merge pull request #10041 from druiz17/tablet-improve-goto ... added left out design elements to the tablet goto page	2017-03-28 17:19:50 -07:00
howard-stearns	c2a49a582e	send credentials to local metaverse servers, and initial users data ... integration.	2017-03-28 16:44:16 -07:00
howard-stearns	37ab0b57a7	Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into pal-backend-integration	2017-03-28 15:41:46 -07:00
Dante Ruiz	a76e5ef8d9	improve the design of the tablet goto	2017-03-28 23:02:23 +01:00
Seth Alves	6df4dda746	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-28 11:42:14 -07:00
Seth Alves	39ec53d69a	Merge pull request #10032 from hyperlogic/bug-fix/null-tablet-proxy ... Mark the system TabletProxy object as Cpp ownership.	2017-03-28 10:08:05 -07:00
Seth Alves	9e675d4c93	Merge pull request #9990 from hyperlogic/bug-fix/sliders ... Added inputMode property to Web3DOverlay	2017-03-28 10:07:37 -07:00
Anthony J. Thibault	ec6ef01600	Mark the system TabletProxy object as Cpp ownership. ... This should prevent the problem where the QML engine erroneously thinks the QObject has been collected/destroyed.	2017-03-28 09:53:00 -07:00
Andrew Meadows	60b8dbfce1	Merge pull request #10026 from AndrewMeadows/cleanup-fbx ... reduce memory bandwitdh to GPU for skinned meshes	2017-03-28 08:55:06 -07:00
Seth Alves	b50a02ea19	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-28 08:16:59 -07:00
Chris Collins	83aa7358e2	Merge pull request #9998 from birarda/bug/oculus-buttons-flipped ... fix swapped buttons in oculus touch graphic	2017-03-28 06:50:20 -07:00
Zach Fox	fce2049630	Trivial removal of commented code	2017-03-27 16:45:03 -07:00
Seth Alves	c013813161	Merge pull request #10027 from druiz17/tablet-disable-vto ... Remove visibleToOthers option for the tablet from general settings	2017-03-27 16:28:23 -07:00
Dante Ruiz	65be71fa69	min diff	2017-03-28 00:05:02 +01:00
Dante Ruiz	7434cc5644	force vto to false on start up	2017-03-28 00:02:02 +01:00
howard-stearns	85347e3269	new location protocol	2017-03-27 15:55:05 -07:00
Dante Ruiz	02535722ba	removed visible to others opition from general settings	2017-03-27 23:31:41 +01:00
Dante Ruiz	018138f422	fixed some issues with tablet help	2017-03-27 22:46:06 +01:00
Andrew Meadows	18544581e6	remove warnings about implicit float cast	2017-03-27 14:40:31 -07:00
Brad Hefta-Gaub	c986077a4f	Merge pull request #10007 from hyperlogic/feature/ik-debug-draw ... Added Developer > Avatar > Show IK Targets	2017-03-27 14:29:02 -07:00
David Kelly	5c1e085e7b	Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-27 11:29:18 -07:00
David Kelly	76657a670c	added notifications (faked user name for now), along with switch to avatar entities	2017-03-27 11:28:57 -07:00
Seth Alves	9c990b0358	Merge pull request #10018 from druiz17/tablet-login ... Show login screen in tablet at startup if not logged in and connecting to a domain that requires login	2017-03-27 10:10:41 -08:00
Dante Ruiz	cba7adf32a	removed qDebug	2017-03-27 19:08:41 +01:00
Seth Alves	48ea9acfb3	Merge pull request #10016 from druiz17/tablet-goto ... Porting goto to the tablet	2017-03-27 10:04:11 -08:00
Dante Ruiz	f4255735a9	make login screen show up on the tablet on startup	2017-03-27 18:03:38 +01:00
Zach Fox	e1a880a5d4	Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-27 09:10:12 -07:00
Dante Ruiz	b8eac7abef	revoming useless code	2017-03-27 16:17:50 +01:00
Seth Alves	bb28976d0e	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-26 09:32:35 -07:00
Seth Alves	3abd6b3948	Merge pull request #10006 from druiz17/tablet-help ... Ported help into the tablet	2017-03-25 08:33:41 -08:00
Vladyslav Stelmakhovskyi	edb66ae704	Merge branch 'tablet-ui' into tablet-ui-audio-screen	2017-03-25 13:20:43 +01:00
Vladyslav Stelmakhovskyi	fc23c348cb	Implemented Audio settings screen for Tablet UI	2017-03-25 13:17:38 +01:00