33447 commits

Author	SHA1	Message	Date
Brad Davis	8724106685	Trying to fix mac build:	2019-09-27 14:55:42 -07:00
Brad Davis	403499bf32	Cleaning up android build warnings	2019-09-27 09:19:52 -07:00
Andrew Meadows	f3aa534327	Merge pull request #16239 from AndrewMeadows/cleanup-mortal-entities ... BUGZ-1510: don't forget to cleanup expired mortal entities	2019-09-26 16:20:27 -07:00
Simon Walton	bbf43050b1	Merge pull request #16244 from SimonWalton-HiFi/connection-class-ignored-unused ... BUGZ-1503: Don't move unused Connection class upon address change	2019-09-26 11:42:50 -07:00
Amer	1e94a82ee6	Merge pull request #16196 from amerhifi/dev469 ... DEV-469: Default Audio device	2019-09-25 16:28:00 -07:00
Atlante45	ff3f26eeae	Limit the amount of account settings pull retries	2019-09-25 14:55:44 -07:00
amer cerkic	73f14d812f	addressing cr comments	2019-09-25 13:22:50 -07:00
Simon Walton	6ccfc37f27	Merge remote-tracking branch 'upstream/master' into connection-class-ignored-unused	2019-09-25 13:06:32 -07:00
Brad Hefta-Gaub	06c7a92c27	Merge pull request #16243 from Atlante45/fix/account-settings ... DEV-648: Add flag for account settings feature	2019-09-25 11:20:14 -07:00
Brad Hefta-Gaub	068fb0e177	Merge pull request #16240 from ctrlaltdavid/BUGZ-577 ... BUGZ-577: Implement Recording.setPlayerVolume()	2019-09-25 10:31:57 -07:00
Simon Walton	6d7f711990	Remove typo that somehow got into a comment	2019-09-25 09:33:49 -07:00
Clement	5067729c52	Add flag for account settings feature	2019-09-24 17:40:34 -07:00
Clement	96b58756b1	Add flag for account settings feature	2019-09-24 16:50:10 -07:00
Simon Walton	4f11e46b5e	Don't move Connection class to changed address until it's used	2019-09-24 16:39:59 -07:00
amer cerkic	9daf670678	Merge branch 'master' into dev469	2019-09-24 15:38:07 -07:00
Andrew Meadows	50f0c90519	don't forget to cleanup expired mortal entities	2019-09-24 14:00:21 -07:00
David Rowe	2fe24b39db	Code review	2019-09-25 07:50:56 +12:00
David Rowe	b174e002a9	Implement Recording.setPlayerVolume()	2019-09-24 12:52:51 +12:00
amerhifi	fbc68e7f69	removed clang format issue, removed old attempt at getting defaults to startup correctly	2019-09-23 15:07:04 -07:00
Shannon Romano	48c55d05c7	Merge pull request #16210 from Atlante45/feat/account-settings ... DEV-544: Add account settings to the AccountManager	2019-09-23 13:00:23 -07:00
Clement	1924dad51b	CR changes	2019-09-20 13:30:08 -07:00
Shannon Romano	bd488f0196	Merge pull request #16144 from luiscuenca/addLookAtThirdCamera ... DEV-391: Keyboard Input Controls Camera Not Avatar Orientation	2019-09-20 13:03:03 -07:00
Anthony Thibault	fecef584c9	Merge pull request #16226 from danteruiz/fix-snap-html-issue ... BUGZ-1522: Snap app on tablet is blocked when saving/canceling out of its Settings page	2019-09-20 12:39:01 -07:00
Shannon Romano	22dffa5ce8	Merge pull request #16217 from Atlante45/fix/flush-timer ... BUGZ-489: Make sure the flush timer is not spawned too early	2019-09-20 12:35:39 -07:00
amer cerkic	64f14dd6ba	fixing selection issues	2019-09-20 11:32:57 -07:00
Sabrina Shanman	460eaf523a	Merge pull request #16202 from AndrewMeadows/trace-stats-for-workload ... DEV-594: add trace stats for workload region sizes	2019-09-20 10:37:45 -07:00
dante ruiz	fe2a4c3600	fix fix-snap-html-issue	2019-09-19 18:20:08 -07:00
luiscuenca	365aa1bf03	Add jdoc to camera modes and fix variable namings	2019-09-19 17:30:01 -07:00
amerhifi	7fbce46e30	fixing android build, I removed a function thinking it was unused. also added android ifdef guards for name since default does to exist on that device. Simplified getting a default device	2019-09-19 15:57:38 -07:00
amerhifi	8d7c28fe83	fixed audio switching issues. removed risky access to properties. adressing comments	2019-09-19 14:19:43 -07:00
Clement	282aa70db3	Sync settings on logout/shutdown	2019-09-19 13:45:34 -07:00
luiscuenca	279e25ca70	Merge master	2019-09-19 13:21:49 -07:00
Sam Gateau	6fe2b7a3d1	Merge pull request #16218 from AndrewMeadows/fix-avatar-entities-in-void ... BUGZ-1457: scripted edits of avatar entites should succeed when in the void	2019-09-19 13:15:39 -07:00
Zach Fox	80414a6f1c	DEV-613: Remove unnecessary audio injector logging	2019-09-19 11:17:39 -07:00
luiscuenca	6d98537a20	Clean up code and refactor avatar-animation.json	2019-09-19 10:45:20 -07:00
amerhifi	9cc3b7a5c7	addressing pr comments	2019-09-19 10:08:30 -07:00
Shannon Romano	a5fdf5bb40	Merge pull request #16214 from hyperlogic/bug-fix/additive-blend-scale-fix ... Fix additive blending on avatars with non identity scale.	2019-09-19 09:04:28 -07:00
Andrew Meadows	ab419ddd23	beware null sessionID	2019-09-19 08:25:01 -07:00
amer cerkic	be2fff13d2	fixed wrong device in if block	2019-09-18 17:10:12 -07:00
Clement	527b27b32d	Make sure the flush timer is not spawned too early	2019-09-18 17:05:05 -07:00
Shannon Romano	e7001c3f1b	Merge pull request #16157 from sethalves/vive-pro-groundwork ... DEV-605: Vive pro groundwork	2019-09-18 16:36:12 -07:00
Anthony J. Thibault	41978aa4a4	Fix additive blending on avatars with non identity scale. ... Some avatars that have non 1.0 scale values were incorrectly being scaled during additive blends, this fixes that.	2019-09-18 14:42:57 -07:00
amer cerkic	ecca898db8	fixed some more vs clang reformatting	2019-09-18 14:39:55 -07:00
amer cerkic	d4dc06d2e7	fixed issue with null device on load.	2019-09-18 12:44:03 -07:00
Clement	86196cfd62	Add account settings to the AccountManager	2019-09-17 18:48:14 -07:00
luiscuenca	1054e8fcde	Selfie camera and updated camera menus	2019-09-17 17:15:16 -07:00
amer cerkic	46b9496965	fixing mac build error	2019-09-17 16:02:20 -07:00
Andrew Meadows	434f5ff300	fix comment	2019-09-17 15:57:20 -07:00
Andrew Meadows	5ad0dd20ac	update QueryAACube of unowned moving physical entities	2019-09-17 15:43:53 -07:00
Andrew Meadows	54d3ceda28	update QueryAACube of kinematic things with known parentage	2019-09-17 15:31:16 -07:00