30869 commits

Author	SHA1	Message	Date
David Rowe	8dd8ebcbaf	Merge branch 'master' into feature/eye-tracking-option ... # Conflicts: # plugins/openvr/src/ViveControllerManager.cpp	2020-07-11 08:14:13 +12:00
kasenvr	ec7ad0d805	Merge pull request #526 from kasenvr/v2020.2.2-rc ... V2020.2.2 rc -> master	2020-07-09 17:35:59 -04:00
kasenvr	d5b5bdc382	Merge pull request #505 from daleglass/increase_max_texture_size ... Increase maximum texture size to 8192	2020-07-09 17:33:51 -04:00
kasenvr	ab95e109ca	Merge pull request #468 from JulianGro/move-audio ... Little "Audio" settings UI improvements	2020-07-09 17:15:35 -04:00
David Rowe	6e1af6df73	Update copyright notices	2020-07-10 07:18:29 +12:00
Julian Groß	6737068b02	Test	2020-07-07 00:28:19 +02:00
David Rowe	52389e5804	Add correct privacy policy URL	2020-07-05 11:17:56 +12:00
Dale Glass	9f25891639	Increase maximum texture size to 8192	2020-07-03 23:43:18 +02:00
Kasen IO	afc23954c5	Import entities now works on domains that you do not have rights on.	2020-07-03 16:37:02 -04:00
motofckr9k	bb91c1c89b	Fix blocks	2020-07-03 10:22:06 +02:00
kasenvr	bfe08f23c7	Merge pull request #497 from kasenvr/feature/paste-entities-host-type ... Add ability to paste entities to any host type	2020-07-02 17:29:13 -04:00
kasenvr	b7b902b755	Merge pull request #459 from ctrlaltdavid/feature/tutorial-menu-item ... Add Help > Tutorial menu item	2020-07-02 17:10:38 -04:00
kasenvr	e1ab52d97e	Apply suggestions from code review ... Co-authored-by: David Rowe <david@ctrlaltstudio.com>	2020-07-02 16:52:12 -04:00
Kasen IO	859c78d8aa	Further updates.	2020-07-01 16:05:15 -04:00
Kasen IO	5f0caf7de8	Update pasteEntities to const per suggestion.	2020-07-01 01:29:47 -04:00
Kasen IO	d881e1e3c2	Alter references per suggestion.	2020-06-30 18:24:21 -04:00
Kasen IO	d9e0605b4d	Improve code per HiFiExperiments' suggestions.	2020-06-30 15:46:26 -04:00
Kasen IO	12446bdb45	Add ability to paste entities to any host type. Default "domain"	2020-06-30 15:18:51 -04:00
David Rowe	06010dbcae	Fix position of recommended puck placement dialog	2020-06-27 15:54:28 +12:00
David Rowe	258fc8a2f4	Improve some text and make checkboxes square	2020-06-27 15:54:15 +12:00
David Rowe	2e9a8e2b33	Add option to enable Vive PRO Eye eye tracking	2020-06-27 15:14:21 +12:00
David Rowe	147bea6ba9	Fix indentation	2020-06-22 21:12:46 +12:00
Julian Groß	5b0855fa6e	Fix indentation	2020-06-22 06:18:05 +02:00
Julian Groß	3fe1dddee2	Replace tabs with spaces	2020-06-22 04:19:10 +02:00
Julian Groß	ef5d6bfc2f	Remove unnessesary copyright	2020-06-22 04:11:34 +02:00
Julian Groß	34887ec604	Remove unnessesary whitespaces	2020-06-22 04:10:21 +02:00
motofckr9k	56362461fc	Fix "or" not dissappearing in popup window	2020-06-21 05:51:37 +02:00
motofckr9k	75f6246ac9	Move them even closer	2020-06-21 03:16:19 +02:00
motofckr9k	41563b14a8	Move signUpContainer closer to loginContainer	2020-06-21 03:05:54 +02:00
motofckr9k	3da755fb95	Change button text, and move it to answer "Don't have an account?"	2020-06-21 02:53:05 +02:00
motofckr9k	e8a3009b96	Remove color from dismissButton	2020-06-21 01:51:05 +02:00
motofckr9k	bf230a415a	Initial commit	2020-06-21 01:51:04 +02:00
motofckr9k	878c6c68c8	Fix inputView if statement	2020-06-19 23:46:04 +02:00
motofckr9k	3aefa6ad9c	Remove if statements that are not needed anymore	2020-06-19 23:37:26 +02:00
motofckr9k	0c8cc0a806	Try to remove empty space when "Test your voice" button is not visible	2020-06-19 23:32:52 +02:00
motofckr9k	845cc4454c	Add Vircadia contributors line	2020-06-19 21:47:09 +02:00
motofckr9k	4a0d011b53	Shorten PushToTalk text on vr, since it didn't fit into the window	2020-06-19 21:39:53 +02:00
motofckr9k	d4f79413eb	Fix seperator and move up inputLevel	2020-06-19 21:27:41 +02:00
motofckr9k	ee6de9e868	Move "Test your voice" and "Test your sound" to top of their category	2020-06-19 21:10:48 +02:00
motofckr9k	8284dd16cf	Revert last commit and add spacer item to bottom.	2020-06-19 20:19:03 +02:00
motofckr9k	b0eb08c03f	Try to add bottom margin	2020-06-19 19:54:49 +02:00
motofckr9k	6b8519c7ff	Fix "Test your sound"	2020-06-19 19:38:03 +02:00
motofckr9k	eaf2ce89e0	Actually move it up this time	2020-06-19 19:23:51 +02:00
motofckr9k	37bded0a9b	Move volume control up from bottom	2020-06-19 18:48:43 +02:00
kasenvr	63e3c001c3	Merge pull request #411 from Misterblue/fix/central-metaverse-urls ... Move metaverse server URL info into central files for easier updating	2020-06-18 17:23:05 -04:00
kasenvr	13451bd275	Merge pull request #384 from JulianGro/rebrand ... Rebranding stuff	2020-06-18 17:12:47 -04:00
Julian Groß	18318fdf71	Merge branch 'v2020.2.2-rc' into rebrand	2020-06-18 09:16:47 +02:00
motofckr9k	256b466e84	Add vircadia-banner.svg for login dialogs	2020-06-18 09:12:01 +02:00
David Rowe	f11091cab4	Add Help > Tutorial menu item that goest to serverless tutorial	2020-06-16 12:25:28 +12:00
David Rowe	4e57d53dde	Merge branch 'master' into feature/vive-pro-eye-tracking	2020-06-14 10:51:25 +12:00