30894 commits

Author	SHA1	Message	Date
HifiExperiments	0d62798860	Merge remote-tracking branch 'upstream/master' into parenting	2020-08-04 08:52:13 -07:00
kasenvr	7a25376131	Merge pull request #574 from ctrlaltdavid/fix/url-parameter ... Fix --url command line parameter to work with both "=" and " "	2020-07-30 17:18:54 -04:00
kasenvr	180b7f1bd3	Merge pull request #547 from HifiExperiments/scaled ... Fix lag on restart with scaled avatar	2020-07-30 17:15:50 -04:00
David Rowe	c6af3d23c9	Fix --url command line parameter to work with both "=" and " "	2020-07-26 19:41:30 +12:00
kasenvr	ec09f1a9d9	Merge pull request #550 from ctrlaltdavid/feature/resolution-scale-max ... Increase graphics settings' resolution scale item maximum to 2.0	2020-07-24 01:11:29 -04:00
kasenvr	80d3e3c455	Merge pull request #520 from kasenvr/fix/move-user-agent ... Fix/move user agent	2020-07-23 17:13:18 -04:00
kasenvr	ac3147fa66	Merge pull request #544 from kasenvr/fix/goto-explore ... Update the connection failure dialog 'go to' -> 'explore'	2020-07-23 17:05:28 -04:00
kasenvr	befdaec03b	Merge pull request #524 from JulianGro/macos-rebrand ... Change strings, comments and folders to Vircadia rebrand	2020-07-23 17:04:49 -04:00
Kasen IO	f4016bb0d5	Add API call to retrieve user agent.	2020-07-21 02:36:55 -04:00
Kasen IO	647b45323e	Update user agents.	2020-07-21 02:36:38 -04:00
kasenvr	de082ce61d	Update TabletConnectionFailureDialog.qml	2020-07-18 14:26:26 -04:00
kasenvr	a973855085	Update ConnectionFailureDialog.qml	2020-07-18 14:25:50 -04:00
David Rowe	233deae44d	Increase graphics settings' resolution scale item maximum to 2.0	2020-07-18 20:50:52 +12:00
HifiExperiments	cbce911e83	fix lag on restart with scaled avatar	2020-07-17 14:40:40 -07:00
Kasen IO	ddbed5e702	Update the connection failure dialog 'go to' -> 'explore'	2020-07-17 04:24:47 -04:00
HifiExperiments	ed5c84548c	Merge remote-tracking branch 'upstream/master' into parenting	2020-07-16 13:33:46 -07:00
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
HifiExperiments	c9684b8c6d	Merge remote-tracking branch 'upstream/master' into parenting	2020-07-10 11:43:03 -07:00
Kasen IO	629b3c084c	Update user agent to use "Vircadia" + update getUserAgent function to use the same.	2020-07-10 00:08:46 -04: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ß	dce34b8d90	Change strings, comments and folders to Vircadia	2020-07-09 16:03:07 +02:00
Kasen IO	3ccaa46563	Update API docs URLs.	2020-07-08 14:18:32 -04:00
Kasen IO	4b1e82fc0b	Move user agent to networking constants.	2020-07-08 14:18:24 -04: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
HifiExperiments	37ce2996c8	Merge remote-tracking branch 'upstream/master' into parenting	2020-07-01 14:56:36 -07: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