85079 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Kalila	409cc5835c	Merge pull request #1050 from HifiExperiments/imageAspectFix ... Image Entities: fix keepAspectRatio, implement naturalDimensions	2021-03-27 15:24:43 -04:00
Kalila	326e23a1da	Update stale.yml	2021-03-27 00:40:48 -04:00
Kalila	4cb9459736	Merge pull request #1047 from Phil-Palmer/optimisation/myavatar ... Small optimisations and tidying related to MyAvatar	2021-03-26 20:41:38 -04:00
Kalila	5eadda5be2	Update stale.yml	2021-03-26 15:40:00 -04:00
Kalila	62a9299b1e	Activate stale bot ... This bot will help triage issues (or so I think) in accordance with the configuration file defined here.	2021-03-26 06:50:13 -04:00
Kalila	3961d9d324	Merge pull request #1115 from ctrlaltdavid/feature/qt-update-master ... Update Qt 5.15.2 feature branch to latest master	2021-03-25 17:07:13 -04:00
Kalila	308b2e08a0	Merge pull request #7 from ctrlaltdavid/fix/can-rez-attachment ... Make granting avatar entities permission more robust	2021-03-25 04:49:54 -04:00
David Rowe	1f5b706574	Make granting avatar entities permission more robust	2021-03-25 21:38:32 +13:00
David Rowe	7a1d3dbe16	Tidying	2021-03-25 10:20:59 +13:00
David Rowe	c3b7d65617	Merge branch 'master' into feature/qt-update-master ... # Conflicts: # BUILD.md	2021-03-25 10:18:38 +13:00
HifiExperiments	7ff796af3e	web textures work on image entities, create supports negative materialMappingScale	2021-03-22 20:52:39 -07:00
Kalila	70ebdf70e3	Merge pull request #6 from ctrlaltdavid/fix/can-rez-attachment ... Fix up default domain permissions	2021-03-22 22:31:19 -04:00
David Rowe	41bd3c10c0	Fix up node permissions debug order	2021-03-23 15:22:08 +13:00
David Rowe	94228d0977	Fix up default domain permissions	2021-03-23 15:21:51 +13:00
HifiExperiments	6b82c7fe90	Update RenderableImageEntityItem.cpp	2021-03-22 18:37:29 -07:00
Kalila	eac2758c13	Merge pull request #5 from ctrlaltdavid/fix/can-rez-attachment ... Fix/can rez attachment	2021-03-22 00:39:25 -04:00
Alezia Kurdis	0b04eee7bc	Delete brokenUrlReport.js ... Broken Url Report - adjustments	2021-03-21 22:53:40 -04:00
Alezia Kurdis	0da1d9ad5b	Delete brokenUrlReport.html ... Broken Url Report - adjustments	2021-03-21 22:53:10 -04:00
Alezia Kurdis	a9fadfa654	Broken Url Report - adjustments ... Broken Url Report - adjustments	2021-03-21 22:52:25 -04:00
Alezia Kurdis	0797e2668b	Broken Url Report - adjustments ... Broken Url Report - adjustments	2021-03-21 22:51:26 -04:00
Alezia Kurdis	ffdf1960bb	Broken Url Report - adjustments ... Broken Url Report - adjustments	2021-03-21 22:50:53 -04:00
Alezia Kurdis	d51337c98f	Broken Url Report - adjustments ... Broken Url Report - adjustments	2021-03-21 22:49:58 -04:00
Alezia Kurdis	b65d31c477	Broken Url Report - adjustments ... Broken Url Report - adjustments	2021-03-21 22:49:10 -04:00
David Rowe	71b025f7f0	Separate API vs. internal versions of clearAvatarEntity()	2021-03-22 15:36:57 +13:00
David Rowe	b0fee2699c	Allow time for avatar mixer to be updated with user's permissions	2021-03-22 13:58:15 +13:00
HifiExperiments	e5f108b022	bump ktx version to force clear cache	2021-03-21 14:51:21 -07:00
Kalila L	cfac34bf7e	CR.	2021-03-21 13:20:05 -04:00
Kalila	12d5687c6a	Update libraries/script-engine/src/UsersScriptingInterface.h ... Co-authored-by: David Rowe <david@ctrlaltstudio.com>	2021-03-21 13:13:24 -04:00
Kalila	6f7bfbc053	Update Pal.qml	2021-03-21 03:01:28 -04:00
Kalila	343d05f33b	Merge pull request #986 from vircadia/dependabot/npm_and_yarn/screenshare/electron-9.4.0 ... Bump electron from 7.2.4 to 9.4.0 in /screenshare	2021-03-20 14:41:31 -04:00
daleglass	7086412d1e	Merge pull request #1092 from daleglass/implement_linux_fingerprint ... Implement Linux machine fingerprints	2021-03-20 19:16:07 +01:00
HifiExperiments	35e836d34d	image caching must maintain original image information and pass it around	2021-03-19 22:32:29 -07:00
HifiExperiments	a87d6e5182	on json import, material/texture references are updated to new ids	2021-03-19 17:39:22 -07:00
Kalila L	f067feb37a	Add docs for ban functionality.	2021-03-19 04:44:58 -04:00
Kalila L	fd592dfb06	CR.	2021-03-19 04:11:26 -04:00
Kalila	9dadc44f6c	Update UserActivityLoggerScriptingInterface.h	2021-03-18 17:57:49 -04:00
Kalila	da7bcf1584	Update NodeList.cpp	2021-03-18 17:53:21 -04:00
Kalila L	c6c3dc66ea	Add IP ban button to the "People" app.	2021-03-18 01:39:13 -04:00
HifiExperiments	15ba6c8637	fix build	2021-03-17 21:14:22 -07:00
Kalila L	be0bd3940d	Finish flag work on kick functionality.	2021-03-17 23:25:08 -04:00
HifiExperiments	5fd4f215f1	more docs	2021-03-17 19:18:30 -07:00
HifiExperiments	3fdb398829	fixing up material entity logic, refresh reference material on material change	2021-03-17 19:10:29 -07:00
Kalila L	0216b34681	State of refactoring	2021-03-17 19:37:06 -04:00
Kalila	26aa6354e8	Merge pull request #4 from ctrlaltdavid/fix/can-rez-attachment ... Code review	2021-03-17 19:22:47 -04:00
David Rowe	9c68d0236c	Fix indent	2021-03-18 12:16:04 +13:00
David Rowe	ddcfe6351b	Tidying	2021-03-18 12:13:41 +13:00
David Rowe	3afc9f700e	Rename avatar entities permission in server settings	2021-03-18 12:13:06 +13:00
David Rowe	240c58c6ce	Code review	2021-03-18 09:56:00 +13:00
Kalila	177196c968	Merge pull request #3 from ctrlaltdavid/fix/can-rez-attachment ... Fix typo	2021-03-17 02:43:25 -04:00
David Rowe	da5f462e4f	Typo	2021-03-17 19:25:04 +13:00