19284 commits

Author	SHA1	Message	Date
Zach Fox	f47f259816	Turn Commerce on by default	2017-11-17 15:12:49 -08:00
Stephen Birarda	239b116874	Merge pull request #11835 from birarda/bug/octree-connection-id ... Reset EntityTreeSendThread known state if client disconnects from Entity Server	2017-11-17 12:56:25 -08:00
Dante Ruiz	4de0fdf7d1	Merge pull request #11768 from ctrlaltdavid/21596 ... Add instructions and cursor to GOTO dialog input	2017-11-17 11:45:40 -08:00
SamGondelman	61c7ccde6e	cleanup	2017-11-17 10:45:39 -08:00
H Q	21a28827c9	Remaining coding style changes, other small fixes	2017-11-17 07:59:52 -08:00
David Rowe	a33162d7ff	Fix typo in Base3DOverlay "filled" property	2017-11-17 21:07:43 +13:00
H Q	14890495a2	Merge branch 'master' of https://github.com/highfidelity/hifi into ECWallet ... Syncing	2017-11-16 12:38:45 -08:00
H Q	27350ddbfc	Coding style corrections	2017-11-16 12:35:00 -08:00
David Back	abba965328	todo comment	2017-11-16 11:41:28 -08:00
Stephen Birarda	eedb77dae9	add clearing of known state if client resets ES connection	2017-11-16 11:40:35 -08:00
SamGondelman	ac7242102c	Merge remote-tracking branch 'upstream/pointers' into ui	2017-11-16 09:47:29 -08:00
SamGondelman	e3aa79990b	merge with master	2017-11-16 09:45:32 -08:00
Brad Davis	7bbc719d79	Fix for black screen on HMD derived display plugins	2017-11-16 08:53:12 -08:00
Seth Alves	93fd2a6a6b	clear garbage out of avatar-entity settings array before writing it to disk. when changing domains, re-rez avatar-entities after octree is cleared	2017-11-15 20:10:05 -08:00
David Back	4b2ff68fa3	var name and empty line	2017-11-15 19:05:44 -08:00
David Back	9bfbcb4434	code review updates	2017-11-15 18:06:49 -08:00
SamGondelman	3274c41aeb	Merge remote-tracking branch 'upstream/pointers' into ui	2017-11-15 17:45:45 -08:00
Dante Ruiz	dd8ea759d4	fix tablet rez for commence button	2017-11-15 15:48:39 -08:00
Ryan Huffman	60a222e4b4	Merge pull request #11810 from Atlante45/fix/stuck-acs ... Fix stuck ACs	2017-11-15 14:59:51 -08:00
SamGondelman	7eb22b372f	merge with master	2017-11-15 14:35:30 -08:00
SamGondelman	8730a26d20	use mouse events for offscreenui because touch events aren't working with the eventFilter, cleanup, documentation	2017-11-15 14:12:16 -08:00
David Back	e0ce154472	remove includes, fix comment	2017-11-15 13:37:15 -08:00
David Back	0b8f888d9b	Merge branch 'master' of https://github.com/highfidelity/hifi into mirrorfanciness3	2017-11-15 12:50:03 -08:00
David Back	fee7701890	working mirror projection for secondary camera	2017-11-15 12:49:39 -08:00
Atlante45	e68ce97697	Remove the number of socket change tracking	2017-11-15 11:19:54 -08:00
John Conklin II	8592f3fd4d	Merge pull request #11764 from luiscuenca/case7587 ... 7587 Lasers resize with avatar	2017-11-15 09:31:45 -08:00
H Q	0db9e876d6	Merge branch 'master' of https://github.com/highfidelity/hifi into ECWallet	2017-11-14 15:40:44 -08:00
H Q	44f2c92d30	Final ECSDA and nonce modifications for this dev cycle	2017-11-14 15:40:29 -08:00
luiscuenca	489e244342	More accurate scale from SensorToWorldScale	2017-11-14 09:56:23 -07:00
SamGondelman	60db24f2d3	merge with master	2017-11-13 14:36:24 -08:00
SamGondelman	2fb1981c4a	merge with master	2017-11-13 14:34:39 -08:00
SamGondelman	2c0272f304	(mostly?) fix touch events	2017-11-13 12:58:31 -08:00
Ryan Downe Karpf	3ea6ecf104	Merge pull request #11747 from luiscuenca/case8495 ... 8495 No mirror camera in HMD mode	2017-11-13 09:09:34 -08:00
David Back	6466a05740	alternate approach to mirror projection wip	2017-11-10 17:15:47 -08:00
Sam Gateau	ecf67cc331	Merge pull request #11650 from Zvork/outline ... Multiple Outline Groups	2017-11-10 15:45:03 -08:00
SamGondelman	cbf0543646	deadspot	2017-11-10 13:22:38 -08:00
luiscuenca	d53a29b958	correction	2017-11-10 12:24:19 -07:00
luiscuenca	bf576e63fe	move constant to class definition	2017-11-10 11:54:53 -07:00
Anthony J. Thibault	ba4c0f189e	code review feedback ... removed discontinuity in safeDeltaTime, which is used to prevent division by zero.	2017-11-10 10:25:29 -08:00
Anthony J. Thibault	4169e11e77	Merge branch 'master' into bug-fix/div-by-zero	2017-11-10 10:15:26 -08:00
beholder	da49ee8bee	9032 Current display mode can be deselected in the toolbar/tablet menu	2017-11-10 19:53:55 +03:00
luiscuenca	255a40ce31	Corrections	2017-11-09 18:38:04 -07:00
luiscuenca	055fe16677	Allow script to change to mirror camera in HMD	2017-11-09 18:27:16 -07:00
Sam Gondelman	9010a02bee	Merge pull request #11790 from SamGondelman/overlayFlash ... Fix laser end not disappearing	2017-11-09 17:10:07 -08:00
luiscuenca	7dfdc8da59	Redesign and clean of unused lineWidths	2017-11-09 17:50:38 -07:00
Anthony Thibault	38cc56db7f	Merge pull request #11785 from luiscuenca/case6944 ... 6944 Avatar scale is preserved across domains	2017-11-09 16:38:45 -08:00
SamGondelman	9188ae9fb5	fix laser end not disappearing	2017-11-09 16:26:37 -08:00
luiscuenca	355b465109	make leaveDomain slot private	2017-11-09 16:05:53 -07:00
David Kelly	31dc140ea6	Merge pull request #11771 from zfox23/commerce_seedingFrontend ... Commerce: Seeding Frontend	2017-11-09 14:45:10 -07:00
Sam Gondelman	d1e41e6bf0	Merge pull request #11786 from SamGondelman/overlayFlash ... Fix overlay flash on visibility and position change	2017-11-09 13:36:49 -08:00
SamGondelman	224386317d	send overlay visibility through transaction	2017-11-09 12:14:40 -08:00
SamGondelman	5a78c9ebfe	integrated stylus into pointer system, need to update controller module	2017-11-09 11:59:17 -08:00
luiscuenca	10f484c668	6944 Avatar scale is saved across domains	2017-11-09 12:21:23 -07:00
Elisa Lupin-Jimenez	1e526605ba	Merge pull request #11778 from elisa-lj11/blocks ... Fixed Blocks downloads (now Google Poly)	2017-11-08 17:53:26 -08:00
luiscuenca	1791ed01ca	add width param to vertex shader	2017-11-08 18:35:26 -07:00
Zach Fox	19b7c6e025	Remove machine fingerprint from receiveAt	2017-11-08 17:15:27 -08:00
Elisa Lupin-Jimenez	45b9a150dc	updated blocks url refs in application to fix download issue	2017-11-08 15:21:48 -08:00
MissLiviRose	45e58b93e5	add skeleton scale change signal so scripts can detect scaling change	2017-11-08 14:23:49 -08:00
David Rowe	c5c1ead400	Fix GOTO dialog's connection status and location not always updating	2017-11-09 10:51:21 +13:00
Zach Fox	38fde43009	...simplify your life	2017-11-08 13:19:47 -08:00
Zach Fox	7995f50fab	Fix seeding	2017-11-08 12:52:53 -08:00
Zach Fox	3190fe1f32	Use keyfilepath instead of cached public keys	2017-11-08 12:30:48 -08:00
Zach Fox	72fa0823ba	Logic changes	2017-11-08 11:01:54 -08:00
Zach Fox	b7163bb8fc	Frontend changes	2017-11-08 10:25:11 -08:00
Olivier Prat	f996435ac8	Merge branch 'master' of git://github.com/highfidelity/hifi into highlight	2017-11-08 11:41:21 +01:00
luiscuenca	8c5f97f3d1	More corrections	2017-11-07 20:25:24 -07:00
luiscuenca	536bf6f81d	Corrections	2017-11-07 18:34:33 -07:00
luiscuenca	ee3900be4f	Corrections	2017-11-07 18:26:41 -07:00
Elisa Lupin-Jimenez	1ceec17405	missed an fbx block	2017-11-07 17:12:39 -08:00
Elisa Lupin-Jimenez	9a09ffe12f	removed old fbx code	2017-11-07 17:10:57 -08:00
Elisa Lupin-Jimenez	e37010565f	changed fileDialog return value to be compatible with musvis	2017-11-07 16:55:07 -08:00
Luis Cuenca	6fb47eef85	Merge branch 'master' into case7587	2017-11-07 17:19:39 -07:00
unknown	f997ad4628	changed Wallet from RSA to ECSDA cryto	2017-11-07 16:15:48 -08:00
luiscuenca	332cb48a41	Lasers and teleport scale with avatar	2017-11-07 16:57:55 -07:00
Zach Fox	8f54c106f6	Could it be this simple?	2017-11-07 12:12:27 -08:00
Elisa Lupin-Jimenez	89a9269982	synced up	2017-11-07 10:37:55 -08:00
Seth Alves	e9c0e53aa6	Merge pull request #11760 from druiz17/far-grab-parent ... Far grab rolls up parent tree when grabbing and add offset to LaserPointer::lockEndUUID	2017-11-07 08:53:13 -08:00
Olivier Prat	9817cb4c44	Added highlight configuration in HighlightStageSetup job	2017-11-07 15:35:43 +01:00
Olivier Prat	3cc445ff02	Renamed outline to highlight	2017-11-07 11:07:25 +01:00
Olivier Prat	84be026e0b	Merge branch 'master' of git://github.com/highfidelity/hifi into outline	2017-11-07 09:48:45 +01:00
Dante Ruiz	c9d67f762b	made requested changes	2017-11-06 16:20:16 -08:00
Dante Ruiz	067ed2ffe0	apply coding standard	2017-11-06 16:09:31 -08:00
Dante Ruiz	646e5455ac	forgot to remove unused variable	2017-11-06 16:05:44 -08:00
Dante Ruiz	41c6261b74	LaserPointer: made _objectLockEnd into a struct	2017-11-06 16:04:33 -08:00
Dante Ruiz	3b15897b12	fixed farGrab parent grabbing and laser LockEndUUID	2017-11-06 15:21:20 -08:00
Zach Fox	bb21c52783	Fix crash when logging out while Passphrase screen visible	2017-11-06 15:12:01 -08:00
SamGondelman	f970eb2302	merge with pointers branch	2017-11-06 14:49:50 -08:00
SamGondelman	7d420f5242	isLeftHand, isRightHand, isMouse	2017-11-06 12:29:21 -08:00
Brad Davis	544c54b8ee	Merge remote-tracking branch 'upstream/master' into HEAD	2017-11-06 10:07:22 -08:00
Dante Ruiz	e432e62a39	Merge branch 'master' of github.com:highfidelity/hifi into far-grab-parent	2017-11-06 09:02:03 -08:00
luiscuenca	31b63ffbe6	Not posible to change to mirror mode using js	2017-11-06 08:03:07 -07:00
Olivier Prat	9e6472b577	Added OutlineStyleStage	2017-11-06 15:55:57 +01:00
Olivier Prat	09ee69db30	Merge branch 'master' of git://github.com/highfidelity/hifi into outline	2017-11-06 09:47:48 +01:00
SamGondelman	55ac585cd9	Merge remote-tracking branch 'upstream/master' into ui	2017-11-03 17:32:13 -07:00
SamGondelman	ce58b6c401	trying to fix HUD events, abstracting touch event logic (wip), seth's comments	2017-11-03 17:15:30 -07:00
Dante Ruiz	539cf35f30	saving work	2017-11-03 17:14:27 -07:00
luiscuenca	f226835876	8495 No mirror camera in HMD mode	2017-11-03 11:51:03 -07:00
Zach Fox	c496429a85	Add Machine Fingerprint to receive_at endpoint txn'	2017-11-03 10:40:25 -07:00
John Conklin II	ff36cbf45f	Merge pull request #11731 from sethalves/fix-ignore ... stop drawing ignored avatars, even if PAL is still open	2017-11-03 09:45:03 -07:00
Olivier Prat	e0fd71f246	Merged from master	2017-11-03 14:39:42 +01:00